diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index bca0296..80e7a41 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -15,7 +15,7 @@
           <!-- 筛选条件-->
           <el-form ref="selectForm" :model="listQuery" label-position="top" size="small">
             <el-form-item label="所属组织机构">
-              <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
+              <dept-select ref="deptSelect" v-model="listQuery.deptid" style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
             <el-form-item v-if="wellTypeList.length>1" label="点位类型">
               <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
@@ -62,7 +62,8 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: [] // 选择的组织机构
       } // 筛选条件
     }
   },
@@ -76,15 +77,25 @@
       if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '' && !force) {
         this.$message.warning('条件不能为空')
       } else {
+        if (this.listQuery.deptid) {
+          this.listQuery.deptids = this.fetchDeptList(this.listQuery.deptid)
+        }
         this.$emit('filter', this.listQuery, true)
       }
     },
+    // 获取当前deptid的所有下级id,仅最多支持3级
+    fetchDeptList(deptid) {
+      let deptids = this.$refs.deptSelect.findChildren(deptid)
+      deptids = [deptid, ... deptids]
+      return deptids
+    },
     // 清除过滤
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }
       this.$emit('filter', this.listQuery, false)
     }

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index bca0296..80e7a41 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -15,7 +15,7 @@
           <!-- 筛选条件-->
           <el-form ref="selectForm" :model="listQuery" label-position="top" size="small">
             <el-form-item label="所属组织机构">
-              <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
+              <dept-select ref="deptSelect" v-model="listQuery.deptid" style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
             <el-form-item v-if="wellTypeList.length>1" label="点位类型">
               <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
@@ -62,7 +62,8 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: [] // 选择的组织机构
       } // 筛选条件
     }
   },
@@ -76,15 +77,25 @@
       if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '' && !force) {
         this.$message.warning('条件不能为空')
       } else {
+        if (this.listQuery.deptid) {
+          this.listQuery.deptids = this.fetchDeptList(this.listQuery.deptid)
+        }
         this.$emit('filter', this.listQuery, true)
       }
     },
+    // 获取当前deptid的所有下级id,仅最多支持3级
+    fetchDeptList(deptid) {
+      let deptids = this.$refs.deptSelect.findChildren(deptid)
+      deptids = [deptid, ... deptids]
+      return deptids
+    },
     // 清除过滤
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }
       this.$emit('filter', this.listQuery, false)
     }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 1baa2e2..133de90 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,9 +19,9 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp ref="searchComp" :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
-      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
+      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" @open="alarmOpen" />
       <!--工具箱-->
       <tool-box :show="!loading" :layers="layers" :layer-checked="checkedLayer" :tool-menu="menus.menuList" @change-base-map="changeBaseMap" @layer-change="filterLayer" @click-menu="clickMenu" @close-menu-pop="closeAllPopup" />
       <!--数据筛选窗口-->
@@ -87,8 +87,10 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }, // 筛选条件
+      showWellTypes: [], // 显示的井图层列表
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
       showWellType: false, // 是否显示点位类型下拉,默认边上
@@ -104,7 +106,9 @@
       alarmFirstAmount: true, // 是否初次加载报警
       firstAmount: true, // 是否第一次加载井数据
       loading: true, // 加载图标是否显示
-      markers: [], // 所有井的点原始数据
+      massMarkerLoading: true, // 海量点数据加载
+      markers: [], // 显示的井的点原始数据
+      allMarkers: [], // 全部点原始数据
       massMarks: null, // 海量点对象
       mapMarkers: [], // 查询结果列表
       clusters: [], // 聚合
@@ -133,6 +137,11 @@
       } else {
         this.map.remove(this.tempMarker)
       }
+    },
+    massMarkerLoading(val) {
+      if (!val) {
+        this.layerFilter(this.showWellTypes)
+      }
     }
   },
   created() {
@@ -209,8 +218,11 @@
      * @param showMessage 是否告知筛选结果
      */
     dataFilter(listQuery, showMessage = true) {
+      this.closeAllPopup()
       if (this.type === 'massMarkers') { // 过滤海量点
-        this.filterMassMarker(listQuery, showMessage)
+        if (this.markers) {
+          this.filterMassMarker(listQuery, showMessage)
+        }
         this.filterAlarm(listQuery, showMessage)
       } else if (this.type === 'cluster') { // 过滤聚合点
         this.filterClusters(listQuery, showMessage)
@@ -248,6 +260,22 @@
       this.center = marker.lnglat
       this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset)
     },
+    // 图层过滤
+    layerFilter(wellTypes) {
+      const markers = this.allMarkers.filter(marker => {
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) > -1) {
+          return true
+        } else {
+          return false
+        }
+      })
+      this.markers = markers
+      if (this.massMarks) {
+        this.massMarks.setData(this.markers)
+      } else {
+        this.$message.info('正在加载数据，请稍后...')
+      }
+    },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
       const hideWellIds = []// 要隐藏的点位编号
@@ -257,21 +285,21 @@
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
+        // 点位类型不为空，且没有匹配成功
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+          show = false
+        }
         // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功，多部门匹配
-        if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
-          show = false
-        }
-        // 点位类型不为空，且没有匹配成功
-        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+        if ((deptids.length > 0 && deptids.indexOf(marker.deptid) === -1)) {
           show = false
         }
         // 如果show为false，放入需要隐藏的井id列表
@@ -286,13 +314,16 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
+      debugger
+      if (!this.showAlarm) return
       const hideWellIds = []// 要隐藏的点位编号
+      debugger
       // 整理筛选条件
       const keywords = listQuery.keywords
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 查询报警的井
       for (const marker of this.alarmWells) {
@@ -368,21 +399,24 @@
     resetMassMarker() {
       const { map } = this
       const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示
-      if (markers.length == 0) {
-        this.massMarks.clear()
-      } else {
-        this.massMarks.setData(markers)
+      if (this.massMarks) {
+        if (markers.length == 0) {
+          this.massMarks.clear()
+        } else {
+          this.massMarks.setData(markers)
+        }
+        // 将海量点添加至地图实例
+        this.massMarks.setMap(map)
       }
-      // 将海量点添加至地图实例
-      this.massMarks.setMap(map)
     },
     // 过滤图层
     filterLayer(checkedLayer) {
       // 1.过滤井图层
       if (this.type === 'massMarkers') {
+        this.closeAllPopup()
         const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5))
-        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }, false) // 加载海量点
-        else if (wellTypes && wellTypes.length == 0) this.filterMassMarker({ wellTypes: 'XXX' })
+        this.showWellTypes = wellTypes
+        this.layerFilter(wellTypes)
       } else if (this.type === 'cluster') {
         this.filterClusters() // 加载聚合点
       }
@@ -447,9 +481,9 @@
     },
     // 获取全部井列表
     fetchWellList() {
-      this.loading = true
+      this.massMarkerLoading = true
       getWellListScope().then(response => {
-        this.loading = false
+        this.massMarkerLoading = false
         if (response.code === 200) {
           const wells = response.data
           if (wells.length > 0) {
@@ -462,7 +496,8 @@
                 visible: true,
                 wellStatus: 'normal'
               }
-              this.markers.push(marker)
+              this.allMarkers.push(marker)
+              // this.markers.push(marker)
             }
             if (this.type === 'massMarkers') {
               this.initMassMarker() // 加载海量点
@@ -521,6 +556,7 @@
                 latGaode: alarm.latGaode,
                 coordinates: [alarm.lngGaode, alarm.latGaode],
                 position: alarm.position,
+                deptid: alarm.deptid,
                 visible: true
               })
             }
@@ -594,6 +630,7 @@
     // 关闭所有弹窗
     clearInfoWindow() {
       const { map } = this
+      console.log('clearInfoWindow')
       map.clearInfoWindow()
     },
     // 点击报警列表
@@ -676,29 +713,9 @@
     closePopupLocation() {
       Object.assign(this.menus, { locationWindowShow: false })
     },
-    // 获取当前deptid的所有下级id,仅最多支持3级
-    fetchDeptList(deptid) {
-      console.log('fetchDeptList')
-      const deptids = [deptid] // 储存了该pid和其子集
-      const deptlist = this.$refs.deptSelect.fetchDeptTree()
-      for (const dept of deptlist) {
-        if (dept.pid === deptid) {
-          deptids.push(dept.id)
-        }
-      }
-      const result = []
-      // 查找所有列表中有没有deptids里面的本人或子集
-      if (deptlist.length > 0) {
-        for (const dept of deptlist) {
-          if (deptids.indexOf(dept.id) !== -1) {
-            result.push(dept.id)
-          } else if (deptids.indexOf(dept.pid) !== -1) {
-            result.push(dept.id)
-          }
-        }
-      }
-      console.log(result)
-      return result
+    // 报警打开的时候收起搜索的弹窗
+    alarmOpen() {
+      this.$refs.searchComp.closeResult()
     }
   }
 }

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index bca0296..80e7a41 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -15,7 +15,7 @@
           <!-- 筛选条件-->
           <el-form ref="selectForm" :model="listQuery" label-position="top" size="small">
             <el-form-item label="所属组织机构">
-              <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
+              <dept-select ref="deptSelect" v-model="listQuery.deptid" style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
             <el-form-item v-if="wellTypeList.length>1" label="点位类型">
               <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
@@ -62,7 +62,8 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: [] // 选择的组织机构
       } // 筛选条件
     }
   },
@@ -76,15 +77,25 @@
       if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '' && !force) {
         this.$message.warning('条件不能为空')
       } else {
+        if (this.listQuery.deptid) {
+          this.listQuery.deptids = this.fetchDeptList(this.listQuery.deptid)
+        }
         this.$emit('filter', this.listQuery, true)
       }
     },
+    // 获取当前deptid的所有下级id,仅最多支持3级
+    fetchDeptList(deptid) {
+      let deptids = this.$refs.deptSelect.findChildren(deptid)
+      deptids = [deptid, ... deptids]
+      return deptids
+    },
     // 清除过滤
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }
       this.$emit('filter', this.listQuery, false)
     }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 1baa2e2..133de90 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,9 +19,9 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp ref="searchComp" :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
-      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
+      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" @open="alarmOpen" />
       <!--工具箱-->
       <tool-box :show="!loading" :layers="layers" :layer-checked="checkedLayer" :tool-menu="menus.menuList" @change-base-map="changeBaseMap" @layer-change="filterLayer" @click-menu="clickMenu" @close-menu-pop="closeAllPopup" />
       <!--数据筛选窗口-->
@@ -87,8 +87,10 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }, // 筛选条件
+      showWellTypes: [], // 显示的井图层列表
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
       showWellType: false, // 是否显示点位类型下拉,默认边上
@@ -104,7 +106,9 @@
       alarmFirstAmount: true, // 是否初次加载报警
       firstAmount: true, // 是否第一次加载井数据
       loading: true, // 加载图标是否显示
-      markers: [], // 所有井的点原始数据
+      massMarkerLoading: true, // 海量点数据加载
+      markers: [], // 显示的井的点原始数据
+      allMarkers: [], // 全部点原始数据
       massMarks: null, // 海量点对象
       mapMarkers: [], // 查询结果列表
       clusters: [], // 聚合
@@ -133,6 +137,11 @@
       } else {
         this.map.remove(this.tempMarker)
       }
+    },
+    massMarkerLoading(val) {
+      if (!val) {
+        this.layerFilter(this.showWellTypes)
+      }
     }
   },
   created() {
@@ -209,8 +218,11 @@
      * @param showMessage 是否告知筛选结果
      */
     dataFilter(listQuery, showMessage = true) {
+      this.closeAllPopup()
       if (this.type === 'massMarkers') { // 过滤海量点
-        this.filterMassMarker(listQuery, showMessage)
+        if (this.markers) {
+          this.filterMassMarker(listQuery, showMessage)
+        }
         this.filterAlarm(listQuery, showMessage)
       } else if (this.type === 'cluster') { // 过滤聚合点
         this.filterClusters(listQuery, showMessage)
@@ -248,6 +260,22 @@
       this.center = marker.lnglat
       this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset)
     },
+    // 图层过滤
+    layerFilter(wellTypes) {
+      const markers = this.allMarkers.filter(marker => {
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) > -1) {
+          return true
+        } else {
+          return false
+        }
+      })
+      this.markers = markers
+      if (this.massMarks) {
+        this.massMarks.setData(this.markers)
+      } else {
+        this.$message.info('正在加载数据，请稍后...')
+      }
+    },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
       const hideWellIds = []// 要隐藏的点位编号
@@ -257,21 +285,21 @@
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
+        // 点位类型不为空，且没有匹配成功
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+          show = false
+        }
         // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功，多部门匹配
-        if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
-          show = false
-        }
-        // 点位类型不为空，且没有匹配成功
-        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+        if ((deptids.length > 0 && deptids.indexOf(marker.deptid) === -1)) {
           show = false
         }
         // 如果show为false，放入需要隐藏的井id列表
@@ -286,13 +314,16 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
+      debugger
+      if (!this.showAlarm) return
       const hideWellIds = []// 要隐藏的点位编号
+      debugger
       // 整理筛选条件
       const keywords = listQuery.keywords
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 查询报警的井
       for (const marker of this.alarmWells) {
@@ -368,21 +399,24 @@
     resetMassMarker() {
       const { map } = this
       const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示
-      if (markers.length == 0) {
-        this.massMarks.clear()
-      } else {
-        this.massMarks.setData(markers)
+      if (this.massMarks) {
+        if (markers.length == 0) {
+          this.massMarks.clear()
+        } else {
+          this.massMarks.setData(markers)
+        }
+        // 将海量点添加至地图实例
+        this.massMarks.setMap(map)
       }
-      // 将海量点添加至地图实例
-      this.massMarks.setMap(map)
     },
     // 过滤图层
     filterLayer(checkedLayer) {
       // 1.过滤井图层
       if (this.type === 'massMarkers') {
+        this.closeAllPopup()
         const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5))
-        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }, false) // 加载海量点
-        else if (wellTypes && wellTypes.length == 0) this.filterMassMarker({ wellTypes: 'XXX' })
+        this.showWellTypes = wellTypes
+        this.layerFilter(wellTypes)
       } else if (this.type === 'cluster') {
         this.filterClusters() // 加载聚合点
       }
@@ -447,9 +481,9 @@
     },
     // 获取全部井列表
     fetchWellList() {
-      this.loading = true
+      this.massMarkerLoading = true
       getWellListScope().then(response => {
-        this.loading = false
+        this.massMarkerLoading = false
         if (response.code === 200) {
           const wells = response.data
           if (wells.length > 0) {
@@ -462,7 +496,8 @@
                 visible: true,
                 wellStatus: 'normal'
               }
-              this.markers.push(marker)
+              this.allMarkers.push(marker)
+              // this.markers.push(marker)
             }
             if (this.type === 'massMarkers') {
               this.initMassMarker() // 加载海量点
@@ -521,6 +556,7 @@
                 latGaode: alarm.latGaode,
                 coordinates: [alarm.lngGaode, alarm.latGaode],
                 position: alarm.position,
+                deptid: alarm.deptid,
                 visible: true
               })
             }
@@ -594,6 +630,7 @@
     // 关闭所有弹窗
     clearInfoWindow() {
       const { map } = this
+      console.log('clearInfoWindow')
       map.clearInfoWindow()
     },
     // 点击报警列表
@@ -676,29 +713,9 @@
     closePopupLocation() {
       Object.assign(this.menus, { locationWindowShow: false })
     },
-    // 获取当前deptid的所有下级id,仅最多支持3级
-    fetchDeptList(deptid) {
-      console.log('fetchDeptList')
-      const deptids = [deptid] // 储存了该pid和其子集
-      const deptlist = this.$refs.deptSelect.fetchDeptTree()
-      for (const dept of deptlist) {
-        if (dept.pid === deptid) {
-          deptids.push(dept.id)
-        }
-      }
-      const result = []
-      // 查找所有列表中有没有deptids里面的本人或子集
-      if (deptlist.length > 0) {
-        for (const dept of deptlist) {
-          if (deptids.indexOf(dept.id) !== -1) {
-            result.push(dept.id)
-          } else if (deptids.indexOf(dept.pid) !== -1) {
-            result.push(dept.id)
-          }
-        }
-      }
-      console.log(result)
-      return result
+    // 报警打开的时候收起搜索的弹窗
+    alarmOpen() {
+      this.$refs.searchComp.closeResult()
     }
   }
 }
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 91b12b0..73b585a 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,16 +1,16 @@
 <template>
   <app-container>
     <el-tabs tab-position="left" class="user-dept-scroll">
-      <el-tab-pane>
+      <el-tab-pane v-if="false">
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
         <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <span slot="label"><i class="el-icon-s-data" />报警等级配置</span>
         <list-level />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <span slot="label"><i class="el-icon-s-order" />报警内容配置</span>
         <list-alarm-content />
       </el-tab-pane>
     </el-tabs>

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index bca0296..80e7a41 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -15,7 +15,7 @@
           <!-- 筛选条件-->
           <el-form ref="selectForm" :model="listQuery" label-position="top" size="small">
             <el-form-item label="所属组织机构">
-              <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
+              <dept-select ref="deptSelect" v-model="listQuery.deptid" style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
             <el-form-item v-if="wellTypeList.length>1" label="点位类型">
               <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
@@ -62,7 +62,8 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: [] // 选择的组织机构
       } // 筛选条件
     }
   },
@@ -76,15 +77,25 @@
       if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '' && !force) {
         this.$message.warning('条件不能为空')
       } else {
+        if (this.listQuery.deptid) {
+          this.listQuery.deptids = this.fetchDeptList(this.listQuery.deptid)
+        }
         this.$emit('filter', this.listQuery, true)
       }
     },
+    // 获取当前deptid的所有下级id,仅最多支持3级
+    fetchDeptList(deptid) {
+      let deptids = this.$refs.deptSelect.findChildren(deptid)
+      deptids = [deptid, ... deptids]
+      return deptids
+    },
     // 清除过滤
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }
       this.$emit('filter', this.listQuery, false)
     }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 1baa2e2..133de90 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,9 +19,9 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp ref="searchComp" :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
-      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
+      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" @open="alarmOpen" />
       <!--工具箱-->
       <tool-box :show="!loading" :layers="layers" :layer-checked="checkedLayer" :tool-menu="menus.menuList" @change-base-map="changeBaseMap" @layer-change="filterLayer" @click-menu="clickMenu" @close-menu-pop="closeAllPopup" />
       <!--数据筛选窗口-->
@@ -87,8 +87,10 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }, // 筛选条件
+      showWellTypes: [], // 显示的井图层列表
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
       showWellType: false, // 是否显示点位类型下拉,默认边上
@@ -104,7 +106,9 @@
       alarmFirstAmount: true, // 是否初次加载报警
       firstAmount: true, // 是否第一次加载井数据
       loading: true, // 加载图标是否显示
-      markers: [], // 所有井的点原始数据
+      massMarkerLoading: true, // 海量点数据加载
+      markers: [], // 显示的井的点原始数据
+      allMarkers: [], // 全部点原始数据
       massMarks: null, // 海量点对象
       mapMarkers: [], // 查询结果列表
       clusters: [], // 聚合
@@ -133,6 +137,11 @@
       } else {
         this.map.remove(this.tempMarker)
       }
+    },
+    massMarkerLoading(val) {
+      if (!val) {
+        this.layerFilter(this.showWellTypes)
+      }
     }
   },
   created() {
@@ -209,8 +218,11 @@
      * @param showMessage 是否告知筛选结果
      */
     dataFilter(listQuery, showMessage = true) {
+      this.closeAllPopup()
       if (this.type === 'massMarkers') { // 过滤海量点
-        this.filterMassMarker(listQuery, showMessage)
+        if (this.markers) {
+          this.filterMassMarker(listQuery, showMessage)
+        }
         this.filterAlarm(listQuery, showMessage)
       } else if (this.type === 'cluster') { // 过滤聚合点
         this.filterClusters(listQuery, showMessage)
@@ -248,6 +260,22 @@
       this.center = marker.lnglat
       this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset)
     },
+    // 图层过滤
+    layerFilter(wellTypes) {
+      const markers = this.allMarkers.filter(marker => {
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) > -1) {
+          return true
+        } else {
+          return false
+        }
+      })
+      this.markers = markers
+      if (this.massMarks) {
+        this.massMarks.setData(this.markers)
+      } else {
+        this.$message.info('正在加载数据，请稍后...')
+      }
+    },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
       const hideWellIds = []// 要隐藏的点位编号
@@ -257,21 +285,21 @@
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
+        // 点位类型不为空，且没有匹配成功
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+          show = false
+        }
         // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功，多部门匹配
-        if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
-          show = false
-        }
-        // 点位类型不为空，且没有匹配成功
-        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+        if ((deptids.length > 0 && deptids.indexOf(marker.deptid) === -1)) {
           show = false
         }
         // 如果show为false，放入需要隐藏的井id列表
@@ -286,13 +314,16 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
+      debugger
+      if (!this.showAlarm) return
       const hideWellIds = []// 要隐藏的点位编号
+      debugger
       // 整理筛选条件
       const keywords = listQuery.keywords
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 查询报警的井
       for (const marker of this.alarmWells) {
@@ -368,21 +399,24 @@
     resetMassMarker() {
       const { map } = this
       const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示
-      if (markers.length == 0) {
-        this.massMarks.clear()
-      } else {
-        this.massMarks.setData(markers)
+      if (this.massMarks) {
+        if (markers.length == 0) {
+          this.massMarks.clear()
+        } else {
+          this.massMarks.setData(markers)
+        }
+        // 将海量点添加至地图实例
+        this.massMarks.setMap(map)
       }
-      // 将海量点添加至地图实例
-      this.massMarks.setMap(map)
     },
     // 过滤图层
     filterLayer(checkedLayer) {
       // 1.过滤井图层
       if (this.type === 'massMarkers') {
+        this.closeAllPopup()
         const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5))
-        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }, false) // 加载海量点
-        else if (wellTypes && wellTypes.length == 0) this.filterMassMarker({ wellTypes: 'XXX' })
+        this.showWellTypes = wellTypes
+        this.layerFilter(wellTypes)
       } else if (this.type === 'cluster') {
         this.filterClusters() // 加载聚合点
       }
@@ -447,9 +481,9 @@
     },
     // 获取全部井列表
     fetchWellList() {
-      this.loading = true
+      this.massMarkerLoading = true
       getWellListScope().then(response => {
-        this.loading = false
+        this.massMarkerLoading = false
         if (response.code === 200) {
           const wells = response.data
           if (wells.length > 0) {
@@ -462,7 +496,8 @@
                 visible: true,
                 wellStatus: 'normal'
               }
-              this.markers.push(marker)
+              this.allMarkers.push(marker)
+              // this.markers.push(marker)
             }
             if (this.type === 'massMarkers') {
               this.initMassMarker() // 加载海量点
@@ -521,6 +556,7 @@
                 latGaode: alarm.latGaode,
                 coordinates: [alarm.lngGaode, alarm.latGaode],
                 position: alarm.position,
+                deptid: alarm.deptid,
                 visible: true
               })
             }
@@ -594,6 +630,7 @@
     // 关闭所有弹窗
     clearInfoWindow() {
       const { map } = this
+      console.log('clearInfoWindow')
       map.clearInfoWindow()
     },
     // 点击报警列表
@@ -676,29 +713,9 @@
     closePopupLocation() {
       Object.assign(this.menus, { locationWindowShow: false })
     },
-    // 获取当前deptid的所有下级id,仅最多支持3级
-    fetchDeptList(deptid) {
-      console.log('fetchDeptList')
-      const deptids = [deptid] // 储存了该pid和其子集
-      const deptlist = this.$refs.deptSelect.fetchDeptTree()
-      for (const dept of deptlist) {
-        if (dept.pid === deptid) {
-          deptids.push(dept.id)
-        }
-      }
-      const result = []
-      // 查找所有列表中有没有deptids里面的本人或子集
-      if (deptlist.length > 0) {
-        for (const dept of deptlist) {
-          if (deptids.indexOf(dept.id) !== -1) {
-            result.push(dept.id)
-          } else if (deptids.indexOf(dept.pid) !== -1) {
-            result.push(dept.id)
-          }
-        }
-      }
-      console.log(result)
-      return result
+    // 报警打开的时候收起搜索的弹窗
+    alarmOpen() {
+      this.$refs.searchComp.closeResult()
     }
   }
 }
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 91b12b0..73b585a 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,16 +1,16 @@
 <template>
   <app-container>
     <el-tabs tab-position="left" class="user-dept-scroll">
-      <el-tab-pane>
+      <el-tab-pane v-if="false">
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
         <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <span slot="label"><i class="el-icon-s-data" />报警等级配置</span>
         <list-level />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <span slot="label"><i class="el-icon-s-order" />报警内容配置</span>
         <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
index 4db04c2..5fa1d0b 100644
--- a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -1,121 +1,64 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="form" label-width="120px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="form.deviceType" placeholder="请选择设备类型" clearable>
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
+            <el-input v-model="form.name" clearable placeholder="请输入监测指标名称" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启告警" prop="openAlarm">
+            <el-switch v-model="form.openAlarm" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="开启工单" prop="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启工单" prop="openJob">
+            <el-switch v-model="form.openJob" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
+      <div class="divider" />
+      <div v-show="form.deviceType">
+        <el-row v-for="(detail,index) in details" :key="index" :gutter="0" type="flex" justify="center">
+          <el-col :span="3">
+            <el-form-item :label="levelDict[detail.level]" />
+          </el-col>
+          <el-col v-if="showHighValue" :span="8">
+            <el-form-item label="告警上限" prop="highValue">
+              <el-input
+                v-model="detail.highValue"
+                placeholder="请输入告警上限"
+                clearable
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="showLowValue" :span="8">
+            <el-form-item label="告警下限" prop="lowValue">
+              <el-input
+                v-model="detail.lowValue"
+                placeholder="请输入告警下限"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="3" :offset="1">
+            <el-button v-if="index<2&&(index==details.length-1)" icon="el-icon-plus" circle @click="addDetail(index)" />
+            <el-button v-if="index>0&&(index==details.length-1)" icon="el-icon-minus" circle @click="deleteDetail(index)" />
+          </el-col>
+        </el-row>
+      </div>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
@@ -128,100 +71,91 @@
 
 <script>
 import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+import { getDeviceTypeList } from '@/api/device/deviceType'
 export default {
   name: 'EditAlarmLevel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
+      tenant: null, // 租户信息
+      deviceTypeList: [], // 设备类型列表
+      dialogStatus: 'create', // 对话框类型：create,update,detail
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
+      levelDict: {
+        '1': '一级告警',
+        '2': '二级告警',
+        '3': '三级告警'
       },
+      // 表单内容
+      form: {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
+      },
+      showLowValue: true,
+      showHighValue: true,
+      details: [
+        { level: '1', lowValue: '', highValue: '' }
+      ], // 等级列表
       // 表单校验规则
       rules: {
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+        openAlarm: [{ required: true, message: '是否开启告警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    'form.deviceType'(val) {
+      const device = this.deviceTypeList.find(item => item.id === val)
+      this.showHighValue = device.alarmRuleHighvalue === '1'
+      this.showLowValue = device.alarmRuleLowvalue === '1'
+    }
+  },
   created() {
     this.fetchDeviceType()
   },
   methods: {
     // 获取设备类型
     fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
+      const params = {
+        deviceType: '',
+        isValid: '',
+        offset: 1,
+        limit: 100,
+        sort: 'id',
+        order: 'asc'
+      }
+      getDeviceTypeList(params).then(response => {
+        this.deviceTypeList = response.data.rows
       })
     },
     // 重置表单
     resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
+      this.form = {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
       }
+      this.details = [
+        { level: '1', lowValue: '', highValue: '' }
+      ]
     },
     // 父子组件通信
-    initDialog(dialogStatus, row = null) {
+    initDialog(dialogStatus, tenant) {
+      this.tenant = tenant
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -229,15 +163,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
+      } else if (this.dialogStatus === 'update') {}
     },
     // 保存数据
     saveData() {
@@ -245,28 +171,41 @@
         this.createData()
       }
     },
+    // 添加等级
+    addDetail(index) {
+      const detail = { level: (index + 2) + '', lowValue: '', highValue: '' }
+      this.details.push(detail)
+    },
+    // 删除等级
+    deleteDetail(index) {
+      this.details.splice(index, 1)
+    },
+    // 验证等级
+    validateLevel() {
+      let flag = true
+      for (const detail of this.details) {
+        if (detail.highValue === '' && detail.lowValue === '') {
+          this.$message.warning('请将告警等级信息填写完整')
+          flag = false
+          break
+        }
+      }
+      return flag
+    },
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
-          addAlarmLevel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
+          if (this.validateLevel()) {
+            this.form.levelList = this.details
+            this.form.tenantId = this.tenant.id
+            addAlarmLevel(this.form).then(response => {
+              if (response.code === 200) {
                 this.$emit('watchChild') // 刷新父组件数据列表
                 this.dialogFormVisible = false
-              })
-            }
-          })
+              }
+            })
+          }
         }
       })
     }

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index bca0296..80e7a41 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -15,7 +15,7 @@
           <!-- 筛选条件-->
           <el-form ref="selectForm" :model="listQuery" label-position="top" size="small">
             <el-form-item label="所属组织机构">
-              <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
+              <dept-select ref="deptSelect" v-model="listQuery.deptid" style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
             <el-form-item v-if="wellTypeList.length>1" label="点位类型">
               <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
@@ -62,7 +62,8 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: [] // 选择的组织机构
       } // 筛选条件
     }
   },
@@ -76,15 +77,25 @@
       if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '' && !force) {
         this.$message.warning('条件不能为空')
       } else {
+        if (this.listQuery.deptid) {
+          this.listQuery.deptids = this.fetchDeptList(this.listQuery.deptid)
+        }
         this.$emit('filter', this.listQuery, true)
       }
     },
+    // 获取当前deptid的所有下级id,仅最多支持3级
+    fetchDeptList(deptid) {
+      let deptids = this.$refs.deptSelect.findChildren(deptid)
+      deptids = [deptid, ... deptids]
+      return deptids
+    },
     // 清除过滤
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }
       this.$emit('filter', this.listQuery, false)
     }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 1baa2e2..133de90 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,9 +19,9 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp ref="searchComp" :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
-      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
+      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" @open="alarmOpen" />
       <!--工具箱-->
       <tool-box :show="!loading" :layers="layers" :layer-checked="checkedLayer" :tool-menu="menus.menuList" @change-base-map="changeBaseMap" @layer-change="filterLayer" @click-menu="clickMenu" @close-menu-pop="closeAllPopup" />
       <!--数据筛选窗口-->
@@ -87,8 +87,10 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }, // 筛选条件
+      showWellTypes: [], // 显示的井图层列表
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
       showWellType: false, // 是否显示点位类型下拉,默认边上
@@ -104,7 +106,9 @@
       alarmFirstAmount: true, // 是否初次加载报警
       firstAmount: true, // 是否第一次加载井数据
       loading: true, // 加载图标是否显示
-      markers: [], // 所有井的点原始数据
+      massMarkerLoading: true, // 海量点数据加载
+      markers: [], // 显示的井的点原始数据
+      allMarkers: [], // 全部点原始数据
       massMarks: null, // 海量点对象
       mapMarkers: [], // 查询结果列表
       clusters: [], // 聚合
@@ -133,6 +137,11 @@
       } else {
         this.map.remove(this.tempMarker)
       }
+    },
+    massMarkerLoading(val) {
+      if (!val) {
+        this.layerFilter(this.showWellTypes)
+      }
     }
   },
   created() {
@@ -209,8 +218,11 @@
      * @param showMessage 是否告知筛选结果
      */
     dataFilter(listQuery, showMessage = true) {
+      this.closeAllPopup()
       if (this.type === 'massMarkers') { // 过滤海量点
-        this.filterMassMarker(listQuery, showMessage)
+        if (this.markers) {
+          this.filterMassMarker(listQuery, showMessage)
+        }
         this.filterAlarm(listQuery, showMessage)
       } else if (this.type === 'cluster') { // 过滤聚合点
         this.filterClusters(listQuery, showMessage)
@@ -248,6 +260,22 @@
       this.center = marker.lnglat
       this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset)
     },
+    // 图层过滤
+    layerFilter(wellTypes) {
+      const markers = this.allMarkers.filter(marker => {
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) > -1) {
+          return true
+        } else {
+          return false
+        }
+      })
+      this.markers = markers
+      if (this.massMarks) {
+        this.massMarks.setData(this.markers)
+      } else {
+        this.$message.info('正在加载数据，请稍后...')
+      }
+    },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
       const hideWellIds = []// 要隐藏的点位编号
@@ -257,21 +285,21 @@
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
+        // 点位类型不为空，且没有匹配成功
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+          show = false
+        }
         // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功，多部门匹配
-        if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
-          show = false
-        }
-        // 点位类型不为空，且没有匹配成功
-        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+        if ((deptids.length > 0 && deptids.indexOf(marker.deptid) === -1)) {
           show = false
         }
         // 如果show为false，放入需要隐藏的井id列表
@@ -286,13 +314,16 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
+      debugger
+      if (!this.showAlarm) return
       const hideWellIds = []// 要隐藏的点位编号
+      debugger
       // 整理筛选条件
       const keywords = listQuery.keywords
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 查询报警的井
       for (const marker of this.alarmWells) {
@@ -368,21 +399,24 @@
     resetMassMarker() {
       const { map } = this
       const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示
-      if (markers.length == 0) {
-        this.massMarks.clear()
-      } else {
-        this.massMarks.setData(markers)
+      if (this.massMarks) {
+        if (markers.length == 0) {
+          this.massMarks.clear()
+        } else {
+          this.massMarks.setData(markers)
+        }
+        // 将海量点添加至地图实例
+        this.massMarks.setMap(map)
       }
-      // 将海量点添加至地图实例
-      this.massMarks.setMap(map)
     },
     // 过滤图层
     filterLayer(checkedLayer) {
       // 1.过滤井图层
       if (this.type === 'massMarkers') {
+        this.closeAllPopup()
         const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5))
-        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }, false) // 加载海量点
-        else if (wellTypes && wellTypes.length == 0) this.filterMassMarker({ wellTypes: 'XXX' })
+        this.showWellTypes = wellTypes
+        this.layerFilter(wellTypes)
       } else if (this.type === 'cluster') {
         this.filterClusters() // 加载聚合点
       }
@@ -447,9 +481,9 @@
     },
     // 获取全部井列表
     fetchWellList() {
-      this.loading = true
+      this.massMarkerLoading = true
       getWellListScope().then(response => {
-        this.loading = false
+        this.massMarkerLoading = false
         if (response.code === 200) {
           const wells = response.data
           if (wells.length > 0) {
@@ -462,7 +496,8 @@
                 visible: true,
                 wellStatus: 'normal'
               }
-              this.markers.push(marker)
+              this.allMarkers.push(marker)
+              // this.markers.push(marker)
             }
             if (this.type === 'massMarkers') {
               this.initMassMarker() // 加载海量点
@@ -521,6 +556,7 @@
                 latGaode: alarm.latGaode,
                 coordinates: [alarm.lngGaode, alarm.latGaode],
                 position: alarm.position,
+                deptid: alarm.deptid,
                 visible: true
               })
             }
@@ -594,6 +630,7 @@
     // 关闭所有弹窗
     clearInfoWindow() {
       const { map } = this
+      console.log('clearInfoWindow')
       map.clearInfoWindow()
     },
     // 点击报警列表
@@ -676,29 +713,9 @@
     closePopupLocation() {
       Object.assign(this.menus, { locationWindowShow: false })
     },
-    // 获取当前deptid的所有下级id,仅最多支持3级
-    fetchDeptList(deptid) {
-      console.log('fetchDeptList')
-      const deptids = [deptid] // 储存了该pid和其子集
-      const deptlist = this.$refs.deptSelect.fetchDeptTree()
-      for (const dept of deptlist) {
-        if (dept.pid === deptid) {
-          deptids.push(dept.id)
-        }
-      }
-      const result = []
-      // 查找所有列表中有没有deptids里面的本人或子集
-      if (deptlist.length > 0) {
-        for (const dept of deptlist) {
-          if (deptids.indexOf(dept.id) !== -1) {
-            result.push(dept.id)
-          } else if (deptids.indexOf(dept.pid) !== -1) {
-            result.push(dept.id)
-          }
-        }
-      }
-      console.log(result)
-      return result
+    // 报警打开的时候收起搜索的弹窗
+    alarmOpen() {
+      this.$refs.searchComp.closeResult()
     }
   }
 }
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 91b12b0..73b585a 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,16 +1,16 @@
 <template>
   <app-container>
     <el-tabs tab-position="left" class="user-dept-scroll">
-      <el-tab-pane>
+      <el-tab-pane v-if="false">
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
         <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <span slot="label"><i class="el-icon-s-data" />报警等级配置</span>
         <list-level />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <span slot="label"><i class="el-icon-s-order" />报警内容配置</span>
         <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
index 4db04c2..5fa1d0b 100644
--- a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -1,121 +1,64 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="form" label-width="120px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="form.deviceType" placeholder="请选择设备类型" clearable>
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
+            <el-input v-model="form.name" clearable placeholder="请输入监测指标名称" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启告警" prop="openAlarm">
+            <el-switch v-model="form.openAlarm" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="开启工单" prop="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启工单" prop="openJob">
+            <el-switch v-model="form.openJob" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
+      <div class="divider" />
+      <div v-show="form.deviceType">
+        <el-row v-for="(detail,index) in details" :key="index" :gutter="0" type="flex" justify="center">
+          <el-col :span="3">
+            <el-form-item :label="levelDict[detail.level]" />
+          </el-col>
+          <el-col v-if="showHighValue" :span="8">
+            <el-form-item label="告警上限" prop="highValue">
+              <el-input
+                v-model="detail.highValue"
+                placeholder="请输入告警上限"
+                clearable
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="showLowValue" :span="8">
+            <el-form-item label="告警下限" prop="lowValue">
+              <el-input
+                v-model="detail.lowValue"
+                placeholder="请输入告警下限"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="3" :offset="1">
+            <el-button v-if="index<2&&(index==details.length-1)" icon="el-icon-plus" circle @click="addDetail(index)" />
+            <el-button v-if="index>0&&(index==details.length-1)" icon="el-icon-minus" circle @click="deleteDetail(index)" />
+          </el-col>
+        </el-row>
+      </div>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
@@ -128,100 +71,91 @@
 
 <script>
 import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+import { getDeviceTypeList } from '@/api/device/deviceType'
 export default {
   name: 'EditAlarmLevel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
+      tenant: null, // 租户信息
+      deviceTypeList: [], // 设备类型列表
+      dialogStatus: 'create', // 对话框类型：create,update,detail
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
+      levelDict: {
+        '1': '一级告警',
+        '2': '二级告警',
+        '3': '三级告警'
       },
+      // 表单内容
+      form: {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
+      },
+      showLowValue: true,
+      showHighValue: true,
+      details: [
+        { level: '1', lowValue: '', highValue: '' }
+      ], // 等级列表
       // 表单校验规则
       rules: {
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+        openAlarm: [{ required: true, message: '是否开启告警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    'form.deviceType'(val) {
+      const device = this.deviceTypeList.find(item => item.id === val)
+      this.showHighValue = device.alarmRuleHighvalue === '1'
+      this.showLowValue = device.alarmRuleLowvalue === '1'
+    }
+  },
   created() {
     this.fetchDeviceType()
   },
   methods: {
     // 获取设备类型
     fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
+      const params = {
+        deviceType: '',
+        isValid: '',
+        offset: 1,
+        limit: 100,
+        sort: 'id',
+        order: 'asc'
+      }
+      getDeviceTypeList(params).then(response => {
+        this.deviceTypeList = response.data.rows
       })
     },
     // 重置表单
     resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
+      this.form = {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
       }
+      this.details = [
+        { level: '1', lowValue: '', highValue: '' }
+      ]
     },
     // 父子组件通信
-    initDialog(dialogStatus, row = null) {
+    initDialog(dialogStatus, tenant) {
+      this.tenant = tenant
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -229,15 +163,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
+      } else if (this.dialogStatus === 'update') {}
     },
     // 保存数据
     saveData() {
@@ -245,28 +171,41 @@
         this.createData()
       }
     },
+    // 添加等级
+    addDetail(index) {
+      const detail = { level: (index + 2) + '', lowValue: '', highValue: '' }
+      this.details.push(detail)
+    },
+    // 删除等级
+    deleteDetail(index) {
+      this.details.splice(index, 1)
+    },
+    // 验证等级
+    validateLevel() {
+      let flag = true
+      for (const detail of this.details) {
+        if (detail.highValue === '' && detail.lowValue === '') {
+          this.$message.warning('请将告警等级信息填写完整')
+          flag = false
+          break
+        }
+      }
+      return flag
+    },
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
-          addAlarmLevel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
+          if (this.validateLevel()) {
+            this.form.levelList = this.details
+            this.form.tenantId = this.tenant.id
+            addAlarmLevel(this.form).then(response => {
+              if (response.code === 200) {
                 this.$emit('watchChild') // 刷新父组件数据列表
                 this.dialogFormVisible = false
-              })
-            }
-          })
+              }
+            })
+          }
         }
       })
     }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 473aa58..bdd6e67 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -175,7 +175,7 @@
     add() {
       this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
-        this.$refs.editdialog.initDialog('create')
+        this.$refs.editdialog.initDialog('create', this.selectedTenant)
       }, 100)
     },
     // 删除

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index bca0296..80e7a41 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -15,7 +15,7 @@
           <!-- 筛选条件-->
           <el-form ref="selectForm" :model="listQuery" label-position="top" size="small">
             <el-form-item label="所属组织机构">
-              <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
+              <dept-select ref="deptSelect" v-model="listQuery.deptid" style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
             <el-form-item v-if="wellTypeList.length>1" label="点位类型">
               <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
@@ -62,7 +62,8 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: [] // 选择的组织机构
       } // 筛选条件
     }
   },
@@ -76,15 +77,25 @@
       if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '' && !force) {
         this.$message.warning('条件不能为空')
       } else {
+        if (this.listQuery.deptid) {
+          this.listQuery.deptids = this.fetchDeptList(this.listQuery.deptid)
+        }
         this.$emit('filter', this.listQuery, true)
       }
     },
+    // 获取当前deptid的所有下级id,仅最多支持3级
+    fetchDeptList(deptid) {
+      let deptids = this.$refs.deptSelect.findChildren(deptid)
+      deptids = [deptid, ... deptids]
+      return deptids
+    },
     // 清除过滤
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }
       this.$emit('filter', this.listQuery, false)
     }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 1baa2e2..133de90 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,9 +19,9 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp ref="searchComp" :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
-      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
+      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" @open="alarmOpen" />
       <!--工具箱-->
       <tool-box :show="!loading" :layers="layers" :layer-checked="checkedLayer" :tool-menu="menus.menuList" @change-base-map="changeBaseMap" @layer-change="filterLayer" @click-menu="clickMenu" @close-menu-pop="closeAllPopup" />
       <!--数据筛选窗口-->
@@ -87,8 +87,10 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }, // 筛选条件
+      showWellTypes: [], // 显示的井图层列表
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
       showWellType: false, // 是否显示点位类型下拉,默认边上
@@ -104,7 +106,9 @@
       alarmFirstAmount: true, // 是否初次加载报警
       firstAmount: true, // 是否第一次加载井数据
       loading: true, // 加载图标是否显示
-      markers: [], // 所有井的点原始数据
+      massMarkerLoading: true, // 海量点数据加载
+      markers: [], // 显示的井的点原始数据
+      allMarkers: [], // 全部点原始数据
       massMarks: null, // 海量点对象
       mapMarkers: [], // 查询结果列表
       clusters: [], // 聚合
@@ -133,6 +137,11 @@
       } else {
         this.map.remove(this.tempMarker)
       }
+    },
+    massMarkerLoading(val) {
+      if (!val) {
+        this.layerFilter(this.showWellTypes)
+      }
     }
   },
   created() {
@@ -209,8 +218,11 @@
      * @param showMessage 是否告知筛选结果
      */
     dataFilter(listQuery, showMessage = true) {
+      this.closeAllPopup()
       if (this.type === 'massMarkers') { // 过滤海量点
-        this.filterMassMarker(listQuery, showMessage)
+        if (this.markers) {
+          this.filterMassMarker(listQuery, showMessage)
+        }
         this.filterAlarm(listQuery, showMessage)
       } else if (this.type === 'cluster') { // 过滤聚合点
         this.filterClusters(listQuery, showMessage)
@@ -248,6 +260,22 @@
       this.center = marker.lnglat
       this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset)
     },
+    // 图层过滤
+    layerFilter(wellTypes) {
+      const markers = this.allMarkers.filter(marker => {
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) > -1) {
+          return true
+        } else {
+          return false
+        }
+      })
+      this.markers = markers
+      if (this.massMarks) {
+        this.massMarks.setData(this.markers)
+      } else {
+        this.$message.info('正在加载数据，请稍后...')
+      }
+    },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
       const hideWellIds = []// 要隐藏的点位编号
@@ -257,21 +285,21 @@
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
+        // 点位类型不为空，且没有匹配成功
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+          show = false
+        }
         // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功，多部门匹配
-        if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
-          show = false
-        }
-        // 点位类型不为空，且没有匹配成功
-        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+        if ((deptids.length > 0 && deptids.indexOf(marker.deptid) === -1)) {
           show = false
         }
         // 如果show为false，放入需要隐藏的井id列表
@@ -286,13 +314,16 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
+      debugger
+      if (!this.showAlarm) return
       const hideWellIds = []// 要隐藏的点位编号
+      debugger
       // 整理筛选条件
       const keywords = listQuery.keywords
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 查询报警的井
       for (const marker of this.alarmWells) {
@@ -368,21 +399,24 @@
     resetMassMarker() {
       const { map } = this
       const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示
-      if (markers.length == 0) {
-        this.massMarks.clear()
-      } else {
-        this.massMarks.setData(markers)
+      if (this.massMarks) {
+        if (markers.length == 0) {
+          this.massMarks.clear()
+        } else {
+          this.massMarks.setData(markers)
+        }
+        // 将海量点添加至地图实例
+        this.massMarks.setMap(map)
       }
-      // 将海量点添加至地图实例
-      this.massMarks.setMap(map)
     },
     // 过滤图层
     filterLayer(checkedLayer) {
       // 1.过滤井图层
       if (this.type === 'massMarkers') {
+        this.closeAllPopup()
         const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5))
-        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }, false) // 加载海量点
-        else if (wellTypes && wellTypes.length == 0) this.filterMassMarker({ wellTypes: 'XXX' })
+        this.showWellTypes = wellTypes
+        this.layerFilter(wellTypes)
       } else if (this.type === 'cluster') {
         this.filterClusters() // 加载聚合点
       }
@@ -447,9 +481,9 @@
     },
     // 获取全部井列表
     fetchWellList() {
-      this.loading = true
+      this.massMarkerLoading = true
       getWellListScope().then(response => {
-        this.loading = false
+        this.massMarkerLoading = false
         if (response.code === 200) {
           const wells = response.data
           if (wells.length > 0) {
@@ -462,7 +496,8 @@
                 visible: true,
                 wellStatus: 'normal'
               }
-              this.markers.push(marker)
+              this.allMarkers.push(marker)
+              // this.markers.push(marker)
             }
             if (this.type === 'massMarkers') {
               this.initMassMarker() // 加载海量点
@@ -521,6 +556,7 @@
                 latGaode: alarm.latGaode,
                 coordinates: [alarm.lngGaode, alarm.latGaode],
                 position: alarm.position,
+                deptid: alarm.deptid,
                 visible: true
               })
             }
@@ -594,6 +630,7 @@
     // 关闭所有弹窗
     clearInfoWindow() {
       const { map } = this
+      console.log('clearInfoWindow')
       map.clearInfoWindow()
     },
     // 点击报警列表
@@ -676,29 +713,9 @@
     closePopupLocation() {
       Object.assign(this.menus, { locationWindowShow: false })
     },
-    // 获取当前deptid的所有下级id,仅最多支持3级
-    fetchDeptList(deptid) {
-      console.log('fetchDeptList')
-      const deptids = [deptid] // 储存了该pid和其子集
-      const deptlist = this.$refs.deptSelect.fetchDeptTree()
-      for (const dept of deptlist) {
-        if (dept.pid === deptid) {
-          deptids.push(dept.id)
-        }
-      }
-      const result = []
-      // 查找所有列表中有没有deptids里面的本人或子集
-      if (deptlist.length > 0) {
-        for (const dept of deptlist) {
-          if (deptids.indexOf(dept.id) !== -1) {
-            result.push(dept.id)
-          } else if (deptids.indexOf(dept.pid) !== -1) {
-            result.push(dept.id)
-          }
-        }
-      }
-      console.log(result)
-      return result
+    // 报警打开的时候收起搜索的弹窗
+    alarmOpen() {
+      this.$refs.searchComp.closeResult()
     }
   }
 }
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 91b12b0..73b585a 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,16 +1,16 @@
 <template>
   <app-container>
     <el-tabs tab-position="left" class="user-dept-scroll">
-      <el-tab-pane>
+      <el-tab-pane v-if="false">
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
         <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <span slot="label"><i class="el-icon-s-data" />报警等级配置</span>
         <list-level />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <span slot="label"><i class="el-icon-s-order" />报警内容配置</span>
         <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
index 4db04c2..5fa1d0b 100644
--- a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -1,121 +1,64 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="form" label-width="120px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="form.deviceType" placeholder="请选择设备类型" clearable>
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
+            <el-input v-model="form.name" clearable placeholder="请输入监测指标名称" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启告警" prop="openAlarm">
+            <el-switch v-model="form.openAlarm" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="开启工单" prop="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启工单" prop="openJob">
+            <el-switch v-model="form.openJob" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
+      <div class="divider" />
+      <div v-show="form.deviceType">
+        <el-row v-for="(detail,index) in details" :key="index" :gutter="0" type="flex" justify="center">
+          <el-col :span="3">
+            <el-form-item :label="levelDict[detail.level]" />
+          </el-col>
+          <el-col v-if="showHighValue" :span="8">
+            <el-form-item label="告警上限" prop="highValue">
+              <el-input
+                v-model="detail.highValue"
+                placeholder="请输入告警上限"
+                clearable
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="showLowValue" :span="8">
+            <el-form-item label="告警下限" prop="lowValue">
+              <el-input
+                v-model="detail.lowValue"
+                placeholder="请输入告警下限"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="3" :offset="1">
+            <el-button v-if="index<2&&(index==details.length-1)" icon="el-icon-plus" circle @click="addDetail(index)" />
+            <el-button v-if="index>0&&(index==details.length-1)" icon="el-icon-minus" circle @click="deleteDetail(index)" />
+          </el-col>
+        </el-row>
+      </div>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
@@ -128,100 +71,91 @@
 
 <script>
 import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+import { getDeviceTypeList } from '@/api/device/deviceType'
 export default {
   name: 'EditAlarmLevel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
+      tenant: null, // 租户信息
+      deviceTypeList: [], // 设备类型列表
+      dialogStatus: 'create', // 对话框类型：create,update,detail
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
+      levelDict: {
+        '1': '一级告警',
+        '2': '二级告警',
+        '3': '三级告警'
       },
+      // 表单内容
+      form: {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
+      },
+      showLowValue: true,
+      showHighValue: true,
+      details: [
+        { level: '1', lowValue: '', highValue: '' }
+      ], // 等级列表
       // 表单校验规则
       rules: {
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+        openAlarm: [{ required: true, message: '是否开启告警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    'form.deviceType'(val) {
+      const device = this.deviceTypeList.find(item => item.id === val)
+      this.showHighValue = device.alarmRuleHighvalue === '1'
+      this.showLowValue = device.alarmRuleLowvalue === '1'
+    }
+  },
   created() {
     this.fetchDeviceType()
   },
   methods: {
     // 获取设备类型
     fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
+      const params = {
+        deviceType: '',
+        isValid: '',
+        offset: 1,
+        limit: 100,
+        sort: 'id',
+        order: 'asc'
+      }
+      getDeviceTypeList(params).then(response => {
+        this.deviceTypeList = response.data.rows
       })
     },
     // 重置表单
     resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
+      this.form = {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
       }
+      this.details = [
+        { level: '1', lowValue: '', highValue: '' }
+      ]
     },
     // 父子组件通信
-    initDialog(dialogStatus, row = null) {
+    initDialog(dialogStatus, tenant) {
+      this.tenant = tenant
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -229,15 +163,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
+      } else if (this.dialogStatus === 'update') {}
     },
     // 保存数据
     saveData() {
@@ -245,28 +171,41 @@
         this.createData()
       }
     },
+    // 添加等级
+    addDetail(index) {
+      const detail = { level: (index + 2) + '', lowValue: '', highValue: '' }
+      this.details.push(detail)
+    },
+    // 删除等级
+    deleteDetail(index) {
+      this.details.splice(index, 1)
+    },
+    // 验证等级
+    validateLevel() {
+      let flag = true
+      for (const detail of this.details) {
+        if (detail.highValue === '' && detail.lowValue === '') {
+          this.$message.warning('请将告警等级信息填写完整')
+          flag = false
+          break
+        }
+      }
+      return flag
+    },
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
-          addAlarmLevel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
+          if (this.validateLevel()) {
+            this.form.levelList = this.details
+            this.form.tenantId = this.tenant.id
+            addAlarmLevel(this.form).then(response => {
+              if (response.code === 200) {
                 this.$emit('watchChild') // 刷新父组件数据列表
                 this.dialogFormVisible = false
-              })
-            }
-          })
+              }
+            })
+          }
         }
       })
     }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 473aa58..bdd6e67 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -175,7 +175,7 @@
     add() {
       this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
-        this.$refs.editdialog.initDialog('create')
+        this.$refs.editdialog.initDialog('create', this.selectedTenant)
       }, 100)
     },
     // 删除
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index 82dae39..f0cdf60 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -204,6 +204,7 @@
   .el-upload--picture-card{
     width: 80px !important;
     height: 80px !important;
+    line-height: 80px !important;
     .el-icon-plus{
       line-height: 80px;
     }

diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
index 486c3ce..50c21ee 100644
--- a/src/api/systemConfig/alarmContent.js
+++ b/src/api/systemConfig/alarmContent.js
@@ -30,11 +30,11 @@
   })
 }
 // 修改告警内容
-export function updateAlarmContent(params) {
+export function updateAlarmContent(data) {
   return request({
     url: 'alarmContent/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除告警内容
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index 5acd845..68e7c28 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -28,10 +28,10 @@
   })
 }
 // 添加设备
-export function addAlarmLevel(params) {
+export function addAlarmLevel(data) {
   return request({
     url: 'alarm/level/add',
     method: 'post',
-    params
+    data
   })
 }
diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue
index ed5eca1..9ba9224 100644
--- a/src/components/Amap/AMapContainer.vue
+++ b/src/components/Amap/AMapContainer.vue
@@ -119,8 +119,9 @@
       })
     },
     setCenter(){
-      console.log('setCenter')
-      this.map.setCenter(this.center)
+      if(this.map){
+        this.map.setCenter(this.center)
+      }
     },
     changeBaseLayer() {
       const layers = this.map.getLayers()
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 474442c..fc2e3ae 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -112,7 +112,6 @@
         options.content = this.tmpVM.$refs.node // 插槽转换为content
       }
       this.$amapComponent = new window.AMap.Marker(options)
-      console.log('init marker', this.$amapComponent)
       // this.map.add(this.$amapComponent)
     },
 
diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue
index 347bdae..32c6f0b 100644
--- a/src/components/BigData/TimeButtons.vue
+++ b/src/components/BigData/TimeButtons.vue
@@ -18,6 +18,10 @@
 export default {
   name: 'TimeButtons',
   props: {
+    size: {
+      type: String,
+      default: 'normal'
+    },
     buttons: {
       type: Array,
       default: () => {
@@ -44,7 +48,11 @@
   },
   computed: {
     buttonList() {
-      return this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      let showButtons = this.buttonDict.filter(item => this.buttons.indexOf(item.value) > -1)
+      if (this.size === 'small') { // 如果是小号，最多只展示两个
+        showButtons = showButtons.slice(-2)
+      }
+      return showButtons
     }
   },
   created() {
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index f24249e..bac1905 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -137,6 +137,22 @@
     // 获取列表
     fetchDeptTree() {
       return this.originList
+    },
+    // 查找所有的子deptid
+    findChildren(pid) {
+      console.log('findChildren')
+      if (pid) {
+        const deptids = [] // 储存了该pid和其子集
+        const deptlist = this.originList
+        for (const dept of deptlist) {
+          if (dept.pid === pid) {
+            deptids.push(dept.id)
+          }
+        }
+        return deptids
+      } else {
+        return []
+      }
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 94f6fa9..7392a4a 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -107,7 +107,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index f92cecb..94ba7fb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -100,7 +100,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-records-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index fcda9ef..17013eb 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -79,7 +79,7 @@
     </div>
 
     <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="rule-map" />
   </app-container>
 </template>
 
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 1195d22..d25e9a0 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -64,7 +64,6 @@
     },
     getTodayAlarmCount() {
       const date = getSearchTodayTime()
-      debugger
       const listQuery = {
         keywords: '',
         alarmType: '',
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index d8b1ff7..c0d1cb5 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="各单位报警统计">
+  <panel-card ref="alarmStaticByDept" title="各单位报警统计">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-date-picker
           v-model="timeRange"
           type="datetimerange"
@@ -81,12 +81,21 @@
       chartData: {
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
-      }
+      },
+      timeButtonSize: 'normal',
+      dataEmpty: false,
+      loading: false
     }
   },
   created() {
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 时间切换
     changeTime(timeRange) {
@@ -95,6 +104,7 @@
     },
     fetchData() {
       this.handleDateTime()
+      this.loading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
@@ -103,7 +113,7 @@
         } else {
           this.extend.yAxis = {}
         }
-        this.listLoading = false
+        this.loading = false
       })
     },
     // 处理时间
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f752abe..89ffa18 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -1,8 +1,8 @@
 <template>
-  <panel-card title="异常点位排名">
+  <panel-card ref="alarmWellRank" title="异常点位排名">
     <template slot="func">
       <div>
-        <time-buttons ref="timeButtons" @change="changeTime" />
+        <time-buttons ref="timeButtons" :size="timeButtonSize" @change="changeTime" />
         <el-select v-model="listQuery.alarmContent" placeholder="告警内容" clearable size="small" style="width: 200px" @change="fetchData">
           <el-option
             v-for="item in alarmContentTypeList"
@@ -34,6 +34,7 @@
   data() {
     return {
       timeRange: [], // 时间范围
+      timeButtonSize: 'normal', // 时间选择器大小
       listQuery: {
         alarmContent: '', // 报警内容
         beginTime: '', // 开始时间
@@ -48,6 +49,12 @@
     this.fetchAlarmContentType()
     this.fetchData()
   },
+  mounted() {
+    const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
+    if (bodyWidth < 566) {
+      this.timeButtonSize = 'small'
+    }
+  },
   methods: {
     // 获取排名列表
     fetchData() {
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index baf803a..28aa602 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -11,6 +11,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
+          :clearable="false"
           @change="refresh"
         />
       </el-col>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 816c190..feec683 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -24,7 +24,7 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
+    <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
@@ -32,7 +32,7 @@
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
-          <template v-slot="scope">
+          <template #default="scope">
             <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 30fed22..2134258 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -18,7 +18,7 @@
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
-      <search-item>
+      <search-item v-if="isAdmin">
         <el-select v-model="listQuery.isOnline" size="small" placeholder="在线情况" clearable>
           <el-option
             v-for="item in onlineStates"
@@ -105,7 +105,7 @@
     </div>
     <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
     <detail-device v-show="detailShow" ref="detaildevice" />
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="device-map" />
   </app-container>
 </template>
 
@@ -368,6 +368,10 @@
             this.deviceTypeList.push(deviceType)
           }
         }
+        if (deviceTypes.indexOf('2') === -1) { // 如果包含不包含
+          const index = this.columns.findIndex(item => item.value === 'installHeight')
+          this.columns.splice(index, 1)
+        }
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index c7b7f3a..61ae539 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -105,7 +105,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index deb38ee..808c9cd 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map1" />
   </app-container>
 </template>
 
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 6ef09b0..9edf704 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -85,7 +85,7 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <info-well v-show="wellShow" ref="wellInfo" mapid="job-map2" />
   </app-container>
 </template>
 
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 7852e18..c043774 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -67,6 +67,13 @@
       tableShow: false // 表格显示
     }
   },
+  watch: {
+    tableShow(val) {
+      if (val) {
+        this.$emit('open')
+      }
+    }
+  },
   methods: {
     rowClick(row, column, event) {
       this.$emit('row-click', row, column, event)
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index 07895e4..a355e6e 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -107,6 +107,9 @@
       this.currentPageList = this.list.slice(start, end)
       this.$emit('change-page', this.currentPageList)
     },
+    closeResult() {
+      this.resultShow = false
+    },
     // 点击结果项
     clickItem(item) {
       this.$emit('click-item', item)
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index bca0296..80e7a41 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -15,7 +15,7 @@
           <!-- 筛选条件-->
           <el-form ref="selectForm" :model="listQuery" label-position="top" size="small">
             <el-form-item label="所属组织机构">
-              <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
+              <dept-select ref="deptSelect" v-model="listQuery.deptid" style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
             <el-form-item v-if="wellTypeList.length>1" label="点位类型">
               <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
@@ -62,7 +62,8 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: [] // 选择的组织机构
       } // 筛选条件
     }
   },
@@ -76,15 +77,25 @@
       if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '' && !force) {
         this.$message.warning('条件不能为空')
       } else {
+        if (this.listQuery.deptid) {
+          this.listQuery.deptids = this.fetchDeptList(this.listQuery.deptid)
+        }
         this.$emit('filter', this.listQuery, true)
       }
     },
+    // 获取当前deptid的所有下级id,仅最多支持3级
+    fetchDeptList(deptid) {
+      let deptids = this.$refs.deptSelect.findChildren(deptid)
+      deptids = [deptid, ... deptids]
+      return deptids
+    },
     // 清除过滤
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }
       this.$emit('filter', this.listQuery, false)
     }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 1baa2e2..133de90 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,9 +19,9 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp ref="searchComp" :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
-      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
+      <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" @open="alarmOpen" />
       <!--工具箱-->
       <tool-box :show="!loading" :layers="layers" :layer-checked="checkedLayer" :tool-menu="menus.menuList" @change-base-map="changeBaseMap" @layer-change="filterLayer" @click-menu="clickMenu" @close-menu-pop="closeAllPopup" />
       <!--数据筛选窗口-->
@@ -87,8 +87,10 @@
       listQuery: {
         keywords: '', // 关键字
         wellType: '', // 点位类型
-        deptid: '' // 组织机构
+        deptid: '', // 组织机构
+        deptids: []
       }, // 筛选条件
+      showWellTypes: [], // 显示的井图层列表
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
       showWellType: false, // 是否显示点位类型下拉,默认边上
@@ -104,7 +106,9 @@
       alarmFirstAmount: true, // 是否初次加载报警
       firstAmount: true, // 是否第一次加载井数据
       loading: true, // 加载图标是否显示
-      markers: [], // 所有井的点原始数据
+      massMarkerLoading: true, // 海量点数据加载
+      markers: [], // 显示的井的点原始数据
+      allMarkers: [], // 全部点原始数据
       massMarks: null, // 海量点对象
       mapMarkers: [], // 查询结果列表
       clusters: [], // 聚合
@@ -133,6 +137,11 @@
       } else {
         this.map.remove(this.tempMarker)
       }
+    },
+    massMarkerLoading(val) {
+      if (!val) {
+        this.layerFilter(this.showWellTypes)
+      }
     }
   },
   created() {
@@ -209,8 +218,11 @@
      * @param showMessage 是否告知筛选结果
      */
     dataFilter(listQuery, showMessage = true) {
+      this.closeAllPopup()
       if (this.type === 'massMarkers') { // 过滤海量点
-        this.filterMassMarker(listQuery, showMessage)
+        if (this.markers) {
+          this.filterMassMarker(listQuery, showMessage)
+        }
         this.filterAlarm(listQuery, showMessage)
       } else if (this.type === 'cluster') { // 过滤聚合点
         this.filterClusters(listQuery, showMessage)
@@ -248,6 +260,22 @@
       this.center = marker.lnglat
       this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset)
     },
+    // 图层过滤
+    layerFilter(wellTypes) {
+      const markers = this.allMarkers.filter(marker => {
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) > -1) {
+          return true
+        } else {
+          return false
+        }
+      })
+      this.markers = markers
+      if (this.massMarks) {
+        this.massMarks.setData(this.markers)
+      } else {
+        this.$message.info('正在加载数据，请稍后...')
+      }
+    },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
       const hideWellIds = []// 要隐藏的点位编号
@@ -257,21 +285,21 @@
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
+        // 点位类型不为空，且没有匹配成功
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+          show = false
+        }
         // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功，多部门匹配
-        if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
-          show = false
-        }
-        // 点位类型不为空，且没有匹配成功
-        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+        if ((deptids.length > 0 && deptids.indexOf(marker.deptid) === -1)) {
           show = false
         }
         // 如果show为false，放入需要隐藏的井id列表
@@ -286,13 +314,16 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
+      debugger
+      if (!this.showAlarm) return
       const hideWellIds = []// 要隐藏的点位编号
+      debugger
       // 整理筛选条件
       const keywords = listQuery.keywords
       const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
-        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+        deptids = listQuery.deptids // 获取所有下级
       }
       // 查询报警的井
       for (const marker of this.alarmWells) {
@@ -368,21 +399,24 @@
     resetMassMarker() {
       const { map } = this
       const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示
-      if (markers.length == 0) {
-        this.massMarks.clear()
-      } else {
-        this.massMarks.setData(markers)
+      if (this.massMarks) {
+        if (markers.length == 0) {
+          this.massMarks.clear()
+        } else {
+          this.massMarks.setData(markers)
+        }
+        // 将海量点添加至地图实例
+        this.massMarks.setMap(map)
       }
-      // 将海量点添加至地图实例
-      this.massMarks.setMap(map)
     },
     // 过滤图层
     filterLayer(checkedLayer) {
       // 1.过滤井图层
       if (this.type === 'massMarkers') {
+        this.closeAllPopup()
         const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5))
-        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }, false) // 加载海量点
-        else if (wellTypes && wellTypes.length == 0) this.filterMassMarker({ wellTypes: 'XXX' })
+        this.showWellTypes = wellTypes
+        this.layerFilter(wellTypes)
       } else if (this.type === 'cluster') {
         this.filterClusters() // 加载聚合点
       }
@@ -447,9 +481,9 @@
     },
     // 获取全部井列表
     fetchWellList() {
-      this.loading = true
+      this.massMarkerLoading = true
       getWellListScope().then(response => {
-        this.loading = false
+        this.massMarkerLoading = false
         if (response.code === 200) {
           const wells = response.data
           if (wells.length > 0) {
@@ -462,7 +496,8 @@
                 visible: true,
                 wellStatus: 'normal'
               }
-              this.markers.push(marker)
+              this.allMarkers.push(marker)
+              // this.markers.push(marker)
             }
             if (this.type === 'massMarkers') {
               this.initMassMarker() // 加载海量点
@@ -521,6 +556,7 @@
                 latGaode: alarm.latGaode,
                 coordinates: [alarm.lngGaode, alarm.latGaode],
                 position: alarm.position,
+                deptid: alarm.deptid,
                 visible: true
               })
             }
@@ -594,6 +630,7 @@
     // 关闭所有弹窗
     clearInfoWindow() {
       const { map } = this
+      console.log('clearInfoWindow')
       map.clearInfoWindow()
     },
     // 点击报警列表
@@ -676,29 +713,9 @@
     closePopupLocation() {
       Object.assign(this.menus, { locationWindowShow: false })
     },
-    // 获取当前deptid的所有下级id,仅最多支持3级
-    fetchDeptList(deptid) {
-      console.log('fetchDeptList')
-      const deptids = [deptid] // 储存了该pid和其子集
-      const deptlist = this.$refs.deptSelect.fetchDeptTree()
-      for (const dept of deptlist) {
-        if (dept.pid === deptid) {
-          deptids.push(dept.id)
-        }
-      }
-      const result = []
-      // 查找所有列表中有没有deptids里面的本人或子集
-      if (deptlist.length > 0) {
-        for (const dept of deptlist) {
-          if (deptids.indexOf(dept.id) !== -1) {
-            result.push(dept.id)
-          } else if (deptids.indexOf(dept.pid) !== -1) {
-            result.push(dept.id)
-          }
-        }
-      }
-      console.log(result)
-      return result
+    // 报警打开的时候收起搜索的弹窗
+    alarmOpen() {
+      this.$refs.searchComp.closeResult()
     }
   }
 }
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 91b12b0..73b585a 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,16 +1,16 @@
 <template>
   <app-container>
     <el-tabs tab-position="left" class="user-dept-scroll">
-      <el-tab-pane>
+      <el-tab-pane v-if="false">
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
         <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <span slot="label"><i class="el-icon-s-data" />报警等级配置</span>
         <list-level />
       </el-tab-pane>
       <el-tab-pane>
-        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <span slot="label"><i class="el-icon-s-order" />报警内容配置</span>
         <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
index 4db04c2..5fa1d0b 100644
--- a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -1,121 +1,64 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="form" label-width="120px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="form.deviceType" placeholder="请选择设备类型" clearable>
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
+            <el-input v-model="form.name" clearable placeholder="请输入监测指标名称" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启告警" prop="openAlarm">
+            <el-switch v-model="form.openAlarm" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="开启工单" prop="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="是否开启工单" prop="openJob">
+            <el-switch v-model="form.openJob" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
+      <div class="divider" />
+      <div v-show="form.deviceType">
+        <el-row v-for="(detail,index) in details" :key="index" :gutter="0" type="flex" justify="center">
+          <el-col :span="3">
+            <el-form-item :label="levelDict[detail.level]" />
+          </el-col>
+          <el-col v-if="showHighValue" :span="8">
+            <el-form-item label="告警上限" prop="highValue">
+              <el-input
+                v-model="detail.highValue"
+                placeholder="请输入告警上限"
+                clearable
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="showLowValue" :span="8">
+            <el-form-item label="告警下限" prop="lowValue">
+              <el-input
+                v-model="detail.lowValue"
+                placeholder="请输入告警下限"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="3" :offset="1">
+            <el-button v-if="index<2&&(index==details.length-1)" icon="el-icon-plus" circle @click="addDetail(index)" />
+            <el-button v-if="index>0&&(index==details.length-1)" icon="el-icon-minus" circle @click="deleteDetail(index)" />
+          </el-col>
+        </el-row>
+      </div>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
@@ -128,100 +71,91 @@
 
 <script>
 import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+import { getDeviceTypeList } from '@/api/device/deviceType'
 export default {
   name: 'EditAlarmLevel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
+      tenant: null, // 租户信息
+      deviceTypeList: [], // 设备类型列表
+      dialogStatus: 'create', // 对话框类型：create,update,detail
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
+      levelDict: {
+        '1': '一级告警',
+        '2': '二级告警',
+        '3': '三级告警'
       },
+      // 表单内容
+      form: {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
+      },
+      showLowValue: true,
+      showHighValue: true,
+      details: [
+        { level: '1', lowValue: '', highValue: '' }
+      ], // 等级列表
       // 表单校验规则
       rules: {
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+        openAlarm: [{ required: true, message: '是否开启告警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    'form.deviceType'(val) {
+      const device = this.deviceTypeList.find(item => item.id === val)
+      this.showHighValue = device.alarmRuleHighvalue === '1'
+      this.showLowValue = device.alarmRuleLowvalue === '1'
+    }
+  },
   created() {
     this.fetchDeviceType()
   },
   methods: {
     // 获取设备类型
     fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
+      const params = {
+        deviceType: '',
+        isValid: '',
+        offset: 1,
+        limit: 100,
+        sort: 'id',
+        order: 'asc'
+      }
+      getDeviceTypeList(params).then(response => {
+        this.deviceTypeList = response.data.rows
       })
     },
     // 重置表单
     resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
+      this.form = {
+        tenantId: '', // 租户/项目id
+        deviceType: '', // 设备类型
+        name: '', // 监测指标
+        openAlarm: '1', // 是否开启报警
+        openJob: '1', // 是否开启工单
+        levelList: [] // 报警等级列表
       }
+      this.details = [
+        { level: '1', lowValue: '', highValue: '' }
+      ]
     },
     // 父子组件通信
-    initDialog(dialogStatus, row = null) {
+    initDialog(dialogStatus, tenant) {
+      this.tenant = tenant
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -229,15 +163,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
+      } else if (this.dialogStatus === 'update') {}
     },
     // 保存数据
     saveData() {
@@ -245,28 +171,41 @@
         this.createData()
       }
     },
+    // 添加等级
+    addDetail(index) {
+      const detail = { level: (index + 2) + '', lowValue: '', highValue: '' }
+      this.details.push(detail)
+    },
+    // 删除等级
+    deleteDetail(index) {
+      this.details.splice(index, 1)
+    },
+    // 验证等级
+    validateLevel() {
+      let flag = true
+      for (const detail of this.details) {
+        if (detail.highValue === '' && detail.lowValue === '') {
+          this.$message.warning('请将告警等级信息填写完整')
+          flag = false
+          break
+        }
+      }
+      return flag
+    },
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
-          addAlarmLevel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
+          if (this.validateLevel()) {
+            this.form.levelList = this.details
+            this.form.tenantId = this.tenant.id
+            addAlarmLevel(this.form).then(response => {
+              if (response.code === 200) {
                 this.$emit('watchChild') // 刷新父组件数据列表
                 this.dialogFormVisible = false
-              })
-            }
-          })
+              }
+            })
+          }
         }
       })
     }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 473aa58..bdd6e67 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -175,7 +175,7 @@
     add() {
       this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
-        this.$refs.editdialog.initDialog('create')
+        this.$refs.editdialog.initDialog('create', this.selectedTenant)
       }, 100)
     },
     // 删除
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index 82dae39..f0cdf60 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -204,6 +204,7 @@
   .el-upload--picture-card{
     width: 80px !important;
     height: 80px !important;
+    line-height: 80px !important;
     .el-icon-plus{
       line-height: 80px;
     }
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index c565c4f..1a752d9 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="点位详情" width="70%" append-to-body>
-    <el-descriptions class="margin-top" title="" :column="2" border>
+    <el-descriptions v-loading="loading" class="margin-top" title="" :column="2" border>
       <el-descriptions-item v-for="config of formConfig" :key="config.value" :span="config.span">
         <template slot="label">
           {{ config.label }}
@@ -28,8 +28,9 @@
         :zoom="zoom"
         :base-layer="baseLayer"
         style="height: 300px"
-        vid="info-well-map"
+        :vid="mapid"
         class="info-map"
+        @ready="mapReady"
       >
         <a-map-marker v-if="marker" :position="marker.position" />
       </a-map-container>
@@ -39,7 +40,7 @@
 </template>
 
 <script>
-import { getAreaList, getAreaByDept, getAreaListPage } from '@/api/system/area'
+import { getAreaListPage } from '@/api/system/area'
 import { getWellInfo } from '@/api/well/well'
 import AMapContainer from '@/components/Amap/AMapContainer'
 import AMapMarker from '@/components/Amap/AMapMarker'
@@ -47,8 +48,16 @@
 export default {
   name: 'InfoWell',
   components: { AMapContainer, AMapMarker },
+  props: {
+    mapid: {
+      type: String,
+      default: 'info-well-map'
+    }
+  },
   data() {
     return {
+      map: null, // 地图对象
+      wellId: '', // 井id
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -89,7 +98,7 @@
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
-      center: [121.59996, 31.197646],
+      center: [116.4, 39.9],
       zoom: 16,
       baseLayer: 'gaode_vec', // 底图图层
       marker: null,
@@ -121,14 +130,20 @@
   methods: {
     // 初始化对话框
     initDialog: function(wellId) {
+      this.wellId = wellId
       this.dialogFormVisible = true
-      // this.fetchArea1()
+      if (this.map) { // 如果地图已加载，直接取数据，如果未加载等待加载完毕后再加载数据
+        this.fetchData()
+      }
+    },
+    fetchData() {
       // 获取井数据
-      getWellInfo(wellId).then(response => {
-        this.listLoading = false
+      getWellInfo(this.wellId).then(response => {
+        this.loading = false
         const row = response.data
         this.wellForm = row
         this.center = [row.lngGaode, row.latGaode]
+        console.log(this.center)
         this.marker = { position: [row.lngGaode, row.latGaode] }
         if (row.deptid && row.deptid !== '') {
           this.fetchArea1()
@@ -146,6 +161,12 @@
         }
       })
     },
+    // 地图加载完毕
+    mapReady(map) {
+      this.map = map
+      console.log('infowell map ready')
+      this.fetchData()
+    },
     // 获取区域1
     fetchArea1() {
       const query = {