diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d937a00..ea76aff 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -2,27 +2,28 @@
 <template>
   <el-popover
     ref="popover"
+    :width="width"
     placement="bottom-start"
     trigger="click"
-    class="select-tree scrollbar"
+    popper-class="select-tree"
     @show="onShowPopover"
     @hide="onHidePopover">
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}; max-height:${treeHeight};overflow-y:scroll`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      highlight-current
-      accordion
-      @node-click="onClickNode"/>
+    <el-scrollbar wrap-class="list" class="selectScrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"/>
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
-      :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -32,182 +33,187 @@
 </template>
 
 <script>
-export default {
-  name: 'SelectTree',
-  // 设置绑定参数
-  model: {
-    prop: 'value',
-    event: 'selected'
-  },
-  props: {
-    // 接收绑定参数
-    value: {
-      type: String,
-      default: ''
+  export default {
+    name: 'SelectTree',
+    // 设置绑定参数
+    model: {
+      prop: 'value',
+      event: 'selected'
     },
-    // 输入框宽度
-    width: {
-      type: String,
-      default: ''
-    },
-    // 输入框宽度
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 选项数据
-    options: {
-      type: Array,
-      required: true
-    },
-    // 输入框占位符
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    // 树节点配置选项
     props: {
-      type: Object,
-      required: false,
-      default: () => ({
-        parent: 'parentId',
-        value: 'rowGuid',
-        label: 'areaName',
-        children: 'children'
-      })
-    }
-  },
-  data() {
-    return {
-      // 树状菜单显示状态
-      showStatus: false,
-      // 菜单宽度
-      treeWidth: 'auto',
-      // 菜单最高高度
-      treeHeight: '400px',
-      // 输入框显示值
-      labelModel: '',
-      // 实际请求传值
-      valueModel: '0'
-    }
-  },
-  computed: {
-    // 是否为树状结构数据
-    dataType() {
-      const jsonStr = JSON.stringify(this.options)
-      return jsonStr.indexOf(this.props.children) !== -1
-    },
-    // 若非树状结构，则转化为树状结构数据
-    data() {
-      // return this.dataType ? this.options : this.switchTree()
-      return this.options
-    }
-  },
-  watch: {
-    labelModel(val) {
-      if (!val) {
-        if (val === '') {
-          this.valueModel = ''
-          this.value = ''
-          this.$emit('selected', this.valueModel)
-        }
-        this.valueModel = ''
-      }
-      this.$refs.tree.filter(val)
-    },
-    value(val) {
-      this.labelModel = this.queryTree(this.data, val)
-    }
-  },
-  created() {
-    // 检测输入框原有值并显示对应 label
-    if (this.value) {
-      this.labelModel = this.queryTree(this.data, this.value)
-    }
-    // 获取输入框宽度同步至树状菜单宽度
-    this.$nextTick(() => {
-      this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
-    })
-  },
-  methods: {
-    // 单击节点
-    onClickNode(node) {
-      this.labelModel = node[this.props.label]
-      this.valueModel = node[this.props.value]
-      this.onCloseTree()
-    },
-    // 偏平数组转化为树状层级结构
-    switchTree() {
-      return this.cleanChildren(this.buildTree(this.options, '0'))
-    },
-    // 隐藏树状菜单
-    onCloseTree() {
-      this.$refs.popover.showPopper = false
-    },
-    // 显示时触发
-    onShowPopover() {
-      this.showStatus = true
-      this.$refs.tree.filter(false)
-    },
-    // 隐藏时触发
-    onHidePopover() {
-      this.showStatus = false
-      this.$emit('selected', this.valueModel)
-    },
-    // 树节点过滤方法
-    filterNode(query, data) {
-      if (!query) return true
-      return data[this.props.label].indexOf(query) !== -1
-    },
-    // 搜索树状数据中的 ID
-    queryTree(tree, id) {
-      let stark = []
-      stark = stark.concat(tree)
-      while (stark.length) {
-        const temp = stark.shift()
-        if (temp[this.props.children]) {
-          stark = stark.concat(temp[this.props.children])
-        }
-        if (temp[this.props.value] === id) {
-          return temp[this.props.label]
-        }
-      }
-      return ''
-    },
-    // 将一维的扁平数组转换为多层级对象
-    buildTree(data, id = '0') {
-      const fa = (parentId) => {
-        console.log('parentId:' + parentId)
-        const temp = []
-        for (let i = 0; i < data.length; i++) {
-          const n = data[i]
-          if (n[this.props.parent] === parentId) {
-            n.children = fa(n.code)
-            temp.push(n)
-          }
-        }
-        return temp
-      }
-      return fa(id)
-    },
-    // 清除空 children项
-    cleanChildren(data) {
-      const fa = (list) => {
-        list.map((e) => {
-          if (e.children.length) {
-            fa(e.children)
-          } else {
-            delete e.children
-          }
-          return e
+      // 接收绑定参数
+      value: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度
+      // width: {
+      //   type: String,
+      //   default: ''
+      // },
+      // 输入框宽度
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 选项数据
+      options: {
+        type: Array,
+        required: true
+      },
+      // 输入框占位符
+      placeholder: {
+        type: String,
+        required: false,
+        default: '请选择'
+      },
+      // 树节点配置选项
+      props: {
+        type: Object,
+        required: false,
+        default: () => ({
+          parent: 'parentId',
+          value: 'rowGuid',
+          label: 'areaName',
+          children: 'children'
         })
-        return list
       }
-      return fa(data)
+    },
+    data() {
+      return {
+        // 树状菜单显示状态
+        showStatus: false,
+        // 菜单宽度
+        treeWidth: 'auto',
+        // 菜单最高高度
+        treeHeight: '400px',
+        // 输入框显示值
+        labelModel: '',
+        // 实际请求传值
+        valueModel: '0',
+        // popover的宽度
+        width: ''
+      }
+    },
+    computed: {
+      // 是否为树状结构数据
+      dataType() {
+        const jsonStr = JSON.stringify(this.options)
+        return jsonStr.indexOf(this.props.children) !== -1
+      },
+      // 若非树状结构，则转化为树状结构数据
+      data() {
+        // return this.dataType ? this.options : this.switchTree()
+        return this.options
+      }
+    },
+    watch: {
+      labelModel(val) {
+        if (!val) {
+          if (val === '') {
+            this.valueModel = ''
+            this.value = ''
+            this.$emit('selected', this.valueModel)
+          }
+          this.valueModel = ''
+        }
+        this.$refs.tree.filter(val)
+      },
+      value(val) {
+        this.labelModel = this.queryTree(this.data, val)
+      }
+    },
+    created() {
+      // 检测输入框原有值并显示对应 label
+      if (this.value) {
+        this.labelModel = this.queryTree(this.data, this.value)
+      }
+      // 获取输入框宽度同步至树状菜单宽度
+      this.$nextTick(() => {
+        this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
+      })
+    },
+    methods: {
+      // 单击节点
+      onClickNode(node) {
+        this.labelModel = node[this.props.label]
+        this.valueModel = node[this.props.value]
+        this.onCloseTree()
+      },
+      // 偏平数组转化为树状层级结构
+      switchTree() {
+        return this.cleanChildren(this.buildTree(this.options, '0'))
+      },
+      // 隐藏树状菜单
+      onCloseTree() {
+        this.$refs.popover.showPopper = false
+      },
+      // 显示时触发
+      onShowPopover() {
+        this.showStatus = true
+        this.$refs.tree.filter(false)
+        // 修改scrollbar宽度
+        const inputWidth = this.$refs.input.$refs.input.clientWidth
+        this.width = inputWidth
+      },
+      // 隐藏时触发
+      onHidePopover() {
+        this.showStatus = false
+        this.$emit('selected', this.valueModel)
+      },
+      // 树节点过滤方法
+      filterNode(query, data) {
+        if (!query) return true
+        return data[this.props.label].indexOf(query) !== -1
+      },
+      // 搜索树状数据中的 ID
+      queryTree(tree, id) {
+        let stark = []
+        stark = stark.concat(tree)
+        while (stark.length) {
+          const temp = stark.shift()
+          if (temp[this.props.children]) {
+            stark = stark.concat(temp[this.props.children])
+          }
+          if (temp[this.props.value] === id) {
+            return temp[this.props.label]
+          }
+        }
+        return ''
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id = '0') {
+        const fa = (parentId) => {
+          console.log('parentId:' + parentId)
+          const temp = []
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i]
+            if (n[this.props.parent] === parentId) {
+              n.children = fa(n.code)
+              temp.push(n)
+            }
+          }
+          return temp
+        }
+        return fa(id)
+      },
+      // 清除空 children项
+      cleanChildren(data) {
+        const fa = (list) => {
+          list.map((e) => {
+            if (e.children.length) {
+              fa(e.children)
+            } else {
+              delete e.children
+            }
+            return e
+          })
+          return list
+        }
+        return fa(data)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -243,4 +249,21 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
+  .selectScrollbar{
+    /*min-width: 175px;*/
+    /*position: absolute;*/
+    /*height: 100%;*/
+    width: 100%;
+  }
+  .select-tree{
+  }
+
+</style>
+<style lang="scss">
+  .select-tree{
+    /*max-height: 200px;*/
+  }
+  .list{
+    max-height: 300px;
+  }
 </style>

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d937a00..ea76aff 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -2,27 +2,28 @@
 <template>
   <el-popover
     ref="popover"
+    :width="width"
     placement="bottom-start"
     trigger="click"
-    class="select-tree scrollbar"
+    popper-class="select-tree"
     @show="onShowPopover"
     @hide="onHidePopover">
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}; max-height:${treeHeight};overflow-y:scroll`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      highlight-current
-      accordion
-      @node-click="onClickNode"/>
+    <el-scrollbar wrap-class="list" class="selectScrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"/>
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
-      :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -32,182 +33,187 @@
 </template>
 
 <script>
-export default {
-  name: 'SelectTree',
-  // 设置绑定参数
-  model: {
-    prop: 'value',
-    event: 'selected'
-  },
-  props: {
-    // 接收绑定参数
-    value: {
-      type: String,
-      default: ''
+  export default {
+    name: 'SelectTree',
+    // 设置绑定参数
+    model: {
+      prop: 'value',
+      event: 'selected'
     },
-    // 输入框宽度
-    width: {
-      type: String,
-      default: ''
-    },
-    // 输入框宽度
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 选项数据
-    options: {
-      type: Array,
-      required: true
-    },
-    // 输入框占位符
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    // 树节点配置选项
     props: {
-      type: Object,
-      required: false,
-      default: () => ({
-        parent: 'parentId',
-        value: 'rowGuid',
-        label: 'areaName',
-        children: 'children'
-      })
-    }
-  },
-  data() {
-    return {
-      // 树状菜单显示状态
-      showStatus: false,
-      // 菜单宽度
-      treeWidth: 'auto',
-      // 菜单最高高度
-      treeHeight: '400px',
-      // 输入框显示值
-      labelModel: '',
-      // 实际请求传值
-      valueModel: '0'
-    }
-  },
-  computed: {
-    // 是否为树状结构数据
-    dataType() {
-      const jsonStr = JSON.stringify(this.options)
-      return jsonStr.indexOf(this.props.children) !== -1
-    },
-    // 若非树状结构，则转化为树状结构数据
-    data() {
-      // return this.dataType ? this.options : this.switchTree()
-      return this.options
-    }
-  },
-  watch: {
-    labelModel(val) {
-      if (!val) {
-        if (val === '') {
-          this.valueModel = ''
-          this.value = ''
-          this.$emit('selected', this.valueModel)
-        }
-        this.valueModel = ''
-      }
-      this.$refs.tree.filter(val)
-    },
-    value(val) {
-      this.labelModel = this.queryTree(this.data, val)
-    }
-  },
-  created() {
-    // 检测输入框原有值并显示对应 label
-    if (this.value) {
-      this.labelModel = this.queryTree(this.data, this.value)
-    }
-    // 获取输入框宽度同步至树状菜单宽度
-    this.$nextTick(() => {
-      this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
-    })
-  },
-  methods: {
-    // 单击节点
-    onClickNode(node) {
-      this.labelModel = node[this.props.label]
-      this.valueModel = node[this.props.value]
-      this.onCloseTree()
-    },
-    // 偏平数组转化为树状层级结构
-    switchTree() {
-      return this.cleanChildren(this.buildTree(this.options, '0'))
-    },
-    // 隐藏树状菜单
-    onCloseTree() {
-      this.$refs.popover.showPopper = false
-    },
-    // 显示时触发
-    onShowPopover() {
-      this.showStatus = true
-      this.$refs.tree.filter(false)
-    },
-    // 隐藏时触发
-    onHidePopover() {
-      this.showStatus = false
-      this.$emit('selected', this.valueModel)
-    },
-    // 树节点过滤方法
-    filterNode(query, data) {
-      if (!query) return true
-      return data[this.props.label].indexOf(query) !== -1
-    },
-    // 搜索树状数据中的 ID
-    queryTree(tree, id) {
-      let stark = []
-      stark = stark.concat(tree)
-      while (stark.length) {
-        const temp = stark.shift()
-        if (temp[this.props.children]) {
-          stark = stark.concat(temp[this.props.children])
-        }
-        if (temp[this.props.value] === id) {
-          return temp[this.props.label]
-        }
-      }
-      return ''
-    },
-    // 将一维的扁平数组转换为多层级对象
-    buildTree(data, id = '0') {
-      const fa = (parentId) => {
-        console.log('parentId:' + parentId)
-        const temp = []
-        for (let i = 0; i < data.length; i++) {
-          const n = data[i]
-          if (n[this.props.parent] === parentId) {
-            n.children = fa(n.code)
-            temp.push(n)
-          }
-        }
-        return temp
-      }
-      return fa(id)
-    },
-    // 清除空 children项
-    cleanChildren(data) {
-      const fa = (list) => {
-        list.map((e) => {
-          if (e.children.length) {
-            fa(e.children)
-          } else {
-            delete e.children
-          }
-          return e
+      // 接收绑定参数
+      value: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度
+      // width: {
+      //   type: String,
+      //   default: ''
+      // },
+      // 输入框宽度
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 选项数据
+      options: {
+        type: Array,
+        required: true
+      },
+      // 输入框占位符
+      placeholder: {
+        type: String,
+        required: false,
+        default: '请选择'
+      },
+      // 树节点配置选项
+      props: {
+        type: Object,
+        required: false,
+        default: () => ({
+          parent: 'parentId',
+          value: 'rowGuid',
+          label: 'areaName',
+          children: 'children'
         })
-        return list
       }
-      return fa(data)
+    },
+    data() {
+      return {
+        // 树状菜单显示状态
+        showStatus: false,
+        // 菜单宽度
+        treeWidth: 'auto',
+        // 菜单最高高度
+        treeHeight: '400px',
+        // 输入框显示值
+        labelModel: '',
+        // 实际请求传值
+        valueModel: '0',
+        // popover的宽度
+        width: ''
+      }
+    },
+    computed: {
+      // 是否为树状结构数据
+      dataType() {
+        const jsonStr = JSON.stringify(this.options)
+        return jsonStr.indexOf(this.props.children) !== -1
+      },
+      // 若非树状结构，则转化为树状结构数据
+      data() {
+        // return this.dataType ? this.options : this.switchTree()
+        return this.options
+      }
+    },
+    watch: {
+      labelModel(val) {
+        if (!val) {
+          if (val === '') {
+            this.valueModel = ''
+            this.value = ''
+            this.$emit('selected', this.valueModel)
+          }
+          this.valueModel = ''
+        }
+        this.$refs.tree.filter(val)
+      },
+      value(val) {
+        this.labelModel = this.queryTree(this.data, val)
+      }
+    },
+    created() {
+      // 检测输入框原有值并显示对应 label
+      if (this.value) {
+        this.labelModel = this.queryTree(this.data, this.value)
+      }
+      // 获取输入框宽度同步至树状菜单宽度
+      this.$nextTick(() => {
+        this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
+      })
+    },
+    methods: {
+      // 单击节点
+      onClickNode(node) {
+        this.labelModel = node[this.props.label]
+        this.valueModel = node[this.props.value]
+        this.onCloseTree()
+      },
+      // 偏平数组转化为树状层级结构
+      switchTree() {
+        return this.cleanChildren(this.buildTree(this.options, '0'))
+      },
+      // 隐藏树状菜单
+      onCloseTree() {
+        this.$refs.popover.showPopper = false
+      },
+      // 显示时触发
+      onShowPopover() {
+        this.showStatus = true
+        this.$refs.tree.filter(false)
+        // 修改scrollbar宽度
+        const inputWidth = this.$refs.input.$refs.input.clientWidth
+        this.width = inputWidth
+      },
+      // 隐藏时触发
+      onHidePopover() {
+        this.showStatus = false
+        this.$emit('selected', this.valueModel)
+      },
+      // 树节点过滤方法
+      filterNode(query, data) {
+        if (!query) return true
+        return data[this.props.label].indexOf(query) !== -1
+      },
+      // 搜索树状数据中的 ID
+      queryTree(tree, id) {
+        let stark = []
+        stark = stark.concat(tree)
+        while (stark.length) {
+          const temp = stark.shift()
+          if (temp[this.props.children]) {
+            stark = stark.concat(temp[this.props.children])
+          }
+          if (temp[this.props.value] === id) {
+            return temp[this.props.label]
+          }
+        }
+        return ''
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id = '0') {
+        const fa = (parentId) => {
+          console.log('parentId:' + parentId)
+          const temp = []
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i]
+            if (n[this.props.parent] === parentId) {
+              n.children = fa(n.code)
+              temp.push(n)
+            }
+          }
+          return temp
+        }
+        return fa(id)
+      },
+      // 清除空 children项
+      cleanChildren(data) {
+        const fa = (list) => {
+          list.map((e) => {
+            if (e.children.length) {
+              fa(e.children)
+            } else {
+              delete e.children
+            }
+            return e
+          })
+          return list
+        }
+        return fa(data)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -243,4 +249,21 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
+  .selectScrollbar{
+    /*min-width: 175px;*/
+    /*position: absolute;*/
+    /*height: 100%;*/
+    width: 100%;
+  }
+  .select-tree{
+  }
+
+</style>
+<style lang="scss">
+  .select-tree{
+    /*max-height: 200px;*/
+  }
+  .list{
+    max-height: 300px;
+  }
 </style>
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 8e84b63..ae70a77 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -5,6 +5,7 @@
     :row-key="rowkey"
     :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     default-expand-all>
+    <el-table-column v-show="showIndex" align="center" type="index"/>
     <el-table-column v-if="columns.length===0" width="150" type="expand">
       <template slot-scope="scope">
         {{ scope.$index }}
@@ -26,66 +27,70 @@
 </template>
 
 <script>
-/**
-  Auth: Lei.j1ang
-  Created: 2018/1/19-13:59
-*/
+  /**
+   Auth: Lei.j1ang
+   Created: 2018/1/19-13:59
+   */
 // import treeToArray from './eval'
-export default {
-  name: 'TreeTable',
-  props: {
-    /* eslint-disable */
-    data: {
-      type: Array,
-      required: true
+  export default {
+    name: 'TreeTable',
+    props: {
+      /* eslint-disable */
+      data: {
+        type: Array,
+        required: true
+      },
+      columns: {
+        type: Array,
+        default: () => []
+      },
+      evalFunc: Function,
+      evalArgs: Array,
+      expandAll: {
+        type: Boolean,
+        default: true
+      },
+      rowkey:{
+        type:String,
+        required: true
+      },
+      showIndex:{
+        type:Boolean,
+        default:false
+      }
     },
-    columns: {
-      type: Array,
-      default: () => []
+    computed: {
+      // 格式化数据源
+      formatData: function() {
+        // let tmp
+        // if (!Array.isArray(this.data)) {
+        //   tmp = [this.data]
+        // } else {
+        //   tmp = this.data
+        // }
+        // for(const item of tmp){
+        //   this.expandRowKeys.push(item.id)
+        // }
+        return this.data
+      }
     },
-    evalFunc: Function,
-    evalArgs: Array,
-    expandAll: {
-      type: Boolean,
-      default: true
-    },
-    rowkey:{
-      type:String,
-      required: true
-    },
-  },
-  computed: {
-    // 格式化数据源
-    formatData: function() {
-      // let tmp
-      // if (!Array.isArray(this.data)) {
-      //   tmp = [this.data]
-      // } else {
-      //   tmp = this.data
+    methods: {
+      // showRow: function(row) {
+      //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      //   row.row._show = show
+      //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
+      // },
+      // // 切换下级是否展开
+      // toggleExpanded: function(trIndex) {
+      //   const record = this.formatData[trIndex]
+      //   record._expanded = !record._expanded
+      // },
+      // // 图标显示
+      // iconShow(index, record) {
+      //   return (index === 0 && record.children && record.children.length > 0)
       // }
-      // for(const item of tmp){
-      //   this.expandRowKeys.push(item.id)
-      // }
-      return this.data
     }
-  },
-  methods: {
-    // showRow: function(row) {
-    //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
-    //   row.row._show = show
-    //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
-    // },
-    // // 切换下级是否展开
-    // toggleExpanded: function(trIndex) {
-    //   const record = this.formatData[trIndex]
-    //   record._expanded = !record._expanded
-    // },
-    // // 图标显示
-    // iconShow(index, record) {
-    //   return (index === 0 && record.children && record.children.length > 0)
-    // }
   }
-}
 </script>
 <style rel="stylesheet/css">
   @keyframes treeTableShow {

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d937a00..ea76aff 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -2,27 +2,28 @@
 <template>
   <el-popover
     ref="popover"
+    :width="width"
     placement="bottom-start"
     trigger="click"
-    class="select-tree scrollbar"
+    popper-class="select-tree"
     @show="onShowPopover"
     @hide="onHidePopover">
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}; max-height:${treeHeight};overflow-y:scroll`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      highlight-current
-      accordion
-      @node-click="onClickNode"/>
+    <el-scrollbar wrap-class="list" class="selectScrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"/>
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
-      :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -32,182 +33,187 @@
 </template>
 
 <script>
-export default {
-  name: 'SelectTree',
-  // 设置绑定参数
-  model: {
-    prop: 'value',
-    event: 'selected'
-  },
-  props: {
-    // 接收绑定参数
-    value: {
-      type: String,
-      default: ''
+  export default {
+    name: 'SelectTree',
+    // 设置绑定参数
+    model: {
+      prop: 'value',
+      event: 'selected'
     },
-    // 输入框宽度
-    width: {
-      type: String,
-      default: ''
-    },
-    // 输入框宽度
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 选项数据
-    options: {
-      type: Array,
-      required: true
-    },
-    // 输入框占位符
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    // 树节点配置选项
     props: {
-      type: Object,
-      required: false,
-      default: () => ({
-        parent: 'parentId',
-        value: 'rowGuid',
-        label: 'areaName',
-        children: 'children'
-      })
-    }
-  },
-  data() {
-    return {
-      // 树状菜单显示状态
-      showStatus: false,
-      // 菜单宽度
-      treeWidth: 'auto',
-      // 菜单最高高度
-      treeHeight: '400px',
-      // 输入框显示值
-      labelModel: '',
-      // 实际请求传值
-      valueModel: '0'
-    }
-  },
-  computed: {
-    // 是否为树状结构数据
-    dataType() {
-      const jsonStr = JSON.stringify(this.options)
-      return jsonStr.indexOf(this.props.children) !== -1
-    },
-    // 若非树状结构，则转化为树状结构数据
-    data() {
-      // return this.dataType ? this.options : this.switchTree()
-      return this.options
-    }
-  },
-  watch: {
-    labelModel(val) {
-      if (!val) {
-        if (val === '') {
-          this.valueModel = ''
-          this.value = ''
-          this.$emit('selected', this.valueModel)
-        }
-        this.valueModel = ''
-      }
-      this.$refs.tree.filter(val)
-    },
-    value(val) {
-      this.labelModel = this.queryTree(this.data, val)
-    }
-  },
-  created() {
-    // 检测输入框原有值并显示对应 label
-    if (this.value) {
-      this.labelModel = this.queryTree(this.data, this.value)
-    }
-    // 获取输入框宽度同步至树状菜单宽度
-    this.$nextTick(() => {
-      this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
-    })
-  },
-  methods: {
-    // 单击节点
-    onClickNode(node) {
-      this.labelModel = node[this.props.label]
-      this.valueModel = node[this.props.value]
-      this.onCloseTree()
-    },
-    // 偏平数组转化为树状层级结构
-    switchTree() {
-      return this.cleanChildren(this.buildTree(this.options, '0'))
-    },
-    // 隐藏树状菜单
-    onCloseTree() {
-      this.$refs.popover.showPopper = false
-    },
-    // 显示时触发
-    onShowPopover() {
-      this.showStatus = true
-      this.$refs.tree.filter(false)
-    },
-    // 隐藏时触发
-    onHidePopover() {
-      this.showStatus = false
-      this.$emit('selected', this.valueModel)
-    },
-    // 树节点过滤方法
-    filterNode(query, data) {
-      if (!query) return true
-      return data[this.props.label].indexOf(query) !== -1
-    },
-    // 搜索树状数据中的 ID
-    queryTree(tree, id) {
-      let stark = []
-      stark = stark.concat(tree)
-      while (stark.length) {
-        const temp = stark.shift()
-        if (temp[this.props.children]) {
-          stark = stark.concat(temp[this.props.children])
-        }
-        if (temp[this.props.value] === id) {
-          return temp[this.props.label]
-        }
-      }
-      return ''
-    },
-    // 将一维的扁平数组转换为多层级对象
-    buildTree(data, id = '0') {
-      const fa = (parentId) => {
-        console.log('parentId:' + parentId)
-        const temp = []
-        for (let i = 0; i < data.length; i++) {
-          const n = data[i]
-          if (n[this.props.parent] === parentId) {
-            n.children = fa(n.code)
-            temp.push(n)
-          }
-        }
-        return temp
-      }
-      return fa(id)
-    },
-    // 清除空 children项
-    cleanChildren(data) {
-      const fa = (list) => {
-        list.map((e) => {
-          if (e.children.length) {
-            fa(e.children)
-          } else {
-            delete e.children
-          }
-          return e
+      // 接收绑定参数
+      value: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度
+      // width: {
+      //   type: String,
+      //   default: ''
+      // },
+      // 输入框宽度
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 选项数据
+      options: {
+        type: Array,
+        required: true
+      },
+      // 输入框占位符
+      placeholder: {
+        type: String,
+        required: false,
+        default: '请选择'
+      },
+      // 树节点配置选项
+      props: {
+        type: Object,
+        required: false,
+        default: () => ({
+          parent: 'parentId',
+          value: 'rowGuid',
+          label: 'areaName',
+          children: 'children'
         })
-        return list
       }
-      return fa(data)
+    },
+    data() {
+      return {
+        // 树状菜单显示状态
+        showStatus: false,
+        // 菜单宽度
+        treeWidth: 'auto',
+        // 菜单最高高度
+        treeHeight: '400px',
+        // 输入框显示值
+        labelModel: '',
+        // 实际请求传值
+        valueModel: '0',
+        // popover的宽度
+        width: ''
+      }
+    },
+    computed: {
+      // 是否为树状结构数据
+      dataType() {
+        const jsonStr = JSON.stringify(this.options)
+        return jsonStr.indexOf(this.props.children) !== -1
+      },
+      // 若非树状结构，则转化为树状结构数据
+      data() {
+        // return this.dataType ? this.options : this.switchTree()
+        return this.options
+      }
+    },
+    watch: {
+      labelModel(val) {
+        if (!val) {
+          if (val === '') {
+            this.valueModel = ''
+            this.value = ''
+            this.$emit('selected', this.valueModel)
+          }
+          this.valueModel = ''
+        }
+        this.$refs.tree.filter(val)
+      },
+      value(val) {
+        this.labelModel = this.queryTree(this.data, val)
+      }
+    },
+    created() {
+      // 检测输入框原有值并显示对应 label
+      if (this.value) {
+        this.labelModel = this.queryTree(this.data, this.value)
+      }
+      // 获取输入框宽度同步至树状菜单宽度
+      this.$nextTick(() => {
+        this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
+      })
+    },
+    methods: {
+      // 单击节点
+      onClickNode(node) {
+        this.labelModel = node[this.props.label]
+        this.valueModel = node[this.props.value]
+        this.onCloseTree()
+      },
+      // 偏平数组转化为树状层级结构
+      switchTree() {
+        return this.cleanChildren(this.buildTree(this.options, '0'))
+      },
+      // 隐藏树状菜单
+      onCloseTree() {
+        this.$refs.popover.showPopper = false
+      },
+      // 显示时触发
+      onShowPopover() {
+        this.showStatus = true
+        this.$refs.tree.filter(false)
+        // 修改scrollbar宽度
+        const inputWidth = this.$refs.input.$refs.input.clientWidth
+        this.width = inputWidth
+      },
+      // 隐藏时触发
+      onHidePopover() {
+        this.showStatus = false
+        this.$emit('selected', this.valueModel)
+      },
+      // 树节点过滤方法
+      filterNode(query, data) {
+        if (!query) return true
+        return data[this.props.label].indexOf(query) !== -1
+      },
+      // 搜索树状数据中的 ID
+      queryTree(tree, id) {
+        let stark = []
+        stark = stark.concat(tree)
+        while (stark.length) {
+          const temp = stark.shift()
+          if (temp[this.props.children]) {
+            stark = stark.concat(temp[this.props.children])
+          }
+          if (temp[this.props.value] === id) {
+            return temp[this.props.label]
+          }
+        }
+        return ''
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id = '0') {
+        const fa = (parentId) => {
+          console.log('parentId:' + parentId)
+          const temp = []
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i]
+            if (n[this.props.parent] === parentId) {
+              n.children = fa(n.code)
+              temp.push(n)
+            }
+          }
+          return temp
+        }
+        return fa(id)
+      },
+      // 清除空 children项
+      cleanChildren(data) {
+        const fa = (list) => {
+          list.map((e) => {
+            if (e.children.length) {
+              fa(e.children)
+            } else {
+              delete e.children
+            }
+            return e
+          })
+          return list
+        }
+        return fa(data)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -243,4 +249,21 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
+  .selectScrollbar{
+    /*min-width: 175px;*/
+    /*position: absolute;*/
+    /*height: 100%;*/
+    width: 100%;
+  }
+  .select-tree{
+  }
+
+</style>
+<style lang="scss">
+  .select-tree{
+    /*max-height: 200px;*/
+  }
+  .list{
+    max-height: 300px;
+  }
 </style>
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 8e84b63..ae70a77 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -5,6 +5,7 @@
     :row-key="rowkey"
     :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     default-expand-all>
+    <el-table-column v-show="showIndex" align="center" type="index"/>
     <el-table-column v-if="columns.length===0" width="150" type="expand">
       <template slot-scope="scope">
         {{ scope.$index }}
@@ -26,66 +27,70 @@
 </template>
 
 <script>
-/**
-  Auth: Lei.j1ang
-  Created: 2018/1/19-13:59
-*/
+  /**
+   Auth: Lei.j1ang
+   Created: 2018/1/19-13:59
+   */
 // import treeToArray from './eval'
-export default {
-  name: 'TreeTable',
-  props: {
-    /* eslint-disable */
-    data: {
-      type: Array,
-      required: true
+  export default {
+    name: 'TreeTable',
+    props: {
+      /* eslint-disable */
+      data: {
+        type: Array,
+        required: true
+      },
+      columns: {
+        type: Array,
+        default: () => []
+      },
+      evalFunc: Function,
+      evalArgs: Array,
+      expandAll: {
+        type: Boolean,
+        default: true
+      },
+      rowkey:{
+        type:String,
+        required: true
+      },
+      showIndex:{
+        type:Boolean,
+        default:false
+      }
     },
-    columns: {
-      type: Array,
-      default: () => []
+    computed: {
+      // 格式化数据源
+      formatData: function() {
+        // let tmp
+        // if (!Array.isArray(this.data)) {
+        //   tmp = [this.data]
+        // } else {
+        //   tmp = this.data
+        // }
+        // for(const item of tmp){
+        //   this.expandRowKeys.push(item.id)
+        // }
+        return this.data
+      }
     },
-    evalFunc: Function,
-    evalArgs: Array,
-    expandAll: {
-      type: Boolean,
-      default: true
-    },
-    rowkey:{
-      type:String,
-      required: true
-    },
-  },
-  computed: {
-    // 格式化数据源
-    formatData: function() {
-      // let tmp
-      // if (!Array.isArray(this.data)) {
-      //   tmp = [this.data]
-      // } else {
-      //   tmp = this.data
+    methods: {
+      // showRow: function(row) {
+      //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      //   row.row._show = show
+      //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
+      // },
+      // // 切换下级是否展开
+      // toggleExpanded: function(trIndex) {
+      //   const record = this.formatData[trIndex]
+      //   record._expanded = !record._expanded
+      // },
+      // // 图标显示
+      // iconShow(index, record) {
+      //   return (index === 0 && record.children && record.children.length > 0)
       // }
-      // for(const item of tmp){
-      //   this.expandRowKeys.push(item.id)
-      // }
-      return this.data
     }
-  },
-  methods: {
-    // showRow: function(row) {
-    //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
-    //   row.row._show = show
-    //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
-    // },
-    // // 切换下级是否展开
-    // toggleExpanded: function(trIndex) {
-    //   const record = this.formatData[trIndex]
-    //   record._expanded = !record._expanded
-    // },
-    // // 图标显示
-    // iconShow(index, record) {
-    //   return (index === 0 && record.children && record.children.length > 0)
-    // }
   }
-}
 </script>
 <style rel="stylesheet/css">
   @keyframes treeTableShow {
diff --git a/src/router/index.js b/src/router/index.js
index 5bd54f4..594f49f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -234,6 +234,12 @@
         meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] }
       },
       {
+        path: '/deviceStatics',
+        name: 'DeviceStatics',
+        component: () => import('@/views/deviceStatics/deviceStatics'),
+        meta: { title: '设备统计', icon: 'icon-config', permission: ['/deviceStatics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d937a00..ea76aff 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -2,27 +2,28 @@
 <template>
   <el-popover
     ref="popover"
+    :width="width"
     placement="bottom-start"
     trigger="click"
-    class="select-tree scrollbar"
+    popper-class="select-tree"
     @show="onShowPopover"
     @hide="onHidePopover">
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}; max-height:${treeHeight};overflow-y:scroll`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      highlight-current
-      accordion
-      @node-click="onClickNode"/>
+    <el-scrollbar wrap-class="list" class="selectScrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"/>
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
-      :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -32,182 +33,187 @@
 </template>
 
 <script>
-export default {
-  name: 'SelectTree',
-  // 设置绑定参数
-  model: {
-    prop: 'value',
-    event: 'selected'
-  },
-  props: {
-    // 接收绑定参数
-    value: {
-      type: String,
-      default: ''
+  export default {
+    name: 'SelectTree',
+    // 设置绑定参数
+    model: {
+      prop: 'value',
+      event: 'selected'
     },
-    // 输入框宽度
-    width: {
-      type: String,
-      default: ''
-    },
-    // 输入框宽度
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 选项数据
-    options: {
-      type: Array,
-      required: true
-    },
-    // 输入框占位符
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    // 树节点配置选项
     props: {
-      type: Object,
-      required: false,
-      default: () => ({
-        parent: 'parentId',
-        value: 'rowGuid',
-        label: 'areaName',
-        children: 'children'
-      })
-    }
-  },
-  data() {
-    return {
-      // 树状菜单显示状态
-      showStatus: false,
-      // 菜单宽度
-      treeWidth: 'auto',
-      // 菜单最高高度
-      treeHeight: '400px',
-      // 输入框显示值
-      labelModel: '',
-      // 实际请求传值
-      valueModel: '0'
-    }
-  },
-  computed: {
-    // 是否为树状结构数据
-    dataType() {
-      const jsonStr = JSON.stringify(this.options)
-      return jsonStr.indexOf(this.props.children) !== -1
-    },
-    // 若非树状结构，则转化为树状结构数据
-    data() {
-      // return this.dataType ? this.options : this.switchTree()
-      return this.options
-    }
-  },
-  watch: {
-    labelModel(val) {
-      if (!val) {
-        if (val === '') {
-          this.valueModel = ''
-          this.value = ''
-          this.$emit('selected', this.valueModel)
-        }
-        this.valueModel = ''
-      }
-      this.$refs.tree.filter(val)
-    },
-    value(val) {
-      this.labelModel = this.queryTree(this.data, val)
-    }
-  },
-  created() {
-    // 检测输入框原有值并显示对应 label
-    if (this.value) {
-      this.labelModel = this.queryTree(this.data, this.value)
-    }
-    // 获取输入框宽度同步至树状菜单宽度
-    this.$nextTick(() => {
-      this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
-    })
-  },
-  methods: {
-    // 单击节点
-    onClickNode(node) {
-      this.labelModel = node[this.props.label]
-      this.valueModel = node[this.props.value]
-      this.onCloseTree()
-    },
-    // 偏平数组转化为树状层级结构
-    switchTree() {
-      return this.cleanChildren(this.buildTree(this.options, '0'))
-    },
-    // 隐藏树状菜单
-    onCloseTree() {
-      this.$refs.popover.showPopper = false
-    },
-    // 显示时触发
-    onShowPopover() {
-      this.showStatus = true
-      this.$refs.tree.filter(false)
-    },
-    // 隐藏时触发
-    onHidePopover() {
-      this.showStatus = false
-      this.$emit('selected', this.valueModel)
-    },
-    // 树节点过滤方法
-    filterNode(query, data) {
-      if (!query) return true
-      return data[this.props.label].indexOf(query) !== -1
-    },
-    // 搜索树状数据中的 ID
-    queryTree(tree, id) {
-      let stark = []
-      stark = stark.concat(tree)
-      while (stark.length) {
-        const temp = stark.shift()
-        if (temp[this.props.children]) {
-          stark = stark.concat(temp[this.props.children])
-        }
-        if (temp[this.props.value] === id) {
-          return temp[this.props.label]
-        }
-      }
-      return ''
-    },
-    // 将一维的扁平数组转换为多层级对象
-    buildTree(data, id = '0') {
-      const fa = (parentId) => {
-        console.log('parentId:' + parentId)
-        const temp = []
-        for (let i = 0; i < data.length; i++) {
-          const n = data[i]
-          if (n[this.props.parent] === parentId) {
-            n.children = fa(n.code)
-            temp.push(n)
-          }
-        }
-        return temp
-      }
-      return fa(id)
-    },
-    // 清除空 children项
-    cleanChildren(data) {
-      const fa = (list) => {
-        list.map((e) => {
-          if (e.children.length) {
-            fa(e.children)
-          } else {
-            delete e.children
-          }
-          return e
+      // 接收绑定参数
+      value: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度
+      // width: {
+      //   type: String,
+      //   default: ''
+      // },
+      // 输入框宽度
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 选项数据
+      options: {
+        type: Array,
+        required: true
+      },
+      // 输入框占位符
+      placeholder: {
+        type: String,
+        required: false,
+        default: '请选择'
+      },
+      // 树节点配置选项
+      props: {
+        type: Object,
+        required: false,
+        default: () => ({
+          parent: 'parentId',
+          value: 'rowGuid',
+          label: 'areaName',
+          children: 'children'
         })
-        return list
       }
-      return fa(data)
+    },
+    data() {
+      return {
+        // 树状菜单显示状态
+        showStatus: false,
+        // 菜单宽度
+        treeWidth: 'auto',
+        // 菜单最高高度
+        treeHeight: '400px',
+        // 输入框显示值
+        labelModel: '',
+        // 实际请求传值
+        valueModel: '0',
+        // popover的宽度
+        width: ''
+      }
+    },
+    computed: {
+      // 是否为树状结构数据
+      dataType() {
+        const jsonStr = JSON.stringify(this.options)
+        return jsonStr.indexOf(this.props.children) !== -1
+      },
+      // 若非树状结构，则转化为树状结构数据
+      data() {
+        // return this.dataType ? this.options : this.switchTree()
+        return this.options
+      }
+    },
+    watch: {
+      labelModel(val) {
+        if (!val) {
+          if (val === '') {
+            this.valueModel = ''
+            this.value = ''
+            this.$emit('selected', this.valueModel)
+          }
+          this.valueModel = ''
+        }
+        this.$refs.tree.filter(val)
+      },
+      value(val) {
+        this.labelModel = this.queryTree(this.data, val)
+      }
+    },
+    created() {
+      // 检测输入框原有值并显示对应 label
+      if (this.value) {
+        this.labelModel = this.queryTree(this.data, this.value)
+      }
+      // 获取输入框宽度同步至树状菜单宽度
+      this.$nextTick(() => {
+        this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
+      })
+    },
+    methods: {
+      // 单击节点
+      onClickNode(node) {
+        this.labelModel = node[this.props.label]
+        this.valueModel = node[this.props.value]
+        this.onCloseTree()
+      },
+      // 偏平数组转化为树状层级结构
+      switchTree() {
+        return this.cleanChildren(this.buildTree(this.options, '0'))
+      },
+      // 隐藏树状菜单
+      onCloseTree() {
+        this.$refs.popover.showPopper = false
+      },
+      // 显示时触发
+      onShowPopover() {
+        this.showStatus = true
+        this.$refs.tree.filter(false)
+        // 修改scrollbar宽度
+        const inputWidth = this.$refs.input.$refs.input.clientWidth
+        this.width = inputWidth
+      },
+      // 隐藏时触发
+      onHidePopover() {
+        this.showStatus = false
+        this.$emit('selected', this.valueModel)
+      },
+      // 树节点过滤方法
+      filterNode(query, data) {
+        if (!query) return true
+        return data[this.props.label].indexOf(query) !== -1
+      },
+      // 搜索树状数据中的 ID
+      queryTree(tree, id) {
+        let stark = []
+        stark = stark.concat(tree)
+        while (stark.length) {
+          const temp = stark.shift()
+          if (temp[this.props.children]) {
+            stark = stark.concat(temp[this.props.children])
+          }
+          if (temp[this.props.value] === id) {
+            return temp[this.props.label]
+          }
+        }
+        return ''
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id = '0') {
+        const fa = (parentId) => {
+          console.log('parentId:' + parentId)
+          const temp = []
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i]
+            if (n[this.props.parent] === parentId) {
+              n.children = fa(n.code)
+              temp.push(n)
+            }
+          }
+          return temp
+        }
+        return fa(id)
+      },
+      // 清除空 children项
+      cleanChildren(data) {
+        const fa = (list) => {
+          list.map((e) => {
+            if (e.children.length) {
+              fa(e.children)
+            } else {
+              delete e.children
+            }
+            return e
+          })
+          return list
+        }
+        return fa(data)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -243,4 +249,21 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
+  .selectScrollbar{
+    /*min-width: 175px;*/
+    /*position: absolute;*/
+    /*height: 100%;*/
+    width: 100%;
+  }
+  .select-tree{
+  }
+
+</style>
+<style lang="scss">
+  .select-tree{
+    /*max-height: 200px;*/
+  }
+  .list{
+    max-height: 300px;
+  }
 </style>
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 8e84b63..ae70a77 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -5,6 +5,7 @@
     :row-key="rowkey"
     :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     default-expand-all>
+    <el-table-column v-show="showIndex" align="center" type="index"/>
     <el-table-column v-if="columns.length===0" width="150" type="expand">
       <template slot-scope="scope">
         {{ scope.$index }}
@@ -26,66 +27,70 @@
 </template>
 
 <script>
-/**
-  Auth: Lei.j1ang
-  Created: 2018/1/19-13:59
-*/
+  /**
+   Auth: Lei.j1ang
+   Created: 2018/1/19-13:59
+   */
 // import treeToArray from './eval'
-export default {
-  name: 'TreeTable',
-  props: {
-    /* eslint-disable */
-    data: {
-      type: Array,
-      required: true
+  export default {
+    name: 'TreeTable',
+    props: {
+      /* eslint-disable */
+      data: {
+        type: Array,
+        required: true
+      },
+      columns: {
+        type: Array,
+        default: () => []
+      },
+      evalFunc: Function,
+      evalArgs: Array,
+      expandAll: {
+        type: Boolean,
+        default: true
+      },
+      rowkey:{
+        type:String,
+        required: true
+      },
+      showIndex:{
+        type:Boolean,
+        default:false
+      }
     },
-    columns: {
-      type: Array,
-      default: () => []
+    computed: {
+      // 格式化数据源
+      formatData: function() {
+        // let tmp
+        // if (!Array.isArray(this.data)) {
+        //   tmp = [this.data]
+        // } else {
+        //   tmp = this.data
+        // }
+        // for(const item of tmp){
+        //   this.expandRowKeys.push(item.id)
+        // }
+        return this.data
+      }
     },
-    evalFunc: Function,
-    evalArgs: Array,
-    expandAll: {
-      type: Boolean,
-      default: true
-    },
-    rowkey:{
-      type:String,
-      required: true
-    },
-  },
-  computed: {
-    // 格式化数据源
-    formatData: function() {
-      // let tmp
-      // if (!Array.isArray(this.data)) {
-      //   tmp = [this.data]
-      // } else {
-      //   tmp = this.data
+    methods: {
+      // showRow: function(row) {
+      //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      //   row.row._show = show
+      //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
+      // },
+      // // 切换下级是否展开
+      // toggleExpanded: function(trIndex) {
+      //   const record = this.formatData[trIndex]
+      //   record._expanded = !record._expanded
+      // },
+      // // 图标显示
+      // iconShow(index, record) {
+      //   return (index === 0 && record.children && record.children.length > 0)
       // }
-      // for(const item of tmp){
-      //   this.expandRowKeys.push(item.id)
-      // }
-      return this.data
     }
-  },
-  methods: {
-    // showRow: function(row) {
-    //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
-    //   row.row._show = show
-    //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
-    // },
-    // // 切换下级是否展开
-    // toggleExpanded: function(trIndex) {
-    //   const record = this.formatData[trIndex]
-    //   record._expanded = !record._expanded
-    // },
-    // // 图标显示
-    // iconShow(index, record) {
-    //   return (index === 0 && record.children && record.children.length > 0)
-    // }
   }
-}
 </script>
 <style rel="stylesheet/css">
   @keyframes treeTableShow {
diff --git a/src/router/index.js b/src/router/index.js
index 5bd54f4..594f49f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -234,6 +234,12 @@
         meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] }
       },
       {
+        path: '/deviceStatics',
+        name: 'DeviceStatics',
+        component: () => import('@/views/deviceStatics/deviceStatics'),
+        meta: { title: '设备统计', icon: 'icon-config', permission: ['/deviceStatics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),
diff --git a/src/store/getters.js b/src/store/getters.js
index a7e0c78..20a98dc 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的窨井类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d937a00..ea76aff 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -2,27 +2,28 @@
 <template>
   <el-popover
     ref="popover"
+    :width="width"
     placement="bottom-start"
     trigger="click"
-    class="select-tree scrollbar"
+    popper-class="select-tree"
     @show="onShowPopover"
     @hide="onHidePopover">
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}; max-height:${treeHeight};overflow-y:scroll`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      highlight-current
-      accordion
-      @node-click="onClickNode"/>
+    <el-scrollbar wrap-class="list" class="selectScrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"/>
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
-      :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -32,182 +33,187 @@
 </template>
 
 <script>
-export default {
-  name: 'SelectTree',
-  // 设置绑定参数
-  model: {
-    prop: 'value',
-    event: 'selected'
-  },
-  props: {
-    // 接收绑定参数
-    value: {
-      type: String,
-      default: ''
+  export default {
+    name: 'SelectTree',
+    // 设置绑定参数
+    model: {
+      prop: 'value',
+      event: 'selected'
     },
-    // 输入框宽度
-    width: {
-      type: String,
-      default: ''
-    },
-    // 输入框宽度
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 选项数据
-    options: {
-      type: Array,
-      required: true
-    },
-    // 输入框占位符
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    // 树节点配置选项
     props: {
-      type: Object,
-      required: false,
-      default: () => ({
-        parent: 'parentId',
-        value: 'rowGuid',
-        label: 'areaName',
-        children: 'children'
-      })
-    }
-  },
-  data() {
-    return {
-      // 树状菜单显示状态
-      showStatus: false,
-      // 菜单宽度
-      treeWidth: 'auto',
-      // 菜单最高高度
-      treeHeight: '400px',
-      // 输入框显示值
-      labelModel: '',
-      // 实际请求传值
-      valueModel: '0'
-    }
-  },
-  computed: {
-    // 是否为树状结构数据
-    dataType() {
-      const jsonStr = JSON.stringify(this.options)
-      return jsonStr.indexOf(this.props.children) !== -1
-    },
-    // 若非树状结构，则转化为树状结构数据
-    data() {
-      // return this.dataType ? this.options : this.switchTree()
-      return this.options
-    }
-  },
-  watch: {
-    labelModel(val) {
-      if (!val) {
-        if (val === '') {
-          this.valueModel = ''
-          this.value = ''
-          this.$emit('selected', this.valueModel)
-        }
-        this.valueModel = ''
-      }
-      this.$refs.tree.filter(val)
-    },
-    value(val) {
-      this.labelModel = this.queryTree(this.data, val)
-    }
-  },
-  created() {
-    // 检测输入框原有值并显示对应 label
-    if (this.value) {
-      this.labelModel = this.queryTree(this.data, this.value)
-    }
-    // 获取输入框宽度同步至树状菜单宽度
-    this.$nextTick(() => {
-      this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
-    })
-  },
-  methods: {
-    // 单击节点
-    onClickNode(node) {
-      this.labelModel = node[this.props.label]
-      this.valueModel = node[this.props.value]
-      this.onCloseTree()
-    },
-    // 偏平数组转化为树状层级结构
-    switchTree() {
-      return this.cleanChildren(this.buildTree(this.options, '0'))
-    },
-    // 隐藏树状菜单
-    onCloseTree() {
-      this.$refs.popover.showPopper = false
-    },
-    // 显示时触发
-    onShowPopover() {
-      this.showStatus = true
-      this.$refs.tree.filter(false)
-    },
-    // 隐藏时触发
-    onHidePopover() {
-      this.showStatus = false
-      this.$emit('selected', this.valueModel)
-    },
-    // 树节点过滤方法
-    filterNode(query, data) {
-      if (!query) return true
-      return data[this.props.label].indexOf(query) !== -1
-    },
-    // 搜索树状数据中的 ID
-    queryTree(tree, id) {
-      let stark = []
-      stark = stark.concat(tree)
-      while (stark.length) {
-        const temp = stark.shift()
-        if (temp[this.props.children]) {
-          stark = stark.concat(temp[this.props.children])
-        }
-        if (temp[this.props.value] === id) {
-          return temp[this.props.label]
-        }
-      }
-      return ''
-    },
-    // 将一维的扁平数组转换为多层级对象
-    buildTree(data, id = '0') {
-      const fa = (parentId) => {
-        console.log('parentId:' + parentId)
-        const temp = []
-        for (let i = 0; i < data.length; i++) {
-          const n = data[i]
-          if (n[this.props.parent] === parentId) {
-            n.children = fa(n.code)
-            temp.push(n)
-          }
-        }
-        return temp
-      }
-      return fa(id)
-    },
-    // 清除空 children项
-    cleanChildren(data) {
-      const fa = (list) => {
-        list.map((e) => {
-          if (e.children.length) {
-            fa(e.children)
-          } else {
-            delete e.children
-          }
-          return e
+      // 接收绑定参数
+      value: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度
+      // width: {
+      //   type: String,
+      //   default: ''
+      // },
+      // 输入框宽度
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 选项数据
+      options: {
+        type: Array,
+        required: true
+      },
+      // 输入框占位符
+      placeholder: {
+        type: String,
+        required: false,
+        default: '请选择'
+      },
+      // 树节点配置选项
+      props: {
+        type: Object,
+        required: false,
+        default: () => ({
+          parent: 'parentId',
+          value: 'rowGuid',
+          label: 'areaName',
+          children: 'children'
         })
-        return list
       }
-      return fa(data)
+    },
+    data() {
+      return {
+        // 树状菜单显示状态
+        showStatus: false,
+        // 菜单宽度
+        treeWidth: 'auto',
+        // 菜单最高高度
+        treeHeight: '400px',
+        // 输入框显示值
+        labelModel: '',
+        // 实际请求传值
+        valueModel: '0',
+        // popover的宽度
+        width: ''
+      }
+    },
+    computed: {
+      // 是否为树状结构数据
+      dataType() {
+        const jsonStr = JSON.stringify(this.options)
+        return jsonStr.indexOf(this.props.children) !== -1
+      },
+      // 若非树状结构，则转化为树状结构数据
+      data() {
+        // return this.dataType ? this.options : this.switchTree()
+        return this.options
+      }
+    },
+    watch: {
+      labelModel(val) {
+        if (!val) {
+          if (val === '') {
+            this.valueModel = ''
+            this.value = ''
+            this.$emit('selected', this.valueModel)
+          }
+          this.valueModel = ''
+        }
+        this.$refs.tree.filter(val)
+      },
+      value(val) {
+        this.labelModel = this.queryTree(this.data, val)
+      }
+    },
+    created() {
+      // 检测输入框原有值并显示对应 label
+      if (this.value) {
+        this.labelModel = this.queryTree(this.data, this.value)
+      }
+      // 获取输入框宽度同步至树状菜单宽度
+      this.$nextTick(() => {
+        this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
+      })
+    },
+    methods: {
+      // 单击节点
+      onClickNode(node) {
+        this.labelModel = node[this.props.label]
+        this.valueModel = node[this.props.value]
+        this.onCloseTree()
+      },
+      // 偏平数组转化为树状层级结构
+      switchTree() {
+        return this.cleanChildren(this.buildTree(this.options, '0'))
+      },
+      // 隐藏树状菜单
+      onCloseTree() {
+        this.$refs.popover.showPopper = false
+      },
+      // 显示时触发
+      onShowPopover() {
+        this.showStatus = true
+        this.$refs.tree.filter(false)
+        // 修改scrollbar宽度
+        const inputWidth = this.$refs.input.$refs.input.clientWidth
+        this.width = inputWidth
+      },
+      // 隐藏时触发
+      onHidePopover() {
+        this.showStatus = false
+        this.$emit('selected', this.valueModel)
+      },
+      // 树节点过滤方法
+      filterNode(query, data) {
+        if (!query) return true
+        return data[this.props.label].indexOf(query) !== -1
+      },
+      // 搜索树状数据中的 ID
+      queryTree(tree, id) {
+        let stark = []
+        stark = stark.concat(tree)
+        while (stark.length) {
+          const temp = stark.shift()
+          if (temp[this.props.children]) {
+            stark = stark.concat(temp[this.props.children])
+          }
+          if (temp[this.props.value] === id) {
+            return temp[this.props.label]
+          }
+        }
+        return ''
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id = '0') {
+        const fa = (parentId) => {
+          console.log('parentId:' + parentId)
+          const temp = []
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i]
+            if (n[this.props.parent] === parentId) {
+              n.children = fa(n.code)
+              temp.push(n)
+            }
+          }
+          return temp
+        }
+        return fa(id)
+      },
+      // 清除空 children项
+      cleanChildren(data) {
+        const fa = (list) => {
+          list.map((e) => {
+            if (e.children.length) {
+              fa(e.children)
+            } else {
+              delete e.children
+            }
+            return e
+          })
+          return list
+        }
+        return fa(data)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -243,4 +249,21 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
+  .selectScrollbar{
+    /*min-width: 175px;*/
+    /*position: absolute;*/
+    /*height: 100%;*/
+    width: 100%;
+  }
+  .select-tree{
+  }
+
+</style>
+<style lang="scss">
+  .select-tree{
+    /*max-height: 200px;*/
+  }
+  .list{
+    max-height: 300px;
+  }
 </style>
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 8e84b63..ae70a77 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -5,6 +5,7 @@
     :row-key="rowkey"
     :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     default-expand-all>
+    <el-table-column v-show="showIndex" align="center" type="index"/>
     <el-table-column v-if="columns.length===0" width="150" type="expand">
       <template slot-scope="scope">
         {{ scope.$index }}
@@ -26,66 +27,70 @@
 </template>
 
 <script>
-/**
-  Auth: Lei.j1ang
-  Created: 2018/1/19-13:59
-*/
+  /**
+   Auth: Lei.j1ang
+   Created: 2018/1/19-13:59
+   */
 // import treeToArray from './eval'
-export default {
-  name: 'TreeTable',
-  props: {
-    /* eslint-disable */
-    data: {
-      type: Array,
-      required: true
+  export default {
+    name: 'TreeTable',
+    props: {
+      /* eslint-disable */
+      data: {
+        type: Array,
+        required: true
+      },
+      columns: {
+        type: Array,
+        default: () => []
+      },
+      evalFunc: Function,
+      evalArgs: Array,
+      expandAll: {
+        type: Boolean,
+        default: true
+      },
+      rowkey:{
+        type:String,
+        required: true
+      },
+      showIndex:{
+        type:Boolean,
+        default:false
+      }
     },
-    columns: {
-      type: Array,
-      default: () => []
+    computed: {
+      // 格式化数据源
+      formatData: function() {
+        // let tmp
+        // if (!Array.isArray(this.data)) {
+        //   tmp = [this.data]
+        // } else {
+        //   tmp = this.data
+        // }
+        // for(const item of tmp){
+        //   this.expandRowKeys.push(item.id)
+        // }
+        return this.data
+      }
     },
-    evalFunc: Function,
-    evalArgs: Array,
-    expandAll: {
-      type: Boolean,
-      default: true
-    },
-    rowkey:{
-      type:String,
-      required: true
-    },
-  },
-  computed: {
-    // 格式化数据源
-    formatData: function() {
-      // let tmp
-      // if (!Array.isArray(this.data)) {
-      //   tmp = [this.data]
-      // } else {
-      //   tmp = this.data
+    methods: {
+      // showRow: function(row) {
+      //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      //   row.row._show = show
+      //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
+      // },
+      // // 切换下级是否展开
+      // toggleExpanded: function(trIndex) {
+      //   const record = this.formatData[trIndex]
+      //   record._expanded = !record._expanded
+      // },
+      // // 图标显示
+      // iconShow(index, record) {
+      //   return (index === 0 && record.children && record.children.length > 0)
       // }
-      // for(const item of tmp){
-      //   this.expandRowKeys.push(item.id)
-      // }
-      return this.data
     }
-  },
-  methods: {
-    // showRow: function(row) {
-    //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
-    //   row.row._show = show
-    //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
-    // },
-    // // 切换下级是否展开
-    // toggleExpanded: function(trIndex) {
-    //   const record = this.formatData[trIndex]
-    //   record._expanded = !record._expanded
-    // },
-    // // 图标显示
-    // iconShow(index, record) {
-    //   return (index === 0 && record.children && record.children.length > 0)
-    // }
   }
-}
 </script>
 <style rel="stylesheet/css">
   @keyframes treeTableShow {
diff --git a/src/router/index.js b/src/router/index.js
index 5bd54f4..594f49f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -234,6 +234,12 @@
         meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] }
       },
       {
+        path: '/deviceStatics',
+        name: 'DeviceStatics',
+        component: () => import('@/views/deviceStatics/deviceStatics'),
+        meta: { title: '设备统计', icon: 'icon-config', permission: ['/deviceStatics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),
diff --git a/src/store/getters.js b/src/store/getters.js
index a7e0c78..20a98dc 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的窨井类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6a2e596..265da3c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,7 +10,7 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
+    wellTypes: [], // 支持窨井类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -106,7 +106,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何闸井类型')
+            reject('该用户不支持任何窨井类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
@@ -143,7 +143,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何闸井类型')
+            reject('该用户不支持任何窨井类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
@@ -173,6 +173,9 @@
           resolve()
         }).catch(error => {
           reject(error)
+          commit('SET_TOKEN', '')
+          commit('SET_ROLES', [])
+          removeToken()
         })
       })
     },

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d937a00..ea76aff 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -2,27 +2,28 @@
 <template>
   <el-popover
     ref="popover"
+    :width="width"
     placement="bottom-start"
     trigger="click"
-    class="select-tree scrollbar"
+    popper-class="select-tree"
     @show="onShowPopover"
     @hide="onHidePopover">
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}; max-height:${treeHeight};overflow-y:scroll`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      highlight-current
-      accordion
-      @node-click="onClickNode"/>
+    <el-scrollbar wrap-class="list" class="selectScrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"/>
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
-      :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -32,182 +33,187 @@
 </template>
 
 <script>
-export default {
-  name: 'SelectTree',
-  // 设置绑定参数
-  model: {
-    prop: 'value',
-    event: 'selected'
-  },
-  props: {
-    // 接收绑定参数
-    value: {
-      type: String,
-      default: ''
+  export default {
+    name: 'SelectTree',
+    // 设置绑定参数
+    model: {
+      prop: 'value',
+      event: 'selected'
     },
-    // 输入框宽度
-    width: {
-      type: String,
-      default: ''
-    },
-    // 输入框宽度
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 选项数据
-    options: {
-      type: Array,
-      required: true
-    },
-    // 输入框占位符
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    // 树节点配置选项
     props: {
-      type: Object,
-      required: false,
-      default: () => ({
-        parent: 'parentId',
-        value: 'rowGuid',
-        label: 'areaName',
-        children: 'children'
-      })
-    }
-  },
-  data() {
-    return {
-      // 树状菜单显示状态
-      showStatus: false,
-      // 菜单宽度
-      treeWidth: 'auto',
-      // 菜单最高高度
-      treeHeight: '400px',
-      // 输入框显示值
-      labelModel: '',
-      // 实际请求传值
-      valueModel: '0'
-    }
-  },
-  computed: {
-    // 是否为树状结构数据
-    dataType() {
-      const jsonStr = JSON.stringify(this.options)
-      return jsonStr.indexOf(this.props.children) !== -1
-    },
-    // 若非树状结构，则转化为树状结构数据
-    data() {
-      // return this.dataType ? this.options : this.switchTree()
-      return this.options
-    }
-  },
-  watch: {
-    labelModel(val) {
-      if (!val) {
-        if (val === '') {
-          this.valueModel = ''
-          this.value = ''
-          this.$emit('selected', this.valueModel)
-        }
-        this.valueModel = ''
-      }
-      this.$refs.tree.filter(val)
-    },
-    value(val) {
-      this.labelModel = this.queryTree(this.data, val)
-    }
-  },
-  created() {
-    // 检测输入框原有值并显示对应 label
-    if (this.value) {
-      this.labelModel = this.queryTree(this.data, this.value)
-    }
-    // 获取输入框宽度同步至树状菜单宽度
-    this.$nextTick(() => {
-      this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
-    })
-  },
-  methods: {
-    // 单击节点
-    onClickNode(node) {
-      this.labelModel = node[this.props.label]
-      this.valueModel = node[this.props.value]
-      this.onCloseTree()
-    },
-    // 偏平数组转化为树状层级结构
-    switchTree() {
-      return this.cleanChildren(this.buildTree(this.options, '0'))
-    },
-    // 隐藏树状菜单
-    onCloseTree() {
-      this.$refs.popover.showPopper = false
-    },
-    // 显示时触发
-    onShowPopover() {
-      this.showStatus = true
-      this.$refs.tree.filter(false)
-    },
-    // 隐藏时触发
-    onHidePopover() {
-      this.showStatus = false
-      this.$emit('selected', this.valueModel)
-    },
-    // 树节点过滤方法
-    filterNode(query, data) {
-      if (!query) return true
-      return data[this.props.label].indexOf(query) !== -1
-    },
-    // 搜索树状数据中的 ID
-    queryTree(tree, id) {
-      let stark = []
-      stark = stark.concat(tree)
-      while (stark.length) {
-        const temp = stark.shift()
-        if (temp[this.props.children]) {
-          stark = stark.concat(temp[this.props.children])
-        }
-        if (temp[this.props.value] === id) {
-          return temp[this.props.label]
-        }
-      }
-      return ''
-    },
-    // 将一维的扁平数组转换为多层级对象
-    buildTree(data, id = '0') {
-      const fa = (parentId) => {
-        console.log('parentId:' + parentId)
-        const temp = []
-        for (let i = 0; i < data.length; i++) {
-          const n = data[i]
-          if (n[this.props.parent] === parentId) {
-            n.children = fa(n.code)
-            temp.push(n)
-          }
-        }
-        return temp
-      }
-      return fa(id)
-    },
-    // 清除空 children项
-    cleanChildren(data) {
-      const fa = (list) => {
-        list.map((e) => {
-          if (e.children.length) {
-            fa(e.children)
-          } else {
-            delete e.children
-          }
-          return e
+      // 接收绑定参数
+      value: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度
+      // width: {
+      //   type: String,
+      //   default: ''
+      // },
+      // 输入框宽度
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 选项数据
+      options: {
+        type: Array,
+        required: true
+      },
+      // 输入框占位符
+      placeholder: {
+        type: String,
+        required: false,
+        default: '请选择'
+      },
+      // 树节点配置选项
+      props: {
+        type: Object,
+        required: false,
+        default: () => ({
+          parent: 'parentId',
+          value: 'rowGuid',
+          label: 'areaName',
+          children: 'children'
         })
-        return list
       }
-      return fa(data)
+    },
+    data() {
+      return {
+        // 树状菜单显示状态
+        showStatus: false,
+        // 菜单宽度
+        treeWidth: 'auto',
+        // 菜单最高高度
+        treeHeight: '400px',
+        // 输入框显示值
+        labelModel: '',
+        // 实际请求传值
+        valueModel: '0',
+        // popover的宽度
+        width: ''
+      }
+    },
+    computed: {
+      // 是否为树状结构数据
+      dataType() {
+        const jsonStr = JSON.stringify(this.options)
+        return jsonStr.indexOf(this.props.children) !== -1
+      },
+      // 若非树状结构，则转化为树状结构数据
+      data() {
+        // return this.dataType ? this.options : this.switchTree()
+        return this.options
+      }
+    },
+    watch: {
+      labelModel(val) {
+        if (!val) {
+          if (val === '') {
+            this.valueModel = ''
+            this.value = ''
+            this.$emit('selected', this.valueModel)
+          }
+          this.valueModel = ''
+        }
+        this.$refs.tree.filter(val)
+      },
+      value(val) {
+        this.labelModel = this.queryTree(this.data, val)
+      }
+    },
+    created() {
+      // 检测输入框原有值并显示对应 label
+      if (this.value) {
+        this.labelModel = this.queryTree(this.data, this.value)
+      }
+      // 获取输入框宽度同步至树状菜单宽度
+      this.$nextTick(() => {
+        this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
+      })
+    },
+    methods: {
+      // 单击节点
+      onClickNode(node) {
+        this.labelModel = node[this.props.label]
+        this.valueModel = node[this.props.value]
+        this.onCloseTree()
+      },
+      // 偏平数组转化为树状层级结构
+      switchTree() {
+        return this.cleanChildren(this.buildTree(this.options, '0'))
+      },
+      // 隐藏树状菜单
+      onCloseTree() {
+        this.$refs.popover.showPopper = false
+      },
+      // 显示时触发
+      onShowPopover() {
+        this.showStatus = true
+        this.$refs.tree.filter(false)
+        // 修改scrollbar宽度
+        const inputWidth = this.$refs.input.$refs.input.clientWidth
+        this.width = inputWidth
+      },
+      // 隐藏时触发
+      onHidePopover() {
+        this.showStatus = false
+        this.$emit('selected', this.valueModel)
+      },
+      // 树节点过滤方法
+      filterNode(query, data) {
+        if (!query) return true
+        return data[this.props.label].indexOf(query) !== -1
+      },
+      // 搜索树状数据中的 ID
+      queryTree(tree, id) {
+        let stark = []
+        stark = stark.concat(tree)
+        while (stark.length) {
+          const temp = stark.shift()
+          if (temp[this.props.children]) {
+            stark = stark.concat(temp[this.props.children])
+          }
+          if (temp[this.props.value] === id) {
+            return temp[this.props.label]
+          }
+        }
+        return ''
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id = '0') {
+        const fa = (parentId) => {
+          console.log('parentId:' + parentId)
+          const temp = []
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i]
+            if (n[this.props.parent] === parentId) {
+              n.children = fa(n.code)
+              temp.push(n)
+            }
+          }
+          return temp
+        }
+        return fa(id)
+      },
+      // 清除空 children项
+      cleanChildren(data) {
+        const fa = (list) => {
+          list.map((e) => {
+            if (e.children.length) {
+              fa(e.children)
+            } else {
+              delete e.children
+            }
+            return e
+          })
+          return list
+        }
+        return fa(data)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -243,4 +249,21 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
+  .selectScrollbar{
+    /*min-width: 175px;*/
+    /*position: absolute;*/
+    /*height: 100%;*/
+    width: 100%;
+  }
+  .select-tree{
+  }
+
+</style>
+<style lang="scss">
+  .select-tree{
+    /*max-height: 200px;*/
+  }
+  .list{
+    max-height: 300px;
+  }
 </style>
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 8e84b63..ae70a77 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -5,6 +5,7 @@
     :row-key="rowkey"
     :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     default-expand-all>
+    <el-table-column v-show="showIndex" align="center" type="index"/>
     <el-table-column v-if="columns.length===0" width="150" type="expand">
       <template slot-scope="scope">
         {{ scope.$index }}
@@ -26,66 +27,70 @@
 </template>
 
 <script>
-/**
-  Auth: Lei.j1ang
-  Created: 2018/1/19-13:59
-*/
+  /**
+   Auth: Lei.j1ang
+   Created: 2018/1/19-13:59
+   */
 // import treeToArray from './eval'
-export default {
-  name: 'TreeTable',
-  props: {
-    /* eslint-disable */
-    data: {
-      type: Array,
-      required: true
+  export default {
+    name: 'TreeTable',
+    props: {
+      /* eslint-disable */
+      data: {
+        type: Array,
+        required: true
+      },
+      columns: {
+        type: Array,
+        default: () => []
+      },
+      evalFunc: Function,
+      evalArgs: Array,
+      expandAll: {
+        type: Boolean,
+        default: true
+      },
+      rowkey:{
+        type:String,
+        required: true
+      },
+      showIndex:{
+        type:Boolean,
+        default:false
+      }
     },
-    columns: {
-      type: Array,
-      default: () => []
+    computed: {
+      // 格式化数据源
+      formatData: function() {
+        // let tmp
+        // if (!Array.isArray(this.data)) {
+        //   tmp = [this.data]
+        // } else {
+        //   tmp = this.data
+        // }
+        // for(const item of tmp){
+        //   this.expandRowKeys.push(item.id)
+        // }
+        return this.data
+      }
     },
-    evalFunc: Function,
-    evalArgs: Array,
-    expandAll: {
-      type: Boolean,
-      default: true
-    },
-    rowkey:{
-      type:String,
-      required: true
-    },
-  },
-  computed: {
-    // 格式化数据源
-    formatData: function() {
-      // let tmp
-      // if (!Array.isArray(this.data)) {
-      //   tmp = [this.data]
-      // } else {
-      //   tmp = this.data
+    methods: {
+      // showRow: function(row) {
+      //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      //   row.row._show = show
+      //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
+      // },
+      // // 切换下级是否展开
+      // toggleExpanded: function(trIndex) {
+      //   const record = this.formatData[trIndex]
+      //   record._expanded = !record._expanded
+      // },
+      // // 图标显示
+      // iconShow(index, record) {
+      //   return (index === 0 && record.children && record.children.length > 0)
       // }
-      // for(const item of tmp){
-      //   this.expandRowKeys.push(item.id)
-      // }
-      return this.data
     }
-  },
-  methods: {
-    // showRow: function(row) {
-    //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
-    //   row.row._show = show
-    //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
-    // },
-    // // 切换下级是否展开
-    // toggleExpanded: function(trIndex) {
-    //   const record = this.formatData[trIndex]
-    //   record._expanded = !record._expanded
-    // },
-    // // 图标显示
-    // iconShow(index, record) {
-    //   return (index === 0 && record.children && record.children.length > 0)
-    // }
   }
-}
 </script>
 <style rel="stylesheet/css">
   @keyframes treeTableShow {
diff --git a/src/router/index.js b/src/router/index.js
index 5bd54f4..594f49f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -234,6 +234,12 @@
         meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] }
       },
       {
+        path: '/deviceStatics',
+        name: 'DeviceStatics',
+        component: () => import('@/views/deviceStatics/deviceStatics'),
+        meta: { title: '设备统计', icon: 'icon-config', permission: ['/deviceStatics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),
diff --git a/src/store/getters.js b/src/store/getters.js
index a7e0c78..20a98dc 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的窨井类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6a2e596..265da3c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,7 +10,7 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
+    wellTypes: [], // 支持窨井类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -106,7 +106,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何闸井类型')
+            reject('该用户不支持任何窨井类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
@@ -143,7 +143,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何闸井类型')
+            reject('该用户不支持任何窨井类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
@@ -173,6 +173,9 @@
           resolve()
         }).catch(error => {
           reject(error)
+          commit('SET_TOKEN', '')
+          commit('SET_ROLES', [])
+          removeToken()
         })
       })
     },
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..aa41264 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -26,6 +26,10 @@
   return ct_month
 }
 
+export function formatDate(date,fmt){
+  return date.Format(fmt)
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 9984306..2e68297 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,3 +18,29 @@
     params
   })
 }
+
+// 告警规则查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/levelList',
+    method: 'get',
+    params
+  })
+}
+// 告警规则查询
+export function getAlarmLevelByType(params) {
+  return request({
+    url: 'alarm/levelByType',
+    method: 'get',
+    params
+  })
+}
+
+// 修改告警规则
+export function updateAlarmLevel(params) {
+  return request({
+    url: 'alarm/configLevel',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/common.js b/src/api/common.js
index f3c0414..4c38684 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -24,3 +24,12 @@
     data: param
   })
 }
+
+// 项目列表查询
+export function getTenantList(params) {
+  return request({
+    url: 'tenant/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js
index d6b33af..aee72a9 100644
--- a/src/api/dataStatics.js
+++ b/src/api/dataStatics.js
@@ -3,7 +3,7 @@
  */
 import request from '@/utils/request'
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellStaticByBfzt(params) {
   return request({
     url: 'well/countByBfzt',
@@ -11,7 +11,7 @@
     params
   })
 }
-// 根据权属单位统计闸井数量
+// 根据权属单位统计窨井数量
 export function wellStaticByDept(params) {
   return request({
     url: 'statics/wellStaticsByDept',
@@ -20,7 +20,7 @@
   })
 }
 
-// 根据井类型统计闸井数量
+// 根据井类型统计窨井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
@@ -30,7 +30,7 @@
 }
 
 // 根据设备类型统计设备数量
-export function deviceStaticByType(params) {
+export function deviceStaticsByType(params) {
   return request({
     url: 'statics/deviceStaticsByType',
     method: 'get',
@@ -39,7 +39,7 @@
 }
 
 // 根据权属单位统计设备数量
-export function deviceStaticByDept(params) {
+export function deviceStaticsByDept(params) {
   return request({
     url: 'statics/deviceStaticsByDept',
     method: 'get',
diff --git a/src/api/well.js b/src/api/well.js
index 38ba439..127bcca 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 闸井管理接口
+ * 窨井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 闸井查询
+// 窨井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取闸井详情
+// 获取窨井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 闸井类别
+// 窨井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加闸井
+// 添加窨井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改闸井
+// 修改窨井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除闸井
+// 删除窨井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -103,7 +103,7 @@
     }
   })
 }
-// 闸井批量布防
+// 窨井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -112,7 +112,7 @@
   })
 }
 
-// 根据布防状态统计闸井数量
+// 根据布防状态统计窨井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -120,3 +120,11 @@
   })
 }
 
+// 单个窨井查询
+export function getWellOne(params) {
+  return request({
+    url: 'well/selectOne',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index f8c359b..70a6285 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -17,38 +17,38 @@
 </template>
 
 <script>
-export default {
-  name: 'Card',
-  props: {
-    title: {
-      type: String,
-      default: '标题'
+  export default {
+    name: 'Card',
+    props: {
+      title: {
+        type: String,
+        default: '标题'
+      },
+      subtitle: {
+        type: String,
+        default: ''
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      context: {
+        type: [String, Number],
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#40c9c6'
+      }
     },
-    subtitle: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    context: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#40c9c6'
-    }
-  },
-  computed: {
-    backgroundColor() {
-      return {
-        color: this.color
+    computed: {
+      backgroundColor() {
+        return {
+          color: this.color
+        }
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -63,41 +63,41 @@
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
 
-  &:hover {
-  .card-panel-icon-wrapper {
-    color: #fff;
-  }
-  }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+    }
 
-  .card-panel-icon-wrapper {
-    float: left;
-    margin: 14px 0 0 14px;
-    padding: 16px;
-    transition: all 0.38s ease-out;
-    border-radius: 6px;
-  }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
 
-  .card-panel-icon {
-    float: left;
-    font-size: 48px;
-  }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
 
-  .card-panel-description {
-    float: left;
-    font-weight: bold;
-    margin: 26px;
-    margin-left: 10px;
+    .card-panel-description {
+      float: left;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 10px;
 
-  .card-panel-text {
-    line-height: 18px;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 16px;
-    margin-bottom: 12px;
-  }
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
 
-  .card-panel-num {
-    font-size: 20px;
-  }
-  }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
   }
 </style>
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef5f59c..7716d41 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -12,94 +12,97 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
-import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/dept'
-export default {
-  name: 'DeptSelect',
-  components: {
-    SelectTree
-  },
-  props: {
-    // 数据绑定
-    value: {
-      type: [Number, String],
-      default: ''
+  import { judgeTree, toTreeList } from '@/utils/structure'
+  import SelectTree from '@/components/SelectTree/singleSelect'
+  import { getDeptTreeList } from '@/api/dept'
+  export default {
+    name: 'DeptSelect',
+    components: {
+      SelectTree
     },
-    placeholder: {
-      type: String,
-      default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
-      type: Boolean,
-      default: true
-    },
-    deptType: {
-      type: String,
-      default: ''
-    },
-    deptShow: {
-      type: Boolean,
-      default: false
-    }
-  }, // 接收绑定参数
-  data() {
-    return {
-      deptTreeList: [],
-      multiData: false,
-      defaultProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
+    props: {
+      // 数据绑定
+      value: {
+        type: [Number, String],
+        default: ''
       },
-      selected: '' + this.value,
-      showDeptSelect: true
-    }
-  },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected')
-      this.$emit('input', val)
-    }
-  },
-  mounted() {
-    this.fetchPcode()
-  },
-  methods: {
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
-        }
+      placeholder: {
+        type: String,
+        default: '请选择父级'
+      },
+      needTop: { // 是否需要顶级
+        type: Boolean,
+        default: true
+      },
+      deptType: {
+        type: String,
+        default: ''
+      },
+      deptShow: {
+        type: Boolean,
+        default: false
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
-          if (list) {
-            // 如果有必要转树
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
-              this.deptTreeList = list
-              this.multiData = false
-            }
-            console.log(this.deptTreeList)
+    }, // 接收绑定参数
+    data() {
+      return {
+        deptTreeList: [],
+        multiData: false,
+        defaultProps: {
+          parent: 'pid',
+          value: 'id',
+          label: 'name',
+          children: 'children'
+        },
+        selected: '' + this.value,
+        showDeptSelect: true
+      }
+    },
+    watch: {
+      value: function(val) {
+        this.selected = '' + this.value
+      },
+      selected: function(val) {
+        console.log('watch selected')
+        this.$emit('input', val)
+      }
+    },
+    mounted() {
+      this.fetchPcode()
+    },
+    methods: {
+      // 加载父组织树形下拉菜单
+      fetchPcode: function() {
+        let listQuery = {}
+        if (this.deptType !== '') {
+          listQuery = {
+            deptType: this.deptType
           }
         }
-      })
+        getDeptTreeList(listQuery).then(response => {
+          const list = response.data.list
+          if (!this.deptShow && list.length <= 1) {
+            this.showDeptSelect = false
+          } else {
+            // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+            if (list) {
+              // 如果有必要转树
+              if (judgeTree(list)) {
+                this.multiData = true
+                this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+                // 如果不需要顶级,将顶级去掉
+                if (!this.needTop && this.deptTreeList.length === 1) {
+                  this.deptTreeList = this.deptTreeList[0].children
+                }
+              } else {
+                this.deptTreeList = list
+                this.multiData = false
+              }
+            }
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d937a00..ea76aff 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -2,27 +2,28 @@
 <template>
   <el-popover
     ref="popover"
+    :width="width"
     placement="bottom-start"
     trigger="click"
-    class="select-tree scrollbar"
+    popper-class="select-tree"
     @show="onShowPopover"
     @hide="onHidePopover">
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}; max-height:${treeHeight};overflow-y:scroll`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      highlight-current
-      accordion
-      @node-click="onClickNode"/>
+    <el-scrollbar wrap-class="list" class="selectScrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"/>
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
-      :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -32,182 +33,187 @@
 </template>
 
 <script>
-export default {
-  name: 'SelectTree',
-  // 设置绑定参数
-  model: {
-    prop: 'value',
-    event: 'selected'
-  },
-  props: {
-    // 接收绑定参数
-    value: {
-      type: String,
-      default: ''
+  export default {
+    name: 'SelectTree',
+    // 设置绑定参数
+    model: {
+      prop: 'value',
+      event: 'selected'
     },
-    // 输入框宽度
-    width: {
-      type: String,
-      default: ''
-    },
-    // 输入框宽度
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 选项数据
-    options: {
-      type: Array,
-      required: true
-    },
-    // 输入框占位符
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    // 树节点配置选项
     props: {
-      type: Object,
-      required: false,
-      default: () => ({
-        parent: 'parentId',
-        value: 'rowGuid',
-        label: 'areaName',
-        children: 'children'
-      })
-    }
-  },
-  data() {
-    return {
-      // 树状菜单显示状态
-      showStatus: false,
-      // 菜单宽度
-      treeWidth: 'auto',
-      // 菜单最高高度
-      treeHeight: '400px',
-      // 输入框显示值
-      labelModel: '',
-      // 实际请求传值
-      valueModel: '0'
-    }
-  },
-  computed: {
-    // 是否为树状结构数据
-    dataType() {
-      const jsonStr = JSON.stringify(this.options)
-      return jsonStr.indexOf(this.props.children) !== -1
-    },
-    // 若非树状结构，则转化为树状结构数据
-    data() {
-      // return this.dataType ? this.options : this.switchTree()
-      return this.options
-    }
-  },
-  watch: {
-    labelModel(val) {
-      if (!val) {
-        if (val === '') {
-          this.valueModel = ''
-          this.value = ''
-          this.$emit('selected', this.valueModel)
-        }
-        this.valueModel = ''
-      }
-      this.$refs.tree.filter(val)
-    },
-    value(val) {
-      this.labelModel = this.queryTree(this.data, val)
-    }
-  },
-  created() {
-    // 检测输入框原有值并显示对应 label
-    if (this.value) {
-      this.labelModel = this.queryTree(this.data, this.value)
-    }
-    // 获取输入框宽度同步至树状菜单宽度
-    this.$nextTick(() => {
-      this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
-    })
-  },
-  methods: {
-    // 单击节点
-    onClickNode(node) {
-      this.labelModel = node[this.props.label]
-      this.valueModel = node[this.props.value]
-      this.onCloseTree()
-    },
-    // 偏平数组转化为树状层级结构
-    switchTree() {
-      return this.cleanChildren(this.buildTree(this.options, '0'))
-    },
-    // 隐藏树状菜单
-    onCloseTree() {
-      this.$refs.popover.showPopper = false
-    },
-    // 显示时触发
-    onShowPopover() {
-      this.showStatus = true
-      this.$refs.tree.filter(false)
-    },
-    // 隐藏时触发
-    onHidePopover() {
-      this.showStatus = false
-      this.$emit('selected', this.valueModel)
-    },
-    // 树节点过滤方法
-    filterNode(query, data) {
-      if (!query) return true
-      return data[this.props.label].indexOf(query) !== -1
-    },
-    // 搜索树状数据中的 ID
-    queryTree(tree, id) {
-      let stark = []
-      stark = stark.concat(tree)
-      while (stark.length) {
-        const temp = stark.shift()
-        if (temp[this.props.children]) {
-          stark = stark.concat(temp[this.props.children])
-        }
-        if (temp[this.props.value] === id) {
-          return temp[this.props.label]
-        }
-      }
-      return ''
-    },
-    // 将一维的扁平数组转换为多层级对象
-    buildTree(data, id = '0') {
-      const fa = (parentId) => {
-        console.log('parentId:' + parentId)
-        const temp = []
-        for (let i = 0; i < data.length; i++) {
-          const n = data[i]
-          if (n[this.props.parent] === parentId) {
-            n.children = fa(n.code)
-            temp.push(n)
-          }
-        }
-        return temp
-      }
-      return fa(id)
-    },
-    // 清除空 children项
-    cleanChildren(data) {
-      const fa = (list) => {
-        list.map((e) => {
-          if (e.children.length) {
-            fa(e.children)
-          } else {
-            delete e.children
-          }
-          return e
+      // 接收绑定参数
+      value: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度
+      // width: {
+      //   type: String,
+      //   default: ''
+      // },
+      // 输入框宽度
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 选项数据
+      options: {
+        type: Array,
+        required: true
+      },
+      // 输入框占位符
+      placeholder: {
+        type: String,
+        required: false,
+        default: '请选择'
+      },
+      // 树节点配置选项
+      props: {
+        type: Object,
+        required: false,
+        default: () => ({
+          parent: 'parentId',
+          value: 'rowGuid',
+          label: 'areaName',
+          children: 'children'
         })
-        return list
       }
-      return fa(data)
+    },
+    data() {
+      return {
+        // 树状菜单显示状态
+        showStatus: false,
+        // 菜单宽度
+        treeWidth: 'auto',
+        // 菜单最高高度
+        treeHeight: '400px',
+        // 输入框显示值
+        labelModel: '',
+        // 实际请求传值
+        valueModel: '0',
+        // popover的宽度
+        width: ''
+      }
+    },
+    computed: {
+      // 是否为树状结构数据
+      dataType() {
+        const jsonStr = JSON.stringify(this.options)
+        return jsonStr.indexOf(this.props.children) !== -1
+      },
+      // 若非树状结构，则转化为树状结构数据
+      data() {
+        // return this.dataType ? this.options : this.switchTree()
+        return this.options
+      }
+    },
+    watch: {
+      labelModel(val) {
+        if (!val) {
+          if (val === '') {
+            this.valueModel = ''
+            this.value = ''
+            this.$emit('selected', this.valueModel)
+          }
+          this.valueModel = ''
+        }
+        this.$refs.tree.filter(val)
+      },
+      value(val) {
+        this.labelModel = this.queryTree(this.data, val)
+      }
+    },
+    created() {
+      // 检测输入框原有值并显示对应 label
+      if (this.value) {
+        this.labelModel = this.queryTree(this.data, this.value)
+      }
+      // 获取输入框宽度同步至树状菜单宽度
+      this.$nextTick(() => {
+        this.treeWidth = `${(this.width || this.$refs.input.$refs.input.clientWidth) - 24}px`
+      })
+    },
+    methods: {
+      // 单击节点
+      onClickNode(node) {
+        this.labelModel = node[this.props.label]
+        this.valueModel = node[this.props.value]
+        this.onCloseTree()
+      },
+      // 偏平数组转化为树状层级结构
+      switchTree() {
+        return this.cleanChildren(this.buildTree(this.options, '0'))
+      },
+      // 隐藏树状菜单
+      onCloseTree() {
+        this.$refs.popover.showPopper = false
+      },
+      // 显示时触发
+      onShowPopover() {
+        this.showStatus = true
+        this.$refs.tree.filter(false)
+        // 修改scrollbar宽度
+        const inputWidth = this.$refs.input.$refs.input.clientWidth
+        this.width = inputWidth
+      },
+      // 隐藏时触发
+      onHidePopover() {
+        this.showStatus = false
+        this.$emit('selected', this.valueModel)
+      },
+      // 树节点过滤方法
+      filterNode(query, data) {
+        if (!query) return true
+        return data[this.props.label].indexOf(query) !== -1
+      },
+      // 搜索树状数据中的 ID
+      queryTree(tree, id) {
+        let stark = []
+        stark = stark.concat(tree)
+        while (stark.length) {
+          const temp = stark.shift()
+          if (temp[this.props.children]) {
+            stark = stark.concat(temp[this.props.children])
+          }
+          if (temp[this.props.value] === id) {
+            return temp[this.props.label]
+          }
+        }
+        return ''
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id = '0') {
+        const fa = (parentId) => {
+          console.log('parentId:' + parentId)
+          const temp = []
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i]
+            if (n[this.props.parent] === parentId) {
+              n.children = fa(n.code)
+              temp.push(n)
+            }
+          }
+          return temp
+        }
+        return fa(id)
+      },
+      // 清除空 children项
+      cleanChildren(data) {
+        const fa = (list) => {
+          list.map((e) => {
+            if (e.children.length) {
+              fa(e.children)
+            } else {
+              delete e.children
+            }
+            return e
+          })
+          return list
+        }
+        return fa(data)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
@@ -243,4 +249,21 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
+  .selectScrollbar{
+    /*min-width: 175px;*/
+    /*position: absolute;*/
+    /*height: 100%;*/
+    width: 100%;
+  }
+  .select-tree{
+  }
+
+</style>
+<style lang="scss">
+  .select-tree{
+    /*max-height: 200px;*/
+  }
+  .list{
+    max-height: 300px;
+  }
 </style>
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 8e84b63..ae70a77 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -5,6 +5,7 @@
     :row-key="rowkey"
     :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     default-expand-all>
+    <el-table-column v-show="showIndex" align="center" type="index"/>
     <el-table-column v-if="columns.length===0" width="150" type="expand">
       <template slot-scope="scope">
         {{ scope.$index }}
@@ -26,66 +27,70 @@
 </template>
 
 <script>
-/**
-  Auth: Lei.j1ang
-  Created: 2018/1/19-13:59
-*/
+  /**
+   Auth: Lei.j1ang
+   Created: 2018/1/19-13:59
+   */
 // import treeToArray from './eval'
-export default {
-  name: 'TreeTable',
-  props: {
-    /* eslint-disable */
-    data: {
-      type: Array,
-      required: true
+  export default {
+    name: 'TreeTable',
+    props: {
+      /* eslint-disable */
+      data: {
+        type: Array,
+        required: true
+      },
+      columns: {
+        type: Array,
+        default: () => []
+      },
+      evalFunc: Function,
+      evalArgs: Array,
+      expandAll: {
+        type: Boolean,
+        default: true
+      },
+      rowkey:{
+        type:String,
+        required: true
+      },
+      showIndex:{
+        type:Boolean,
+        default:false
+      }
     },
-    columns: {
-      type: Array,
-      default: () => []
+    computed: {
+      // 格式化数据源
+      formatData: function() {
+        // let tmp
+        // if (!Array.isArray(this.data)) {
+        //   tmp = [this.data]
+        // } else {
+        //   tmp = this.data
+        // }
+        // for(const item of tmp){
+        //   this.expandRowKeys.push(item.id)
+        // }
+        return this.data
+      }
     },
-    evalFunc: Function,
-    evalArgs: Array,
-    expandAll: {
-      type: Boolean,
-      default: true
-    },
-    rowkey:{
-      type:String,
-      required: true
-    },
-  },
-  computed: {
-    // 格式化数据源
-    formatData: function() {
-      // let tmp
-      // if (!Array.isArray(this.data)) {
-      //   tmp = [this.data]
-      // } else {
-      //   tmp = this.data
+    methods: {
+      // showRow: function(row) {
+      //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      //   row.row._show = show
+      //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
+      // },
+      // // 切换下级是否展开
+      // toggleExpanded: function(trIndex) {
+      //   const record = this.formatData[trIndex]
+      //   record._expanded = !record._expanded
+      // },
+      // // 图标显示
+      // iconShow(index, record) {
+      //   return (index === 0 && record.children && record.children.length > 0)
       // }
-      // for(const item of tmp){
-      //   this.expandRowKeys.push(item.id)
-      // }
-      return this.data
     }
-  },
-  methods: {
-    // showRow: function(row) {
-    //   const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
-    //   row.row._show = show
-    //   return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
-    // },
-    // // 切换下级是否展开
-    // toggleExpanded: function(trIndex) {
-    //   const record = this.formatData[trIndex]
-    //   record._expanded = !record._expanded
-    // },
-    // // 图标显示
-    // iconShow(index, record) {
-    //   return (index === 0 && record.children && record.children.length > 0)
-    // }
   }
-}
 </script>
 <style rel="stylesheet/css">
   @keyframes treeTableShow {
diff --git a/src/router/index.js b/src/router/index.js
index 5bd54f4..594f49f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -234,6 +234,12 @@
         meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] }
       },
       {
+        path: '/deviceStatics',
+        name: 'DeviceStatics',
+        component: () => import('@/views/deviceStatics/deviceStatics'),
+        meta: { title: '设备统计', icon: 'icon-config', permission: ['/deviceStatics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),
diff --git a/src/store/getters.js b/src/store/getters.js
index a7e0c78..20a98dc 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的窨井类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6a2e596..265da3c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,7 +10,7 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
+    wellTypes: [], // 支持窨井类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -106,7 +106,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何闸井类型')
+            reject('该用户不支持任何窨井类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
@@ -143,7 +143,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何闸井类型')
+            reject('该用户不支持任何窨井类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
@@ -173,6 +173,9 @@
           resolve()
         }).catch(error => {
           reject(error)
+          commit('SET_TOKEN', '')
+          commit('SET_ROLES', [])
+          removeToken()
         })
       })
     },
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..aa41264 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -26,6 +26,10 @@
   return ct_month
 }
 
+export function formatDate(date,fmt){
+  return date.Format(fmt)
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8b6b90e..c0105a5 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,9 +5,9 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号" clearable/>
+            <el-input v-model.trim="listQuery.keywords" placeholder="窨井编号" clearable/>
           </el-form-item>
-          <el-form-item v-if="showAlarmType" class="selectForm-container-item" prop="alarmType">
+          <el-form-item v-if="isOperation()" class="selectForm-container-item" prop="alarmType">
             <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
               <el-option
                 v-for="item in alarmTypeList"
@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.alarmType=='1'" type="text" @click="showJob(scope.row)">查看工单</el-button>
+            <el-button type="text" @click="showJob(scope.row)">查看工单</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -79,143 +79,128 @@
 </template>
 
 <script>
-import infoWell from '@/views/wellManage/infoWell'
-import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
-let isFromDetail = false
+  import infoWell from '@/views/wellManage/infoWell'
+  import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
+  let isFromDetail = false
+  import { isOperation } from '@/utils/permission'
 
-export default {
-  name: 'ListAlarmRecords',
-  components: { infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        alarmType: '',
-        alarmContentType: '',
-        beginTime: '',
-        endTime: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      timeRange: [], // 时间范围
-      columns: [
-        {
-          text: '闸井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '详细地址',
-          value: 'position',
-          align: 'center'
-        },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警原因',
-          value: 'alarmContentName',
-          align: 'center'
-        },
-        {
-          text: '告警数值',
-          value: 'alarmValue',
-          width: 90,
-          align: 'center',
-          class: 'warning'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '告警时间',
-          value: 'alarmTime',
-          width: 170,
-          align: 'center'
-        }
+  export default {
+    name: 'ListAlarmRecords',
+    components: { infoWell },
+    data() {
+      return {
+        listQuery: {
+          keywords: '',
+          alarmType: '',
+          alarmContentType: '',
+          beginTime: '',
+          endTime: '',
+          offset: 1,
+          limit: 20,
+          sort: '',
+          order: ''
+        }, // 筛选条件
+        timeRange: [], // 时间范围
+        columns: [
+          {
+            text: '窨井编号',
+            value: 'wellCode',
+            align: 'center',
+            type: 'Button'
+          },
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '详细地址',
+            value: 'position',
+            align: 'center'
+          },
+          {
+            text: '告警类型',
+            value: 'alarmTypeName',
+            align: 'center'
+          },
+          {
+            text: '告警原因',
+            value: 'alarmContentName',
+            align: 'center'
+          },
+          {
+            text: '告警数值',
+            value: 'alarmValue',
+            width: 90,
+            align: 'center',
+            class: 'warning'
+          },
+          {
+            text: '权属单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '告警时间',
+            value: 'alarmTime',
+            width: 170,
+            align: 'center'
+          }
 
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      alarmTypeList: [], // 告警类型列表
-      alarmContentTypeList: [], // 告警内容类型列表
-      showAlarmType: true, // 是否显示告警类型下拉
-      listLoading: true, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      wellShow: false, // 是否显示编辑框
-      detailShow: false // 是否显示编辑框
-    }
-  },
-  computed: {
-    alarmType() {
-      return this.listQuery.alarmType
-    }
-  },
-  watch: {
-    alarmType(val) {
-      this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
-        this.fetchAlarmContentType()
-      } else {
-        this.alarmContentTypeList = []
+        ], // 显示列
+        multipleSelection: [], // 多选选中项
+        list: [], // 列表数据
+        total: 0, // 数据总数
+        alarmTypeList: [], // 告警类型列表
+        alarmContentTypeList: [], // 告警内容类型列表
+        showAlarmType: true, // 是否显示告警类型下拉
+        listLoading: true, // 加载动画
+        fullscreenLoading: false, // 全屏加载动画
+        wellShow: false, // 是否显示编辑框
+        detailShow: false // 是否显示编辑框
       }
     },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+    computed: {
+      alarmType() {
+        return this.listQuery.alarmType
       }
-    }
-  },
-  created() {
-    this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
+    },
+    watch: {
+      alarmType(val) {
+        this.listQuery.alarmContentType = ''
+        if (val && val !== '') {
+          this.fetchAlarmContentType()
+        } else {
+          this.alarmContentTypeList = []
+        }
+      },
+      timeRange(val) {
+        if (val && val.length > 0) {
+          this.listQuery.beginTime = val[0]
+          this.listQuery.endTime = val[1]
+        } else {
+          this.listQuery.beginTime = ''
+          this.listQuery.endTime = ''
+        }
+      }
+    },
+    created() {
+      this.fetchAlarmType() // 告警类型下拉菜单
+      console.log('records created')
+    },
+    beforeRouteEnter(to, from, next) {
+      if (from.name) {
+        if (from.name.indexOf('DetailJob') === -1) {
+          isFromDetail = false
+        } else {
+          isFromDetail = true
+        }
+      } else {
         isFromDetail = false
-      } else {
-        isFromDetail = true
       }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
-  mounted() {
-    if (this.$route.窨井 && this.$route.窨井.wellCode) {
-      this.listQuery.keywords = this.$route.窨井.wellCode
-      this.fetchData(false)
-    } else {
-      this.listQuery.keywords = ''
-      this.listQuery.alarmType = ''
-      this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
-      this.fetchData(false)
-    }
-  },
-  activated() {
-    console.log('alarmRecored actived')
-    if (!isFromDetail) {
+      next()
+    },
+    mounted() {
       if (this.$route.窨井 && this.$route.窨井.wellCode) {
         this.listQuery.keywords = this.$route.窨井.wellCode
         this.fetchData(false)
@@ -228,102 +213,118 @@
         this.timeRange = []
         this.fetchData(false)
       }
-    }
-  },
-  methods: {
-    // 显示闸井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
     },
-    // 工单
-    showJob(row) {
-      const jobId = row.jobId
-      this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }})
-      //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }})
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportAlarm(this.listQuery).then(res => {
-        loading.close() // 关闭加载动画
-        console.log('download===', res)
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `告警记录.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-        this.$message.error(res.message)
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取集中器数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
+    activated() {
+      console.log('alarmRecored actived')
+      if (!isFromDetail) {
+        if (this.$route.窨井 && this.$route.窨井.wellCode) {
+          this.listQuery.keywords = this.$route.窨井.wellCode
+          this.fetchData(false)
+        } else {
+          this.listQuery.keywords = ''
+          this.listQuery.alarmType = ''
+          this.listQuery.alarmContentType = ''
+          this.listQuery.beginTime = ''
+          this.listQuery.endTime = ''
+          this.timeRange = []
+          this.fetchData(false)
+        }
       }
-      getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
     },
-    // 获取告警类型
-    fetchAlarmType() {
-      getAlarmType().then(response => {
-        this.alarmTypeList = response.data
-        if (this.alarmTypeList.length <= 1) {
-          this.showAlarmType = false
+    methods: {
+      // 显示窨井详情
+      showWellDetail(row) {
+        this.wellShow = true
+        this.$refs.wellInfo.initDialog(row.wellId)
+      },
+      // 工单
+      showJob(row) {
+        const jobId = row.jobId
+        this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }})
+      },
+      // 批量导出
+      batchExport() {
+        // 全屏加载动画
+        const loading = this.$loading({
+          lock: true,
+          text: '数据处理中,请稍后...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        batchExportAlarm(this.listQuery).then(res => {
+          loading.close() // 关闭加载动画
+          console.log('download===', res)
+          const blob = new Blob([res.data])
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob) // 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = `告警记录.xlsx` // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click() // 点击下载
+          document.body.removeChild(downloadElement) // 下载完成移除元素
+          window.URL.revokeObjectURL(href) // 释放blob对象
+        }).catch((res) => {
+          loading.close()
+          this.$message.error(res.message)
+        })
+      },
+      // 查询数据
+      search() {
+        this.fetchData(false)
+      },
+      // 获取集中器数据
+      fetchData(isNowPage = true) {
+        this.listLoading = true
+        if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+          this.listQuery.offset = 1
         }
-      })
-    },
-    // 获取告警内容类别
-    fetchAlarmContentType() {
-      this.alarmContentTypeList = []
-      getAlarmContentType(this.listQuery.alarmType).then(response => {
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
-            this.alarmContentTypeList.push(item)
+        getAlarmList(this.listQuery).then(response => {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        })
+      },
+      // 获取告警类型
+      fetchAlarmType() {
+        getAlarmType().then(response => {
+          this.alarmTypeList = response.data
+          if (!isOperation()) { // 如果不是管理员和运维人员
+            this.showAlarmType = false
+            this.listQuery.alarmType = '1'
           }
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
+        })
+      },
+      // 获取告警内容类别
+      fetchAlarmContentType() {
+        this.alarmContentTypeList = []
+        getAlarmContentType(this.listQuery.alarmType).then(response => {
+          const supportDeviceTypes = this.$store.getters.deviceTypes
+          for (const item of response.data.list) {
+            if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+              this.alarmContentTypeList.push(item)
+            }
+          }
+        })
+      },
+      indexMethod(index) {
+        return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+      },
+      // 改变页容量
+      handleSizeChange(val) {
+        this.listQuery.limit = val
+        this.fetchData()
+      },
+      // 改变当前页
+      handleCurrentChange(val) {
+        this.listQuery.offset = val
+        this.fetchData()
+      },
+      // 多选触发方法
+      handleSelectionChange(val) {
+        this.multipleSelection = val
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>