diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 6b405ea..7d3fee4 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -24,7 +24,9 @@
         </el-table-column>
         <el-table-column label="报警阈值" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.percent" size="small" :disabled="!scope.row.edit"></el-input>
+            <el-input v-model="scope.row.percent" type="number" size="small" :min="0" :max="120"  :disabled="!scope.row.edit" placeholder="请输入百分比值">
+              <template slot="append">%</template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="报警开关" align="center">
@@ -32,7 +34,9 @@
             <el-switch
               v-model="scope.row.alarmOpen"
               active-text="开"
-              inactive-value="关"
+              active-value="1"
+              inactive-text="关"
+              inactive-value="0"
               :disabled="!scope.row.edit"
               size="small"
             >
@@ -52,7 +56,7 @@
 </template>
 
 <script>
-  import { getAlarmLevelList } from '@/api/environment/alarmLevel'
+  import { getSensorAlarmLevel, addAlarmLevel, updateAlarmLevel, deleteAlarmLevel } from '@/api/environment/alarmLevel'
   import { getDictByCode } from '@/api/system/dict'
   export default {
     name: "sensorLevel",
@@ -96,7 +100,7 @@
       initDialog(row){
         this.dialogFormVisible = true
         this.sensor = row.sensor
-        this.dialogTitle = row.sensorName +'报警等级设置'
+        this.dialogTitle = row.name +'报警等级设置'
         this.fetchData()
       },
       addRow(){
@@ -104,7 +108,7 @@
           this.$message.warning('超出允许设置条数')
         }else{
           this.list.push({
-            alarmLevel: '', percent: '', alarmOpen: true, edit: true
+            alarmLevel: '', percent: '', alarmOpen: '1', edit: true
           })
         }
       },
@@ -123,12 +127,12 @@
             type: 'warning'
           }
         ).then(() => {
-          // deleteAlarmLevel(row.id).then(response => {
-          //   if (response.code === 200) {
+          deleteAlarmLevel(row.id).then(response => {
+            if (response.code === 200) {
               this.$message.success('删除成功')
               this.list.splice(this.list.findIndex(item=>row.id==item.id),1)
-            // }
-          // })
+            }
+          })
         })
       },
       //保存行数据
@@ -136,17 +140,27 @@
         if(this.validateRow(row)){
           // 有id执行编辑操作
           if(row.id){
-            //TODO: 更新报警等级
-            // updateAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              id: row.id,
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            updateAlarmLevel(params).then(res=>{
+              this.$message.success('保存成功')
+            })
           }else{ // 执行新增操作
-            //TODO：新增报警等级
-            // addAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            addAlarmLevel(params).then(res=>{
+              row.id = res.data
+              this.$message.success('保存成功')
+            })
           }
           row.edit = false
         }
@@ -176,15 +190,19 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
-          { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
-          { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getSensorAlarmLevel({sensor: this.sensor}).then(res =>{
+          this.list = res.data.map(item=>{
+            return {...item, edit:false}
+          })
+          this.total = res.data.length
+          // this.list = [
+          //   { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
+          //   { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
+          //   { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
+          // ]
+          // this.total = 4
+          this.listLoading = false
+        })
       },
       // 获取报警等级类别
       fetchAlarmLevelType() {

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 6b405ea..7d3fee4 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -24,7 +24,9 @@
         </el-table-column>
         <el-table-column label="报警阈值" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.percent" size="small" :disabled="!scope.row.edit"></el-input>
+            <el-input v-model="scope.row.percent" type="number" size="small" :min="0" :max="120"  :disabled="!scope.row.edit" placeholder="请输入百分比值">
+              <template slot="append">%</template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="报警开关" align="center">
@@ -32,7 +34,9 @@
             <el-switch
               v-model="scope.row.alarmOpen"
               active-text="开"
-              inactive-value="关"
+              active-value="1"
+              inactive-text="关"
+              inactive-value="0"
               :disabled="!scope.row.edit"
               size="small"
             >
@@ -52,7 +56,7 @@
 </template>
 
 <script>
-  import { getAlarmLevelList } from '@/api/environment/alarmLevel'
+  import { getSensorAlarmLevel, addAlarmLevel, updateAlarmLevel, deleteAlarmLevel } from '@/api/environment/alarmLevel'
   import { getDictByCode } from '@/api/system/dict'
   export default {
     name: "sensorLevel",
@@ -96,7 +100,7 @@
       initDialog(row){
         this.dialogFormVisible = true
         this.sensor = row.sensor
-        this.dialogTitle = row.sensorName +'报警等级设置'
+        this.dialogTitle = row.name +'报警等级设置'
         this.fetchData()
       },
       addRow(){
@@ -104,7 +108,7 @@
           this.$message.warning('超出允许设置条数')
         }else{
           this.list.push({
-            alarmLevel: '', percent: '', alarmOpen: true, edit: true
+            alarmLevel: '', percent: '', alarmOpen: '1', edit: true
           })
         }
       },
@@ -123,12 +127,12 @@
             type: 'warning'
           }
         ).then(() => {
-          // deleteAlarmLevel(row.id).then(response => {
-          //   if (response.code === 200) {
+          deleteAlarmLevel(row.id).then(response => {
+            if (response.code === 200) {
               this.$message.success('删除成功')
               this.list.splice(this.list.findIndex(item=>row.id==item.id),1)
-            // }
-          // })
+            }
+          })
         })
       },
       //保存行数据
@@ -136,17 +140,27 @@
         if(this.validateRow(row)){
           // 有id执行编辑操作
           if(row.id){
-            //TODO: 更新报警等级
-            // updateAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              id: row.id,
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            updateAlarmLevel(params).then(res=>{
+              this.$message.success('保存成功')
+            })
           }else{ // 执行新增操作
-            //TODO：新增报警等级
-            // addAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            addAlarmLevel(params).then(res=>{
+              row.id = res.data
+              this.$message.success('保存成功')
+            })
           }
           row.edit = false
         }
@@ -176,15 +190,19 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
-          { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
-          { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getSensorAlarmLevel({sensor: this.sensor}).then(res =>{
+          this.list = res.data.map(item=>{
+            return {...item, edit:false}
+          })
+          this.total = res.data.length
+          // this.list = [
+          //   { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
+          //   { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
+          //   { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
+          // ]
+          // this.total = 4
+          this.listLoading = false
+        })
       },
       // 获取报警等级类别
       fetchAlarmLevelType() {
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index d5dac35..ade71cd 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -114,12 +114,12 @@
           type: 'warning'
         }
       ).then(() => {
-        // delToilet(row.id).then(response => {
-        //   if (response.code === 200) {
-        //     this.$message.success('删除成功')
-        //     this.fetchData()
-        //   }
-        // })
+        deleteAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
       })
     },
     // 编辑规则

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 6b405ea..7d3fee4 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -24,7 +24,9 @@
         </el-table-column>
         <el-table-column label="报警阈值" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.percent" size="small" :disabled="!scope.row.edit"></el-input>
+            <el-input v-model="scope.row.percent" type="number" size="small" :min="0" :max="120"  :disabled="!scope.row.edit" placeholder="请输入百分比值">
+              <template slot="append">%</template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="报警开关" align="center">
@@ -32,7 +34,9 @@
             <el-switch
               v-model="scope.row.alarmOpen"
               active-text="开"
-              inactive-value="关"
+              active-value="1"
+              inactive-text="关"
+              inactive-value="0"
               :disabled="!scope.row.edit"
               size="small"
             >
@@ -52,7 +56,7 @@
 </template>
 
 <script>
-  import { getAlarmLevelList } from '@/api/environment/alarmLevel'
+  import { getSensorAlarmLevel, addAlarmLevel, updateAlarmLevel, deleteAlarmLevel } from '@/api/environment/alarmLevel'
   import { getDictByCode } from '@/api/system/dict'
   export default {
     name: "sensorLevel",
@@ -96,7 +100,7 @@
       initDialog(row){
         this.dialogFormVisible = true
         this.sensor = row.sensor
-        this.dialogTitle = row.sensorName +'报警等级设置'
+        this.dialogTitle = row.name +'报警等级设置'
         this.fetchData()
       },
       addRow(){
@@ -104,7 +108,7 @@
           this.$message.warning('超出允许设置条数')
         }else{
           this.list.push({
-            alarmLevel: '', percent: '', alarmOpen: true, edit: true
+            alarmLevel: '', percent: '', alarmOpen: '1', edit: true
           })
         }
       },
@@ -123,12 +127,12 @@
             type: 'warning'
           }
         ).then(() => {
-          // deleteAlarmLevel(row.id).then(response => {
-          //   if (response.code === 200) {
+          deleteAlarmLevel(row.id).then(response => {
+            if (response.code === 200) {
               this.$message.success('删除成功')
               this.list.splice(this.list.findIndex(item=>row.id==item.id),1)
-            // }
-          // })
+            }
+          })
         })
       },
       //保存行数据
@@ -136,17 +140,27 @@
         if(this.validateRow(row)){
           // 有id执行编辑操作
           if(row.id){
-            //TODO: 更新报警等级
-            // updateAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              id: row.id,
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            updateAlarmLevel(params).then(res=>{
+              this.$message.success('保存成功')
+            })
           }else{ // 执行新增操作
-            //TODO：新增报警等级
-            // addAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            addAlarmLevel(params).then(res=>{
+              row.id = res.data
+              this.$message.success('保存成功')
+            })
           }
           row.edit = false
         }
@@ -176,15 +190,19 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
-          { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
-          { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getSensorAlarmLevel({sensor: this.sensor}).then(res =>{
+          this.list = res.data.map(item=>{
+            return {...item, edit:false}
+          })
+          this.total = res.data.length
+          // this.list = [
+          //   { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
+          //   { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
+          //   { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
+          // ]
+          // this.total = 4
+          this.listLoading = false
+        })
       },
       // 获取报警等级类别
       fetchAlarmLevelType() {
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index d5dac35..ade71cd 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -114,12 +114,12 @@
           type: 'warning'
         }
       ).then(() => {
-        // delToilet(row.id).then(response => {
-        //   if (response.code === 200) {
-        //     this.$message.success('删除成功')
-        //     this.fetchData()
-        //   }
-        // })
+        deleteAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
       })
     },
     // 编辑规则
diff --git a/src/views/alarmRule/editAlarmRule.vue b/src/views/alarmRule/editAlarmRule.vue
index 67c5774..0945b04 100644
--- a/src/views/alarmRule/editAlarmRule.vue
+++ b/src/views/alarmRule/editAlarmRule.vue
@@ -42,12 +42,11 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
-    <!--地图选点-->
   </el-dialog>
 </template>
 
 <script>
-import { addDevice, updateDevice } from '@/api/environment/device'
+import { addAlarmRule, updateAlarmRule } from '@/api/environment/alarmRule'
 export default {
   name: 'EditAlarmRule',
   data() {
@@ -144,23 +143,12 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.ruleForm)
         if (valid) {
-          addDevice(this.ruleForm).then(response => {
+          addAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('新增成功')
+              this.dialogFormVisible = false
+              this.canEdit = true
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
@@ -175,7 +163,7 @@
       this.canEdit = false
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          updateDevice(this.ruleForm).then(response => {
+          updateAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 6b405ea..7d3fee4 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -24,7 +24,9 @@
         </el-table-column>
         <el-table-column label="报警阈值" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.percent" size="small" :disabled="!scope.row.edit"></el-input>
+            <el-input v-model="scope.row.percent" type="number" size="small" :min="0" :max="120"  :disabled="!scope.row.edit" placeholder="请输入百分比值">
+              <template slot="append">%</template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="报警开关" align="center">
@@ -32,7 +34,9 @@
             <el-switch
               v-model="scope.row.alarmOpen"
               active-text="开"
-              inactive-value="关"
+              active-value="1"
+              inactive-text="关"
+              inactive-value="0"
               :disabled="!scope.row.edit"
               size="small"
             >
@@ -52,7 +56,7 @@
 </template>
 
 <script>
-  import { getAlarmLevelList } from '@/api/environment/alarmLevel'
+  import { getSensorAlarmLevel, addAlarmLevel, updateAlarmLevel, deleteAlarmLevel } from '@/api/environment/alarmLevel'
   import { getDictByCode } from '@/api/system/dict'
   export default {
     name: "sensorLevel",
@@ -96,7 +100,7 @@
       initDialog(row){
         this.dialogFormVisible = true
         this.sensor = row.sensor
-        this.dialogTitle = row.sensorName +'报警等级设置'
+        this.dialogTitle = row.name +'报警等级设置'
         this.fetchData()
       },
       addRow(){
@@ -104,7 +108,7 @@
           this.$message.warning('超出允许设置条数')
         }else{
           this.list.push({
-            alarmLevel: '', percent: '', alarmOpen: true, edit: true
+            alarmLevel: '', percent: '', alarmOpen: '1', edit: true
           })
         }
       },
@@ -123,12 +127,12 @@
             type: 'warning'
           }
         ).then(() => {
-          // deleteAlarmLevel(row.id).then(response => {
-          //   if (response.code === 200) {
+          deleteAlarmLevel(row.id).then(response => {
+            if (response.code === 200) {
               this.$message.success('删除成功')
               this.list.splice(this.list.findIndex(item=>row.id==item.id),1)
-            // }
-          // })
+            }
+          })
         })
       },
       //保存行数据
@@ -136,17 +140,27 @@
         if(this.validateRow(row)){
           // 有id执行编辑操作
           if(row.id){
-            //TODO: 更新报警等级
-            // updateAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              id: row.id,
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            updateAlarmLevel(params).then(res=>{
+              this.$message.success('保存成功')
+            })
           }else{ // 执行新增操作
-            //TODO：新增报警等级
-            // addAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            addAlarmLevel(params).then(res=>{
+              row.id = res.data
+              this.$message.success('保存成功')
+            })
           }
           row.edit = false
         }
@@ -176,15 +190,19 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
-          { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
-          { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getSensorAlarmLevel({sensor: this.sensor}).then(res =>{
+          this.list = res.data.map(item=>{
+            return {...item, edit:false}
+          })
+          this.total = res.data.length
+          // this.list = [
+          //   { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
+          //   { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
+          //   { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
+          // ]
+          // this.total = 4
+          this.listLoading = false
+        })
       },
       // 获取报警等级类别
       fetchAlarmLevelType() {
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index d5dac35..ade71cd 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -114,12 +114,12 @@
           type: 'warning'
         }
       ).then(() => {
-        // delToilet(row.id).then(response => {
-        //   if (response.code === 200) {
-        //     this.$message.success('删除成功')
-        //     this.fetchData()
-        //   }
-        // })
+        deleteAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
       })
     },
     // 编辑规则
diff --git a/src/views/alarmRule/editAlarmRule.vue b/src/views/alarmRule/editAlarmRule.vue
index 67c5774..0945b04 100644
--- a/src/views/alarmRule/editAlarmRule.vue
+++ b/src/views/alarmRule/editAlarmRule.vue
@@ -42,12 +42,11 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
-    <!--地图选点-->
   </el-dialog>
 </template>
 
 <script>
-import { addDevice, updateDevice } from '@/api/environment/device'
+import { addAlarmRule, updateAlarmRule } from '@/api/environment/alarmRule'
 export default {
   name: 'EditAlarmRule',
   data() {
@@ -144,23 +143,12 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.ruleForm)
         if (valid) {
-          addDevice(this.ruleForm).then(response => {
+          addAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('新增成功')
+              this.dialogFormVisible = false
+              this.canEdit = true
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
@@ -175,7 +163,7 @@
       this.canEdit = false
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          updateDevice(this.ruleForm).then(response => {
+          updateAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index fac211e..3c42a48 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.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/>

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 6b405ea..7d3fee4 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -24,7 +24,9 @@
         </el-table-column>
         <el-table-column label="报警阈值" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.percent" size="small" :disabled="!scope.row.edit"></el-input>
+            <el-input v-model="scope.row.percent" type="number" size="small" :min="0" :max="120"  :disabled="!scope.row.edit" placeholder="请输入百分比值">
+              <template slot="append">%</template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="报警开关" align="center">
@@ -32,7 +34,9 @@
             <el-switch
               v-model="scope.row.alarmOpen"
               active-text="开"
-              inactive-value="关"
+              active-value="1"
+              inactive-text="关"
+              inactive-value="0"
               :disabled="!scope.row.edit"
               size="small"
             >
@@ -52,7 +56,7 @@
 </template>
 
 <script>
-  import { getAlarmLevelList } from '@/api/environment/alarmLevel'
+  import { getSensorAlarmLevel, addAlarmLevel, updateAlarmLevel, deleteAlarmLevel } from '@/api/environment/alarmLevel'
   import { getDictByCode } from '@/api/system/dict'
   export default {
     name: "sensorLevel",
@@ -96,7 +100,7 @@
       initDialog(row){
         this.dialogFormVisible = true
         this.sensor = row.sensor
-        this.dialogTitle = row.sensorName +'报警等级设置'
+        this.dialogTitle = row.name +'报警等级设置'
         this.fetchData()
       },
       addRow(){
@@ -104,7 +108,7 @@
           this.$message.warning('超出允许设置条数')
         }else{
           this.list.push({
-            alarmLevel: '', percent: '', alarmOpen: true, edit: true
+            alarmLevel: '', percent: '', alarmOpen: '1', edit: true
           })
         }
       },
@@ -123,12 +127,12 @@
             type: 'warning'
           }
         ).then(() => {
-          // deleteAlarmLevel(row.id).then(response => {
-          //   if (response.code === 200) {
+          deleteAlarmLevel(row.id).then(response => {
+            if (response.code === 200) {
               this.$message.success('删除成功')
               this.list.splice(this.list.findIndex(item=>row.id==item.id),1)
-            // }
-          // })
+            }
+          })
         })
       },
       //保存行数据
@@ -136,17 +140,27 @@
         if(this.validateRow(row)){
           // 有id执行编辑操作
           if(row.id){
-            //TODO: 更新报警等级
-            // updateAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              id: row.id,
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            updateAlarmLevel(params).then(res=>{
+              this.$message.success('保存成功')
+            })
           }else{ // 执行新增操作
-            //TODO：新增报警等级
-            // addAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            addAlarmLevel(params).then(res=>{
+              row.id = res.data
+              this.$message.success('保存成功')
+            })
           }
           row.edit = false
         }
@@ -176,15 +190,19 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
-          { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
-          { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getSensorAlarmLevel({sensor: this.sensor}).then(res =>{
+          this.list = res.data.map(item=>{
+            return {...item, edit:false}
+          })
+          this.total = res.data.length
+          // this.list = [
+          //   { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
+          //   { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
+          //   { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
+          // ]
+          // this.total = 4
+          this.listLoading = false
+        })
       },
       // 获取报警等级类别
       fetchAlarmLevelType() {
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index d5dac35..ade71cd 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -114,12 +114,12 @@
           type: 'warning'
         }
       ).then(() => {
-        // delToilet(row.id).then(response => {
-        //   if (response.code === 200) {
-        //     this.$message.success('删除成功')
-        //     this.fetchData()
-        //   }
-        // })
+        deleteAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
       })
     },
     // 编辑规则
diff --git a/src/views/alarmRule/editAlarmRule.vue b/src/views/alarmRule/editAlarmRule.vue
index 67c5774..0945b04 100644
--- a/src/views/alarmRule/editAlarmRule.vue
+++ b/src/views/alarmRule/editAlarmRule.vue
@@ -42,12 +42,11 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
-    <!--地图选点-->
   </el-dialog>
 </template>
 
 <script>
-import { addDevice, updateDevice } from '@/api/environment/device'
+import { addAlarmRule, updateAlarmRule } from '@/api/environment/alarmRule'
 export default {
   name: 'EditAlarmRule',
   data() {
@@ -144,23 +143,12 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.ruleForm)
         if (valid) {
-          addDevice(this.ruleForm).then(response => {
+          addAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('新增成功')
+              this.dialogFormVisible = false
+              this.canEdit = true
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
@@ -175,7 +163,7 @@
       this.canEdit = false
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          updateDevice(this.ruleForm).then(response => {
+          updateAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index fac211e..3c42a48 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.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/>
diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue
index f15fb7b..c8f2842 100644
--- a/src/views/data/allDeviceData.vue
+++ b/src/views/data/allDeviceData.vue
@@ -122,16 +122,18 @@
     // 获取数据
     fetchData() {
       this.listLoading = true
-      // getRealData().then(res =>{
-        this.list = [
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' }
-        ]
-        this.total = 4
+      getRealData().then(res =>{
+        this.list = res.data.rows
+        this.total = res.data.total
+      //   this.list = [
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' }
+      //   ]
+      //   this.total = 4
         this.listLoading = false
-      // })
+      })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 6b405ea..7d3fee4 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -24,7 +24,9 @@
         </el-table-column>
         <el-table-column label="报警阈值" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.percent" size="small" :disabled="!scope.row.edit"></el-input>
+            <el-input v-model="scope.row.percent" type="number" size="small" :min="0" :max="120"  :disabled="!scope.row.edit" placeholder="请输入百分比值">
+              <template slot="append">%</template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="报警开关" align="center">
@@ -32,7 +34,9 @@
             <el-switch
               v-model="scope.row.alarmOpen"
               active-text="开"
-              inactive-value="关"
+              active-value="1"
+              inactive-text="关"
+              inactive-value="0"
               :disabled="!scope.row.edit"
               size="small"
             >
@@ -52,7 +56,7 @@
 </template>
 
 <script>
-  import { getAlarmLevelList } from '@/api/environment/alarmLevel'
+  import { getSensorAlarmLevel, addAlarmLevel, updateAlarmLevel, deleteAlarmLevel } from '@/api/environment/alarmLevel'
   import { getDictByCode } from '@/api/system/dict'
   export default {
     name: "sensorLevel",
@@ -96,7 +100,7 @@
       initDialog(row){
         this.dialogFormVisible = true
         this.sensor = row.sensor
-        this.dialogTitle = row.sensorName +'报警等级设置'
+        this.dialogTitle = row.name +'报警等级设置'
         this.fetchData()
       },
       addRow(){
@@ -104,7 +108,7 @@
           this.$message.warning('超出允许设置条数')
         }else{
           this.list.push({
-            alarmLevel: '', percent: '', alarmOpen: true, edit: true
+            alarmLevel: '', percent: '', alarmOpen: '1', edit: true
           })
         }
       },
@@ -123,12 +127,12 @@
             type: 'warning'
           }
         ).then(() => {
-          // deleteAlarmLevel(row.id).then(response => {
-          //   if (response.code === 200) {
+          deleteAlarmLevel(row.id).then(response => {
+            if (response.code === 200) {
               this.$message.success('删除成功')
               this.list.splice(this.list.findIndex(item=>row.id==item.id),1)
-            // }
-          // })
+            }
+          })
         })
       },
       //保存行数据
@@ -136,17 +140,27 @@
         if(this.validateRow(row)){
           // 有id执行编辑操作
           if(row.id){
-            //TODO: 更新报警等级
-            // updateAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              id: row.id,
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            updateAlarmLevel(params).then(res=>{
+              this.$message.success('保存成功')
+            })
           }else{ // 执行新增操作
-            //TODO：新增报警等级
-            // addAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            addAlarmLevel(params).then(res=>{
+              row.id = res.data
+              this.$message.success('保存成功')
+            })
           }
           row.edit = false
         }
@@ -176,15 +190,19 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
-          { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
-          { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getSensorAlarmLevel({sensor: this.sensor}).then(res =>{
+          this.list = res.data.map(item=>{
+            return {...item, edit:false}
+          })
+          this.total = res.data.length
+          // this.list = [
+          //   { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
+          //   { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
+          //   { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
+          // ]
+          // this.total = 4
+          this.listLoading = false
+        })
       },
       // 获取报警等级类别
       fetchAlarmLevelType() {
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index d5dac35..ade71cd 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -114,12 +114,12 @@
           type: 'warning'
         }
       ).then(() => {
-        // delToilet(row.id).then(response => {
-        //   if (response.code === 200) {
-        //     this.$message.success('删除成功')
-        //     this.fetchData()
-        //   }
-        // })
+        deleteAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
       })
     },
     // 编辑规则
diff --git a/src/views/alarmRule/editAlarmRule.vue b/src/views/alarmRule/editAlarmRule.vue
index 67c5774..0945b04 100644
--- a/src/views/alarmRule/editAlarmRule.vue
+++ b/src/views/alarmRule/editAlarmRule.vue
@@ -42,12 +42,11 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
-    <!--地图选点-->
   </el-dialog>
 </template>
 
 <script>
-import { addDevice, updateDevice } from '@/api/environment/device'
+import { addAlarmRule, updateAlarmRule } from '@/api/environment/alarmRule'
 export default {
   name: 'EditAlarmRule',
   data() {
@@ -144,23 +143,12 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.ruleForm)
         if (valid) {
-          addDevice(this.ruleForm).then(response => {
+          addAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('新增成功')
+              this.dialogFormVisible = false
+              this.canEdit = true
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
@@ -175,7 +163,7 @@
       this.canEdit = false
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          updateDevice(this.ruleForm).then(response => {
+          updateAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index fac211e..3c42a48 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.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/>
diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue
index f15fb7b..c8f2842 100644
--- a/src/views/data/allDeviceData.vue
+++ b/src/views/data/allDeviceData.vue
@@ -122,16 +122,18 @@
     // 获取数据
     fetchData() {
       this.listLoading = true
-      // getRealData().then(res =>{
-        this.list = [
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' }
-        ]
-        this.total = 4
+      getRealData().then(res =>{
+        this.list = res.data.rows
+        this.total = res.data.total
+      //   this.list = [
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' }
+      //   ]
+      //   this.total = 4
         this.listLoading = false
-      // })
+      })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
diff --git a/src/views/data/chooseDevice.vue b/src/views/data/chooseDevice.vue
index 9d08241..97c077a 100644
--- a/src/views/data/chooseDevice.vue
+++ b/src/views/data/chooseDevice.vue
@@ -20,7 +20,7 @@
       </span>
       </el-tree>
     </el-scrollbar>
-    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer">
       <el-button :disabled="currentDevice==null" type="primary" @click="saveData">确定</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
@@ -57,17 +57,16 @@
     // 查询所有设备列表
     fetchData(){
       this.dataLoading = true
-      // TODO: 请求数据
       getDeviceList().then(res=>{
-        // this.deviceList = res.data
-        this.deviceList= [
-          {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.deviceList = res.data
+        // this.deviceList= [
+        //   {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.dataLoading = false
       })
     },

diff --git a/src/api/environment/alarm.js b/src/api/environment/alarm.js
index b513c81..e21011a 100644
--- a/src/api/environment/alarm.js
+++ b/src/api/environment/alarm.js
@@ -15,7 +15,7 @@
 export function cancelAlarm(params) {
   return request({
     url: '/environment/alarm/cancel',
-    method: 'get',
+    method: 'post',
     params
   })
 }
diff --git a/src/api/environment/alarmLevel.js b/src/api/environment/alarmLevel.js
index 1d2445c..0a73517 100644
--- a/src/api/environment/alarmLevel.js
+++ b/src/api/environment/alarmLevel.js
@@ -14,7 +14,7 @@
 // 单个指标报警等级查询
 export function getSensorAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/cancel',
+    url: '/environment/alarmLevel/listBySensor',
     method: 'get',
     params
   })
@@ -23,7 +23,7 @@
 // 添加报警等级
 export function addAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/add',
     method: 'post',
     params
   })
@@ -32,7 +32,7 @@
 // 修改报警等级
 export function updateAlarmLevel(params) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除报警等级
 export function deleteAlarmLevel(id) {
   return request({
-    url: '/environment/alarm/batchCancel',
+    url: '/environment/alarmLevel/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/alarmRule.js b/src/api/environment/alarmRule.js
index c9d68eb..b7b5bf2 100644
--- a/src/api/environment/alarmRule.js
+++ b/src/api/environment/alarmRule.js
@@ -33,7 +33,7 @@
 // 删除报警阈值
 export function deleteAlarmRule(id) {
   return request({
-    url: '/environment/alarmRule/update',
+    url: '/environment/alarmRule/delete',
     method: 'post',
     params:{
       id: id
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 1c2df04..29ea548 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -9,21 +9,28 @@
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
-    params
   })
 }
 // 全部设备实时数据查询
 export function getRealData() {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/environment/data/real',
+    method: 'get',
+  })
+}
+// 单设备历史数据查询
+export function getHistoryDataPage(params) {
+  return request({
+    url: '/environment/data/historyDataPage',
     method: 'get',
     params
   })
 }
+
 // 单设备历史数据查询
 export function getHistoryData(params) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/environment/data/historyData',
     method: 'get',
     params
   })
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index 2d8b5c9..f50dbd5 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -83,8 +83,8 @@
         endTime: '',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -201,17 +201,17 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '2', alarmTime:'2021-07-04 08:33:00'},
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '3', alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 59cdcac..6f90d63 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -71,8 +71,8 @@
         status: '1',
         offset: 1,
         limit: 20,
-        sort: '',
-        order: ''
+        sort: 'alarmTime',
+        order: 'desc'
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -173,7 +173,7 @@
       ).then(() => {
         cancelAlarm({id: id}).then(response => {
           this.$message.success('取消报警成功')
-          this.closeDialog()
+          this.fetchData(false)
         })
       })
     },
@@ -223,15 +223,22 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
-      ]
-      this.total = 1
-      // getAlarmList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      // this.list = [
+      //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
+      // ]
+      // this.total = 1
+      getAlarmList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
-      // })
+      })
     },
     // 获取报警类型
     fetchAlarmType() {
diff --git a/src/views/alarmLevel/listLevel.vue b/src/views/alarmLevel/listLevel.vue
index 664404b..07f6c65 100644
--- a/src/views/alarmLevel/listLevel.vue
+++ b/src/views/alarmLevel/listLevel.vue
@@ -42,7 +42,7 @@
         columns: [
           {
             text: '参数名称',
-            value: 'sensorName'
+            value: 'name'
           },
           {
             text: '参数编码',
diff --git a/src/views/alarmLevel/sensorLevel.vue b/src/views/alarmLevel/sensorLevel.vue
index 6b405ea..7d3fee4 100644
--- a/src/views/alarmLevel/sensorLevel.vue
+++ b/src/views/alarmLevel/sensorLevel.vue
@@ -24,7 +24,9 @@
         </el-table-column>
         <el-table-column label="报警阈值" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.percent" size="small" :disabled="!scope.row.edit"></el-input>
+            <el-input v-model="scope.row.percent" type="number" size="small" :min="0" :max="120"  :disabled="!scope.row.edit" placeholder="请输入百分比值">
+              <template slot="append">%</template>
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column label="报警开关" align="center">
@@ -32,7 +34,9 @@
             <el-switch
               v-model="scope.row.alarmOpen"
               active-text="开"
-              inactive-value="关"
+              active-value="1"
+              inactive-text="关"
+              inactive-value="0"
               :disabled="!scope.row.edit"
               size="small"
             >
@@ -52,7 +56,7 @@
 </template>
 
 <script>
-  import { getAlarmLevelList } from '@/api/environment/alarmLevel'
+  import { getSensorAlarmLevel, addAlarmLevel, updateAlarmLevel, deleteAlarmLevel } from '@/api/environment/alarmLevel'
   import { getDictByCode } from '@/api/system/dict'
   export default {
     name: "sensorLevel",
@@ -96,7 +100,7 @@
       initDialog(row){
         this.dialogFormVisible = true
         this.sensor = row.sensor
-        this.dialogTitle = row.sensorName +'报警等级设置'
+        this.dialogTitle = row.name +'报警等级设置'
         this.fetchData()
       },
       addRow(){
@@ -104,7 +108,7 @@
           this.$message.warning('超出允许设置条数')
         }else{
           this.list.push({
-            alarmLevel: '', percent: '', alarmOpen: true, edit: true
+            alarmLevel: '', percent: '', alarmOpen: '1', edit: true
           })
         }
       },
@@ -123,12 +127,12 @@
             type: 'warning'
           }
         ).then(() => {
-          // deleteAlarmLevel(row.id).then(response => {
-          //   if (response.code === 200) {
+          deleteAlarmLevel(row.id).then(response => {
+            if (response.code === 200) {
               this.$message.success('删除成功')
               this.list.splice(this.list.findIndex(item=>row.id==item.id),1)
-            // }
-          // })
+            }
+          })
         })
       },
       //保存行数据
@@ -136,17 +140,27 @@
         if(this.validateRow(row)){
           // 有id执行编辑操作
           if(row.id){
-            //TODO: 更新报警等级
-            // updateAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              id: row.id,
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            updateAlarmLevel(params).then(res=>{
+              this.$message.success('保存成功')
+            })
           }else{ // 执行新增操作
-            //TODO：新增报警等级
-            // addAlarmLevel(row).then(res=>{
-            //
-            // })
-            this.$message.success('保存成功')
+            const params = {
+              sensor: this.sensor,
+              percent: row.percent,
+              alarmLevel: row.alarmLevel,
+              alarmOpen: row.alarmOpen
+            }
+            addAlarmLevel(params).then(res=>{
+              row.id = res.data
+              this.$message.success('保存成功')
+            })
           }
           row.edit = false
         }
@@ -176,15 +190,19 @@
       // 获取数据
       fetchData() {
         this.listLoading = true
-        // getRealData().then(res =>{
-        this.list = [
-          { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
-          { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
-          { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
-        ]
-        this.total = 4
-        this.listLoading = false
-        // })
+        getSensorAlarmLevel({sensor: this.sensor}).then(res =>{
+          this.list = res.data.map(item=>{
+            return {...item, edit:false}
+          })
+          this.total = res.data.length
+          // this.list = [
+          //   { id:'1', alarmLevel: '1', percent: '80', alarmOpen: true, edit: false},
+          //   { id:'2', alarmLevel: '2', percent: '60', alarmOpen: true, edit: false},
+          //   { id:'3', alarmLevel: '3', percent: '50', alarmOpen: true, edit: false}
+          // ]
+          // this.total = 4
+          this.listLoading = false
+        })
       },
       // 获取报警等级类别
       fetchAlarmLevelType() {
diff --git a/src/views/alarmRule/deviceAlarmRuleList.vue b/src/views/alarmRule/deviceAlarmRuleList.vue
index d5dac35..ade71cd 100644
--- a/src/views/alarmRule/deviceAlarmRuleList.vue
+++ b/src/views/alarmRule/deviceAlarmRuleList.vue
@@ -114,12 +114,12 @@
           type: 'warning'
         }
       ).then(() => {
-        // delToilet(row.id).then(response => {
-        //   if (response.code === 200) {
-        //     this.$message.success('删除成功')
-        //     this.fetchData()
-        //   }
-        // })
+        deleteAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
       })
     },
     // 编辑规则
diff --git a/src/views/alarmRule/editAlarmRule.vue b/src/views/alarmRule/editAlarmRule.vue
index 67c5774..0945b04 100644
--- a/src/views/alarmRule/editAlarmRule.vue
+++ b/src/views/alarmRule/editAlarmRule.vue
@@ -42,12 +42,11 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
-    <!--地图选点-->
   </el-dialog>
 </template>
 
 <script>
-import { addDevice, updateDevice } from '@/api/environment/device'
+import { addAlarmRule, updateAlarmRule } from '@/api/environment/alarmRule'
 export default {
   name: 'EditAlarmRule',
   data() {
@@ -144,23 +143,12 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.ruleForm)
         if (valid) {
-          addDevice(this.ruleForm).then(response => {
+          addAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('新增成功')
+              this.dialogFormVisible = false
+              this.canEdit = true
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
@@ -175,7 +163,7 @@
       this.canEdit = false
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          updateDevice(this.ruleForm).then(response => {
+          updateAlarmRule(this.ruleForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index fac211e..3c42a48 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.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/>
diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue
index f15fb7b..c8f2842 100644
--- a/src/views/data/allDeviceData.vue
+++ b/src/views/data/allDeviceData.vue
@@ -122,16 +122,18 @@
     // 获取数据
     fetchData() {
       this.listLoading = true
-      // getRealData().then(res =>{
-        this.list = [
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
-          { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' }
-        ]
-        this.total = 4
+      getRealData().then(res =>{
+        this.list = res.data.rows
+        this.total = res.data.total
+      //   this.list = [
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' },
+      //     { deviceNo:'1245521111141', deviceName: '宝水新城监控点', pm25: '23.40', pm10: '25.80', tsp: '0.00', noise: '3.40', windPower: '0.40', windDirection: '7.40', temperature: '22.50', humidity: '80.50', windSpeed: '2.50', pressure: '122.50', ts: '2021-05-07 11:15' }
+      //   ]
+      //   this.total = 4
         this.listLoading = false
-      // })
+      })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
diff --git a/src/views/data/chooseDevice.vue b/src/views/data/chooseDevice.vue
index 9d08241..97c077a 100644
--- a/src/views/data/chooseDevice.vue
+++ b/src/views/data/chooseDevice.vue
@@ -20,7 +20,7 @@
       </span>
       </el-tree>
     </el-scrollbar>
-    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer">
       <el-button :disabled="currentDevice==null" type="primary" @click="saveData">确定</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
@@ -57,17 +57,16 @@
     // 查询所有设备列表
     fetchData(){
       this.dataLoading = true
-      // TODO: 请求数据
       getDeviceList().then(res=>{
-        // this.deviceList = res.data
-        this.deviceList= [
-          {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.deviceList = res.data
+        // this.deviceList= [
+        //   {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.dataLoading = false
       })
     },
diff --git a/src/views/data/pointData.vue b/src/views/data/pointData.vue
index 9834728..c2956c0 100644
--- a/src/views/data/pointData.vue
+++ b/src/views/data/pointData.vue
@@ -50,7 +50,7 @@
       <ve-line :data="chartData" :settings="chartSettings"/>
     </div>
     <!--列表-->
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns"
+    <normal-table :data="listPage" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns"
                   :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption"
                   size="small" @change="changePage">
       <template slot="btns"/>
@@ -109,7 +109,7 @@
           startDate: '', // 开始时间
           endDate: '', // 结束时间
           offset: 1,
-          limit: 20
+          limit: 10
         }, // 筛选条件
         columns: [], // 显示列
         timeRange: [], // 时间范围
@@ -131,6 +131,13 @@
         } // 表格属性
       }
     },
+    computed:{
+      listPage(){
+        const pageBegin = (this.listQuery.offset-1)*this.listQuery.limit
+        const pageEnd = pageBegin+this.listQuery.limit
+        return this.list.slice(pageBegin,pageEnd)
+      }
+    },
     created() {
       this.timeRange = [getToday('yyyy-MM-dd 00:00:00'), getToday('yyyy-MM-dd hh:mm:ss')]
       this.fetchDeviceList()
@@ -138,18 +145,18 @@
     methods: {
       // 查询所有设备列表,设置默认设备
       fetchDeviceList(){
-        // TODO: 请求数据
         getDeviceList().then(res=>{
-          // this.deviceList = res.data
-          const deviceList= [
-            {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.currentDevice = deviceList[0]
+          this.deviceList = res.data
+          // const deviceList= [
+          //   {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.currentDevice = this.deviceList[0]
+          this.listQuery.deviceNo = this.currentDevice.deviceNo
           this.fetchData()
         })
       },
@@ -167,16 +174,17 @@
           // 根据选择的参数列表过滤参数
           const labelMap = {}
           const metrics = []
-          const columns = [{text: '名称', value: 'ts', align: 'center'}]
+          const columns = [{text: '时间', value: 'ts', align: 'center', width:140}]
           for(const item of this.paramsList){
             if(this.listQuery.params.length==0){
-              labelMap[item.value] = item.name
+              labelMap[item.value] = item.name+'('+item.unit+')'
               metrics.push(item.value)
-              columns.push({text:item.name, value:item.value})
+              columns.push({text:item.name+'('+item.unit+')', value:item.value})
             }else{
               if(this.listQuery.params.indexOf(item.value)>-1){
-                labelMap[item.value] = item.name
+                labelMap[item.value] = item.name+'('+item.unit+')'
                 metrics.push(item.value)
+                columns.push({text:item.name+'('+item.unit+')', value:item.value})
               }
             }
           }
@@ -186,16 +194,21 @@
             metrics: metrics,
             dimension: ['ts']
           }
-          this.chartData.rows = this.list = [
-            {ts: '9月20日', pm25: 153, pm10: 43, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
-            {ts: '9月21日', pm25: 150, pm10: 30, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
-            {ts: '9月22日', pm25: 143, pm10: 23, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
-            {ts: '9月23日', pm25: 173, pm10: 23, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
-            {ts: '9月24日', pm25: 272, pm10: 52, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
-            {ts: '9月25日', pm25: 253, pm10: 53, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 }
-          ]
-          this.total = this.list.length
-          this.listLoading = false
+          getHistoryData(this.listQuery).then(res=>{
+            this.chartData.rows = res.data
+            this.list = res.data
+            this.total = this.list.length
+            this.listLoading = false
+          })
+          // this.chartData.rows = this.list = [
+          //   {ts: '9月20日', pm25: 153, pm10: 43, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
+          //   {ts: '9月21日', pm25: 150, pm10: 30, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
+          //   {ts: '9月22日', pm25: 143, pm10: 23, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
+          //   {ts: '9月23日', pm25: 173, pm10: 23, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
+          //   {ts: '9月24日', pm25: 272, pm10: 52, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 },
+          //   {ts: '9月25日', pm25: 253, pm10: 53, tsp: 0.00, noise: 3.40, windPower: 0.40, windDirection: 7.40, temperature: 22.50, humidity: 80.50, windSpeed: 2.50, pressure: 122.50 }
+          // ]
+
         }
       },
       // 打开选择设备弹窗
@@ -205,6 +218,7 @@
       // 更换设备
       changeDevice(currentDevice){
         this.currentDevice = currentDevice
+        this.listQuery.deviceNo = this.currentDevice.deviceNo
         this.fetchData()
       },
       exportData(){