diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index ea00ad5..a0c1529 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -6,7 +6,7 @@
 // 设备查询
 export function getDeviceListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/device/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 设备查询
 export function getDeviceList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/device/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,23 +25,23 @@
 // 添加设备
 export function addDevice(params) {
   return request({
-    url: '/sanitation/toilet/add',
+    url: '/environment/device/add',
     method: 'post',
     params
   })
 }
-// 修改设备机构
+// 修改设备
 export function updateDevice(params) {
   return request({
-    url: '/sanitation/toilet/update',
+    url: '/environment/device/update',
     method: 'post',
     params
   })
 }
-// 删除设备机构
+// 删除设备
 export function delDevice(ids) {
   return request({
-    url: '/sanitation/toilet/delete',
+    url: '/environment/device/delete',
     method: 'post',
     params: {
       ids
@@ -52,21 +52,12 @@
   })
 }
 
-// 设备查询
-export function getDeviceCleanListPage(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
 // 批量导入
 export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: '/sanitation/toilet/import',
+    url: '/environment/device/import',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
@@ -75,7 +66,7 @@
 // 批量导出
 export function batchExportDevice(params, config) {
   return request({
-    url: '/sanitation/toilet/export',
+    url: '/environment/device/export',
     method: 'get',
     timeout: 120000,
     params,

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index ea00ad5..a0c1529 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -6,7 +6,7 @@
 // 设备查询
 export function getDeviceListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/device/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 设备查询
 export function getDeviceList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/device/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,23 +25,23 @@
 // 添加设备
 export function addDevice(params) {
   return request({
-    url: '/sanitation/toilet/add',
+    url: '/environment/device/add',
     method: 'post',
     params
   })
 }
-// 修改设备机构
+// 修改设备
 export function updateDevice(params) {
   return request({
-    url: '/sanitation/toilet/update',
+    url: '/environment/device/update',
     method: 'post',
     params
   })
 }
-// 删除设备机构
+// 删除设备
 export function delDevice(ids) {
   return request({
-    url: '/sanitation/toilet/delete',
+    url: '/environment/device/delete',
     method: 'post',
     params: {
       ids
@@ -52,21 +52,12 @@
   })
 }
 
-// 设备查询
-export function getDeviceCleanListPage(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
 // 批量导入
 export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: '/sanitation/toilet/import',
+    url: '/environment/device/import',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
@@ -75,7 +66,7 @@
 // 批量导出
 export function batchExportDevice(params, config) {
   return request({
-    url: '/sanitation/toilet/export',
+    url: '/environment/device/export',
     method: 'get',
     timeout: 120000,
     params,
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 15b46ad..664404b 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -80,16 +80,17 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getAlarmLevelList().then(res =>{
+          this.list = res.data
+          // this.list = [
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
+          // ]
+          this.total = res.data.length
+          this.listLoading = false
+        })
       },
       // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
       changePage(val) {

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index ea00ad5..a0c1529 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -6,7 +6,7 @@
 // 设备查询
 export function getDeviceListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/device/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 设备查询
 export function getDeviceList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/device/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,23 +25,23 @@
 // 添加设备
 export function addDevice(params) {
   return request({
-    url: '/sanitation/toilet/add',
+    url: '/environment/device/add',
     method: 'post',
     params
   })
 }
-// 修改设备机构
+// 修改设备
 export function updateDevice(params) {
   return request({
-    url: '/sanitation/toilet/update',
+    url: '/environment/device/update',
     method: 'post',
     params
   })
 }
-// 删除设备机构
+// 删除设备
 export function delDevice(ids) {
   return request({
-    url: '/sanitation/toilet/delete',
+    url: '/environment/device/delete',
     method: 'post',
     params: {
       ids
@@ -52,21 +52,12 @@
   })
 }
 
-// 设备查询
-export function getDeviceCleanListPage(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
 // 批量导入
 export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: '/sanitation/toilet/import',
+    url: '/environment/device/import',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
@@ -75,7 +66,7 @@
 // 批量导出
 export function batchExportDevice(params, config) {
   return request({
-    url: '/sanitation/toilet/export',
+    url: '/environment/device/export',
     method: 'get',
     timeout: 120000,
     params,
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 15b46ad..664404b 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -80,16 +80,17 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getAlarmLevelList().then(res =>{
+          this.list = res.data
+          // this.list = [
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
+          // ]
+          this.total = res.data.length
+          this.listLoading = false
+        })
       },
       // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
       changePage(val) {
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 2073596..6b405ea 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -8,7 +8,7 @@
     <div style="margin-bottom: 12px;">
       <el-button size="small" icon="el-icon-plus" :disabled="list.length>=alarmLevelList.length" @click="addRow">新增</el-button>
     </div>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small">
       <template slot="columns">
         <el-table-column label="报警等级" align="center">
           <template slot-scope="scope">

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index ea00ad5..a0c1529 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -6,7 +6,7 @@
 // 设备查询
 export function getDeviceListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/device/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 设备查询
 export function getDeviceList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/device/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,23 +25,23 @@
 // 添加设备
 export function addDevice(params) {
   return request({
-    url: '/sanitation/toilet/add',
+    url: '/environment/device/add',
     method: 'post',
     params
   })
 }
-// 修改设备机构
+// 修改设备
 export function updateDevice(params) {
   return request({
-    url: '/sanitation/toilet/update',
+    url: '/environment/device/update',
     method: 'post',
     params
   })
 }
-// 删除设备机构
+// 删除设备
 export function delDevice(ids) {
   return request({
-    url: '/sanitation/toilet/delete',
+    url: '/environment/device/delete',
     method: 'post',
     params: {
       ids
@@ -52,21 +52,12 @@
   })
 }
 
-// 设备查询
-export function getDeviceCleanListPage(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
 // 批量导入
 export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: '/sanitation/toilet/import',
+    url: '/environment/device/import',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
@@ -75,7 +66,7 @@
 // 批量导出
 export function batchExportDevice(params, config) {
   return request({
-    url: '/sanitation/toilet/export',
+    url: '/environment/device/export',
     method: 'get',
     timeout: 120000,
     params,
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 15b46ad..664404b 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -80,16 +80,17 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getAlarmLevelList().then(res =>{
+          this.list = res.data
+          // this.list = [
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
+          // ]
+          this.total = res.data.length
+          this.listLoading = false
+        })
       },
       // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
       changePage(val) {
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 2073596..6b405ea 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -8,7 +8,7 @@
     <div style="margin-bottom: 12px;">
       <el-button size="small" icon="el-icon-plus" :disabled="list.length>=alarmLevelList.length" @click="addRow">新增</el-button>
     </div>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small">
       <template slot="columns">
         <el-table-column label="报警等级" align="center">
           <template slot-scope="scope">
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index 611d0bf..d5dac35 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getToiletListPage, } from '@/api/environment/device'
+import { getAlarmRuleList, deleteAlarmRule } from '@/api/environment/alarmRule'
 import EditAlarmRule from "./editAlarmRule";
 export default {
   name: 'DeviceAlarmRuleList',
@@ -31,7 +31,7 @@
     return {
       listQuery: {
         deviceNo: '', // 关键字
-        sensor: '', // 在线状态
+        sensor: '', // 传感器
       }, // 筛选条件
       columns: [
         {
@@ -90,17 +90,18 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-        ]
+      getAlarmRuleList(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        // this.list = [
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        // ]
         // that.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 删除规则
     deleteRule(row) {

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index ea00ad5..a0c1529 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -6,7 +6,7 @@
 // 设备查询
 export function getDeviceListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/device/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 设备查询
 export function getDeviceList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/device/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,23 +25,23 @@
 // 添加设备
 export function addDevice(params) {
   return request({
-    url: '/sanitation/toilet/add',
+    url: '/environment/device/add',
     method: 'post',
     params
   })
 }
-// 修改设备机构
+// 修改设备
 export function updateDevice(params) {
   return request({
-    url: '/sanitation/toilet/update',
+    url: '/environment/device/update',
     method: 'post',
     params
   })
 }
-// 删除设备机构
+// 删除设备
 export function delDevice(ids) {
   return request({
-    url: '/sanitation/toilet/delete',
+    url: '/environment/device/delete',
     method: 'post',
     params: {
       ids
@@ -52,21 +52,12 @@
   })
 }
 
-// 设备查询
-export function getDeviceCleanListPage(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
 // 批量导入
 export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: '/sanitation/toilet/import',
+    url: '/environment/device/import',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
@@ -75,7 +66,7 @@
 // 批量导出
 export function batchExportDevice(params, config) {
   return request({
-    url: '/sanitation/toilet/export',
+    url: '/environment/device/export',
     method: 'get',
     timeout: 120000,
     params,
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 15b46ad..664404b 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -80,16 +80,17 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getAlarmLevelList().then(res =>{
+          this.list = res.data
+          // this.list = [
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
+          // ]
+          this.total = res.data.length
+          this.listLoading = false
+        })
       },
       // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
       changePage(val) {
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 2073596..6b405ea 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -8,7 +8,7 @@
     <div style="margin-bottom: 12px;">
       <el-button size="small" icon="el-icon-plus" :disabled="list.length>=alarmLevelList.length" @click="addRow">新增</el-button>
     </div>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small">
       <template slot="columns">
         <el-table-column label="报警等级" align="center">
           <template slot-scope="scope">
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index 611d0bf..d5dac35 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getToiletListPage, } from '@/api/environment/device'
+import { getAlarmRuleList, deleteAlarmRule } from '@/api/environment/alarmRule'
 import EditAlarmRule from "./editAlarmRule";
 export default {
   name: 'DeviceAlarmRuleList',
@@ -31,7 +31,7 @@
     return {
       listQuery: {
         deviceNo: '', // 关键字
-        sensor: '', // 在线状态
+        sensor: '', // 传感器
       }, // 筛选条件
       columns: [
         {
@@ -90,17 +90,18 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-        ]
+      getAlarmRuleList(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        // this.list = [
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        // ]
         // that.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 删除规则
     deleteRule(row) {
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index 4a92655..fac211e 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getToiletListPage, } from '@/api/environment/device'
+  import { getDeviceListPage } from '@/api/environment/device'
 export default {
   name: 'SimpleDeviceList',
   data() {
@@ -112,19 +112,19 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
-        ]
-        // that.total = response.data.total
+      getDeviceListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        // this.list = [
+        //     {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
+        // ]
+        this.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 点击详情
     goDetail(row) {

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index ea00ad5..a0c1529 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -6,7 +6,7 @@
 // 设备查询
 export function getDeviceListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/device/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 设备查询
 export function getDeviceList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/device/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,23 +25,23 @@
 // 添加设备
 export function addDevice(params) {
   return request({
-    url: '/sanitation/toilet/add',
+    url: '/environment/device/add',
     method: 'post',
     params
   })
 }
-// 修改设备机构
+// 修改设备
 export function updateDevice(params) {
   return request({
-    url: '/sanitation/toilet/update',
+    url: '/environment/device/update',
     method: 'post',
     params
   })
 }
-// 删除设备机构
+// 删除设备
 export function delDevice(ids) {
   return request({
-    url: '/sanitation/toilet/delete',
+    url: '/environment/device/delete',
     method: 'post',
     params: {
       ids
@@ -52,21 +52,12 @@
   })
 }
 
-// 设备查询
-export function getDeviceCleanListPage(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
 // 批量导入
 export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: '/sanitation/toilet/import',
+    url: '/environment/device/import',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
@@ -75,7 +66,7 @@
 // 批量导出
 export function batchExportDevice(params, config) {
   return request({
-    url: '/sanitation/toilet/export',
+    url: '/environment/device/export',
     method: 'get',
     timeout: 120000,
     params,
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 15b46ad..664404b 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -80,16 +80,17 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getAlarmLevelList().then(res =>{
+          this.list = res.data
+          // this.list = [
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
+          // ]
+          this.total = res.data.length
+          this.listLoading = false
+        })
       },
       // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
       changePage(val) {
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 2073596..6b405ea 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -8,7 +8,7 @@
     <div style="margin-bottom: 12px;">
       <el-button size="small" icon="el-icon-plus" :disabled="list.length>=alarmLevelList.length" @click="addRow">新增</el-button>
     </div>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small">
       <template slot="columns">
         <el-table-column label="报警等级" align="center">
           <template slot-scope="scope">
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index 611d0bf..d5dac35 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getToiletListPage, } from '@/api/environment/device'
+import { getAlarmRuleList, deleteAlarmRule } from '@/api/environment/alarmRule'
 import EditAlarmRule from "./editAlarmRule";
 export default {
   name: 'DeviceAlarmRuleList',
@@ -31,7 +31,7 @@
     return {
       listQuery: {
         deviceNo: '', // 关键字
-        sensor: '', // 在线状态
+        sensor: '', // 传感器
       }, // 筛选条件
       columns: [
         {
@@ -90,17 +90,18 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-        ]
+      getAlarmRuleList(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        // this.list = [
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        // ]
         // that.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 删除规则
     deleteRule(row) {
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index 4a92655..fac211e 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getToiletListPage, } from '@/api/environment/device'
+  import { getDeviceListPage } from '@/api/environment/device'
 export default {
   name: 'SimpleDeviceList',
   data() {
@@ -112,19 +112,19 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
-        ]
-        // that.total = response.data.total
+      getDeviceListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        // this.list = [
+        //     {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
+        // ]
+        this.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/device/deviceList.vue b/src/views/device/deviceList.vue
index 1e19273..1c7b659 100644
--- a/src/views/device/deviceList.vue
+++ b/src/views/device/deviceList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput" @selection-change="handleSelectionChange">
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="编号/点位名称" clearable/>
@@ -14,10 +14,10 @@
         </el-select>
       </search-item>
     </search-area>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @selectionChange="handleSelectionChange" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/environment/device/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
-        <el-button v-if="hasPerm('/environment/device/delete')" size="small" class="edit_btn">删除</el-button>
+        <el-button v-if="hasPerm('/environment/device/delete')" size="small" class="edit_btn" @click="batchDel">删除</el-button>
         <el-upload
           v-if="hasPerm('/environment/device/import')"
           :limit="1"
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { getToiletListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/environment/device'
+import { getDeviceListPage, delDevice, batchImportDevice, batchExportDevice } from '@/api/environment/device'
 import EditDevice from './editDevice'
 import { exportFile } from '@/utils/exportutils'
 import DetailDevice from "./detailDevice";
@@ -140,6 +140,7 @@
           refresh: false // 是否需要刷新按钮
         }
       }, // 表格属性
+      multipleSelection:[], // 多选选中项
       editShow: false, // 编辑页面是否显示
       detailShow: false
     }
@@ -150,19 +151,19 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
-        ]
-        // that.total = response.data.total
+      getDeviceListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        // this.list = [
+        //     {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
+        // ]
+        this.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 点击编辑
     edit(row) {
@@ -191,7 +192,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delToilet(deleteIds).then(response => {
+        delDevice(deleteIds).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -199,8 +200,10 @@
         })
       })
     },
-    handleSelectionChange(){
-
+    handleSelectionChange(val){
+      console.log('device Selection Change')
+      this.multipleSelection = val
+      console.log(this.multipleSelection)
     },
     // 删除多个设备
     batchDel() {
@@ -218,7 +221,7 @@
             type: 'warning'
           }
         ).then(() => {
-          delToilet(deleteIds).then(response => {
+          delDevice(deleteIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
@@ -229,6 +232,14 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 批量导入
     uploadFile(param) {
       // 判断文件大小是否符合要求
@@ -246,7 +257,7 @@
         background: 'rgba(0, 0, 0, 0.7)'
       })
       // 发起导入请求
-      batchImportToilet(_file).then(res => {
+      batchImportDevice(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
           this.$message.success('导入成功')
@@ -268,7 +279,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportDevice(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const fileName = `设备列表.xlsx`

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index a882719..b513c81 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -1,5 +1,5 @@
 /**
- * 报警接口
+ * 报警规则接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 3ea4026..1d2445c 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -6,7 +6,7 @@
 // 所有指标是否设置报警等级
 export function getAlarmLevelList(params) {
   return request({
-    url: '/environment/alarm/listPage',
+    url: '/environment/alarmLevel/list',
     method: 'get',
     params
   })
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
new file mode 100644
index 0000000..c9d68eb
--- /dev/null
+++ b/src/api/environment/alarmRule.js
@@ -0,0 +1,43 @@
+/**
+ * 报警规则接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 报警规则列表查询
+export function getAlarmRuleList(params) {
+  return request({
+    url: '/environment/alarmRule/listByDevice',
+    method: 'get',
+    params
+  })
+}
+
+// 新增报警阈值
+export function addAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑报警阈值
+export function updateAlarmRule(params) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+
+// 删除报警阈值
+export function deleteAlarmRule(id) {
+  return request({
+    url: '/environment/alarmRule/update',
+    method: 'post',
+    params:{
+      id: id
+    }
+  })
+}
+
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index ea00ad5..a0c1529 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -6,7 +6,7 @@
 // 设备查询
 export function getDeviceListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/device/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 设备查询
 export function getDeviceList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/device/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,23 +25,23 @@
 // 添加设备
 export function addDevice(params) {
   return request({
-    url: '/sanitation/toilet/add',
+    url: '/environment/device/add',
     method: 'post',
     params
   })
 }
-// 修改设备机构
+// 修改设备
 export function updateDevice(params) {
   return request({
-    url: '/sanitation/toilet/update',
+    url: '/environment/device/update',
     method: 'post',
     params
   })
 }
-// 删除设备机构
+// 删除设备
 export function delDevice(ids) {
   return request({
-    url: '/sanitation/toilet/delete',
+    url: '/environment/device/delete',
     method: 'post',
     params: {
       ids
@@ -52,21 +52,12 @@
   })
 }
 
-// 设备查询
-export function getDeviceCleanListPage(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
 // 批量导入
 export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: '/sanitation/toilet/import',
+    url: '/environment/device/import',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
@@ -75,7 +66,7 @@
 // 批量导出
 export function batchExportDevice(params, config) {
   return request({
-    url: '/sanitation/toilet/export',
+    url: '/environment/device/export',
     method: 'get',
     timeout: 120000,
     params,
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 15b46ad..664404b 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -80,16 +80,17 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
-          { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getAlarmLevelList().then(res =>{
+          this.list = res.data
+          // this.list = [
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true },
+          //   { id:'1', sensorName: 'PM2.5', sensor: '11203', unit: 'ug/m3', hasAlarmLevel: true }
+          // ]
+          this.total = res.data.length
+          this.listLoading = false
+        })
       },
       // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
       changePage(val) {
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 2073596..6b405ea 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -8,7 +8,7 @@
     <div style="margin-bottom: 12px;">
       <el-button size="small" icon="el-icon-plus" :disabled="list.length>=alarmLevelList.length" @click="addRow">新增</el-button>
     </div>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :pagination="false" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small">
       <template slot="columns">
         <el-table-column label="报警等级" align="center">
           <template slot-scope="scope">
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index 611d0bf..d5dac35 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getToiletListPage, } from '@/api/environment/device'
+import { getAlarmRuleList, deleteAlarmRule } from '@/api/environment/alarmRule'
 import EditAlarmRule from "./editAlarmRule";
 export default {
   name: 'DeviceAlarmRuleList',
@@ -31,7 +31,7 @@
     return {
       listQuery: {
         deviceNo: '', // 关键字
-        sensor: '', // 在线状态
+        sensor: '', // 传感器
       }, // 筛选条件
       columns: [
         {
@@ -90,17 +90,18 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-            {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
-        ]
+      getAlarmRuleList(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        // this.list = [
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM2.5', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'1' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'PM10', sensor:'a34004', unit:'ug/m³', alarmThreshold: 3.5, alarmOpen:'0' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'TSP', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        //     {id:'1', deviceNo:'2021030803100001', sensorName:'噪声', sensor:'a34004', unit:'ug/m³', alarmThreshold: '', alarmOpen:'' },
+        // ]
         // that.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 删除规则
     deleteRule(row) {
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index 4a92655..fac211e 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getToiletListPage, } from '@/api/environment/device'
+  import { getDeviceListPage } from '@/api/environment/device'
 export default {
   name: 'SimpleDeviceList',
   data() {
@@ -112,19 +112,19 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
-        ]
-        // that.total = response.data.total
+      getDeviceListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        // this.list = [
+        //     {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
+        // ]
+        this.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/device/deviceList.vue b/src/views/device/deviceList.vue
index 1e19273..1c7b659 100644
--- a/src/views/device/deviceList.vue
+++ b/src/views/device/deviceList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput" @selection-change="handleSelectionChange">
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="编号/点位名称" clearable/>
@@ -14,10 +14,10 @@
         </el-select>
       </search-item>
     </search-area>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @selectionChange="handleSelectionChange" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/environment/device/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
-        <el-button v-if="hasPerm('/environment/device/delete')" size="small" class="edit_btn">删除</el-button>
+        <el-button v-if="hasPerm('/environment/device/delete')" size="small" class="edit_btn" @click="batchDel">删除</el-button>
         <el-upload
           v-if="hasPerm('/environment/device/import')"
           :limit="1"
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { getToiletListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/environment/device'
+import { getDeviceListPage, delDevice, batchImportDevice, batchExportDevice } from '@/api/environment/device'
 import EditDevice from './editDevice'
 import { exportFile } from '@/utils/exportutils'
 import DetailDevice from "./detailDevice";
@@ -140,6 +140,7 @@
           refresh: false // 是否需要刷新按钮
         }
       }, // 表格属性
+      multipleSelection:[], // 多选选中项
       editShow: false, // 编辑页面是否显示
       detailShow: false
     }
@@ -150,19 +151,19 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      // getToiletListPage(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-        this.list = [
-            {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-            {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
-        ]
-        // that.total = response.data.total
+      getDeviceListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        // this.list = [
+        //     {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
+        //     {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
+        // ]
+        this.total = response.data.total
         this.listLoading = false
-      // })
+      })
     },
     // 点击编辑
     edit(row) {
@@ -191,7 +192,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delToilet(deleteIds).then(response => {
+        delDevice(deleteIds).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -199,8 +200,10 @@
         })
       })
     },
-    handleSelectionChange(){
-
+    handleSelectionChange(val){
+      console.log('device Selection Change')
+      this.multipleSelection = val
+      console.log(this.multipleSelection)
     },
     // 删除多个设备
     batchDel() {
@@ -218,7 +221,7 @@
             type: 'warning'
           }
         ).then(() => {
-          delToilet(deleteIds).then(response => {
+          delDevice(deleteIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
@@ -229,6 +232,14 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 批量导入
     uploadFile(param) {
       // 判断文件大小是否符合要求
@@ -246,7 +257,7 @@
         background: 'rgba(0, 0, 0, 0.7)'
       })
       // 发起导入请求
-      batchImportToilet(_file).then(res => {
+      batchImportDevice(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
           this.$message.success('导入成功')
@@ -268,7 +279,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportDevice(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const fileName = `设备列表.xlsx`
diff --git a/src/views/device/editDevice.vue b/src/views/device/editDevice.vue
index 93024b8..f8646a2 100644
--- a/src/views/device/editDevice.vue
+++ b/src/views/device/editDevice.vue
@@ -18,7 +18,7 @@
           </el-row>
           <el-row :gutter="10">
             <el-col :span="12">
-              <el-form-item label="区/县" prop="area">
+              <el-form-item label="区/县" prop="areaCode">
                 <!--<el-input v-model.trim="DeviceForm.area" :disabled="isDetailMode" type="text" placeholder="必填"/>-->
                 <el-select v-model="DeviceForm.areaCode" :disabled="isDetailMode" placeholder="请选择区/县">
                   <el-option
@@ -52,8 +52,8 @@
           </el-row>
           <el-row :gutter="10">
             <el-col :span="12">
-              <el-form-item label="权属单位" prop="deptid">
-                <dept-select v-model="DeviceForm.deptid" :need-top="false" :dept-show="true" dept-type="03" placeholder="选择权属单位"/>
+              <el-form-item label="权属单位" prop="deptId">
+                <dept-select v-model="DeviceForm.deptId" :need-top="false" :dept-show="true" dept-type="03" placeholder="选择权属单位"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -113,7 +113,7 @@
         position: '', // 详细地址
         lng: '', // 经度
         lat: '', // 纬度
-        deptid: '', // 权属单位
+        deptId: '', // 权属单位
         installDate: '', // 安装时间
         notes: '' // 备注
       }, // 表单
@@ -127,8 +127,8 @@
         deviceNo: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         deviceName: [{ required: true, message: '安装点位不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '详细地址不能为空', trigger: ['blur', 'change'] }],
-        area: [{ required: true, message: '区/县不能为空', trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '权属单位不能为空', trigger: ['blur', 'change'] }],
+        areaCode: [{ required: true, message: '区/县不能为空', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '权属单位不能为空', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
@@ -168,7 +168,7 @@
           provinceCode: row.provinceCode, // 纬度
           cityCode: row.cityCode, // 纬度
           areaCode: row.areaCode, // 区/县
-          deptid: row.deptid, // 权属单位
+          deptId: row.deptId, // 权属单位
           installDate: row.installDate, // 安装时间
           notes: row.notes // 备注
         }
@@ -185,7 +185,7 @@
           provinceCode: row.provinceCode, // 纬度
           cityCode: row.cityCode, // 纬度
           areaCode: row.areaCode, // 区/县
-          deptid: row.deptid, // 权属单位
+          deptId: row.deptId, // 权属单位
           installDate: row.installDate, // 安装时间
           notes: row.notes // 备注
         }
@@ -206,7 +206,7 @@
         position: '', // 详细地址
         lng: '', // 经度
         lat: '', // 纬度
-        deptid: '', // 权属单位
+        deptId: '', // 权属单位
         installDate: '', // 安装时间
         notes: '' // 备注
       }