diff --git a/package.json b/package.json
index 276aad6..1ffeb40 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
-    "esri-leaflet": "^3.0.1",
-    "esri-leaflet-renderers": "^2.1.2",
+    "esri-leaflet": "3.0.1",
+    "esri-leaflet-renderers": "2.1.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",

diff --git a/package.json b/package.json
index 276aad6..1ffeb40 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
-    "esri-leaflet": "^3.0.1",
-    "esri-leaflet-renderers": "^2.1.2",
+    "esri-leaflet": "3.0.1",
+    "esri-leaflet-renderers": "2.1.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 29ea548..c5e2a73 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -12,10 +12,11 @@
   })
 }
 // 全部设备实时数据查询
-export function getRealData() {
+export function getRealData(params) {
   return request({
     url: '/environment/data/real',
     method: 'get',
+    params
   })
 }
 // 单设备历史数据查询

diff --git a/package.json b/package.json
index 276aad6..1ffeb40 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
-    "esri-leaflet": "^3.0.1",
-    "esri-leaflet-renderers": "^2.1.2",
+    "esri-leaflet": "3.0.1",
+    "esri-leaflet-renderers": "2.1.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 29ea548..c5e2a73 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -12,10 +12,11 @@
   })
 }
 // 全部设备实时数据查询
-export function getRealData() {
+export function getRealData(params) {
   return request({
     url: '/environment/data/real',
     method: 'get',
+    params
   })
 }
 // 单设备历史数据查询
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index c25eb4e..7ca8a2e 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -80,8 +80,8 @@
         alarmType: '',
         alarmLevel: '',
         status: '',
-        beginTime: '',
-        endTime: '',
+        startDate: '',
+        endDate: '',
         offset: 1,
         limit: 20,
         sort: 'alarmTime',
@@ -169,8 +169,8 @@
     this.listQuery.alarmType = ''
     this.listQuery.alarmLevel = ''
     this.listQuery.status = ''
-    this.listQuery.beginTime = ''
-    this.listQuery.endTime = ''
+    this.listQuery.startDate = ''
+    this.listQuery.endDate = ''
     this.timeRange = [getLastWeek().Format('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')]
     this.fetchData(false)
   },
@@ -205,11 +205,11 @@
       }
       // 查询条件时间赋值
       if (this.timeRange && this.timeRange.length > 0) {
-        this.listQuery.beginTime = this.timeRange[0]
-        this.listQuery.endTime = this.timeRange[1]
+        this.listQuery.startDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
       } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+        this.listQuery.startDate = ''
+        this.listQuery.endDate = ''
       }
       // this.list = [
       //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},

diff --git a/package.json b/package.json
index 276aad6..1ffeb40 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
-    "esri-leaflet": "^3.0.1",
-    "esri-leaflet-renderers": "^2.1.2",
+    "esri-leaflet": "3.0.1",
+    "esri-leaflet-renderers": "2.1.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 29ea548..c5e2a73 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -12,10 +12,11 @@
   })
 }
 // 全部设备实时数据查询
-export function getRealData() {
+export function getRealData(params) {
   return request({
     url: '/environment/data/real',
     method: 'get',
+    params
   })
 }
 // 单设备历史数据查询
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index c25eb4e..7ca8a2e 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -80,8 +80,8 @@
         alarmType: '',
         alarmLevel: '',
         status: '',
-        beginTime: '',
-        endTime: '',
+        startDate: '',
+        endDate: '',
         offset: 1,
         limit: 20,
         sort: 'alarmTime',
@@ -169,8 +169,8 @@
     this.listQuery.alarmType = ''
     this.listQuery.alarmLevel = ''
     this.listQuery.status = ''
-    this.listQuery.beginTime = ''
-    this.listQuery.endTime = ''
+    this.listQuery.startDate = ''
+    this.listQuery.endDate = ''
     this.timeRange = [getLastWeek().Format('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')]
     this.fetchData(false)
   },
@@ -205,11 +205,11 @@
       }
       // 查询条件时间赋值
       if (this.timeRange && this.timeRange.length > 0) {
-        this.listQuery.beginTime = this.timeRange[0]
-        this.listQuery.endTime = this.timeRange[1]
+        this.listQuery.startDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
       } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+        this.listQuery.startDate = ''
+        this.listQuery.endDate = ''
       }
       // this.list = [
       //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 27a1039..6099af0 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -66,8 +66,8 @@
         keywords: '',
         alarmType: '',
         alarmLevel: '',
-        beginTime: '',
-        endTime: '',
+        startDate: '',
+        endDate: '',
         status: '1',
         offset: 1,
         limit: 20,
@@ -224,11 +224,11 @@
         this.listQuery.offset = 1
       }
       if (this.timeRange && this.timeRange.length > 0) {
-        this.listQuery.beginTime = this.timeRange[0]
-        this.listQuery.endTime = this.timeRange[1]
+        this.listQuery.startDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
       } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+        this.listQuery.startDate = ''
+        this.listQuery.endDate = ''
       }
       // this.list = [
       //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}

diff --git a/package.json b/package.json
index 276aad6..1ffeb40 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
-    "esri-leaflet": "^3.0.1",
-    "esri-leaflet-renderers": "^2.1.2",
+    "esri-leaflet": "3.0.1",
+    "esri-leaflet-renderers": "2.1.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 29ea548..c5e2a73 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -12,10 +12,11 @@
   })
 }
 // 全部设备实时数据查询
-export function getRealData() {
+export function getRealData(params) {
   return request({
     url: '/environment/data/real',
     method: 'get',
+    params
   })
 }
 // 单设备历史数据查询
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index c25eb4e..7ca8a2e 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -80,8 +80,8 @@
         alarmType: '',
         alarmLevel: '',
         status: '',
-        beginTime: '',
-        endTime: '',
+        startDate: '',
+        endDate: '',
         offset: 1,
         limit: 20,
         sort: 'alarmTime',
@@ -169,8 +169,8 @@
     this.listQuery.alarmType = ''
     this.listQuery.alarmLevel = ''
     this.listQuery.status = ''
-    this.listQuery.beginTime = ''
-    this.listQuery.endTime = ''
+    this.listQuery.startDate = ''
+    this.listQuery.endDate = ''
     this.timeRange = [getLastWeek().Format('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')]
     this.fetchData(false)
   },
@@ -205,11 +205,11 @@
       }
       // 查询条件时间赋值
       if (this.timeRange && this.timeRange.length > 0) {
-        this.listQuery.beginTime = this.timeRange[0]
-        this.listQuery.endTime = this.timeRange[1]
+        this.listQuery.startDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
       } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+        this.listQuery.startDate = ''
+        this.listQuery.endDate = ''
       }
       // this.list = [
       //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 27a1039..6099af0 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -66,8 +66,8 @@
         keywords: '',
         alarmType: '',
         alarmLevel: '',
-        beginTime: '',
-        endTime: '',
+        startDate: '',
+        endDate: '',
         status: '1',
         offset: 1,
         limit: 20,
@@ -224,11 +224,11 @@
         this.listQuery.offset = 1
       }
       if (this.timeRange && this.timeRange.length > 0) {
-        this.listQuery.beginTime = this.timeRange[0]
-        this.listQuery.endTime = this.timeRange[1]
+        this.listQuery.startDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
       } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+        this.listQuery.startDate = ''
+        this.listQuery.endDate = ''
       }
       // this.list = [
       //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index 13a4d73..451c7e9 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.vue
@@ -9,7 +9,7 @@
         <el-input v-model.trim="listQuery.position" size="small" placeholder="详细地址" clearable/>
       </search-item>
     </search-area>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
         <el-upload
           v-if="hasPerm('/environment/alarmRule/import')"
@@ -68,11 +68,11 @@
         //   align: 'center',
         //   width: 80
         // },
-        {
-          text: '区/县',
-          value: 'area',
-          align: 'center'
-        },
+        // {
+        //   text: '区/县',
+        //   value: 'area',
+        //   align: 'center'
+        // },
         {
           text: '详细地址',
           value: 'position',
@@ -128,14 +128,6 @@
       this.listLoading = true
       getDeviceListPage(this.listQuery).then(response => {
         this.list = response.data.rows
-        // this.list = [
-        //     {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
-        // ]
         this.total = response.data.total
         this.listLoading = false
       })

diff --git a/package.json b/package.json
index 276aad6..1ffeb40 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
-    "esri-leaflet": "^3.0.1",
-    "esri-leaflet-renderers": "^2.1.2",
+    "esri-leaflet": "3.0.1",
+    "esri-leaflet-renderers": "2.1.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
diff --git a/src/api/environment/data.js b/src/api/environment/data.js
index 29ea548..c5e2a73 100644
--- a/src/api/environment/data.js
+++ b/src/api/environment/data.js
@@ -12,10 +12,11 @@
   })
 }
 // 全部设备实时数据查询
-export function getRealData() {
+export function getRealData(params) {
   return request({
     url: '/environment/data/real',
     method: 'get',
+    params
   })
 }
 // 单设备历史数据查询
diff --git a/src/views/alarm/listAlarmHistory.vue b/src/views/alarm/listAlarmHistory.vue
index c25eb4e..7ca8a2e 100644
--- a/src/views/alarm/listAlarmHistory.vue
+++ b/src/views/alarm/listAlarmHistory.vue
@@ -80,8 +80,8 @@
         alarmType: '',
         alarmLevel: '',
         status: '',
-        beginTime: '',
-        endTime: '',
+        startDate: '',
+        endDate: '',
         offset: 1,
         limit: 20,
         sort: 'alarmTime',
@@ -169,8 +169,8 @@
     this.listQuery.alarmType = ''
     this.listQuery.alarmLevel = ''
     this.listQuery.status = ''
-    this.listQuery.beginTime = ''
-    this.listQuery.endTime = ''
+    this.listQuery.startDate = ''
+    this.listQuery.endDate = ''
     this.timeRange = [getLastWeek().Format('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')]
     this.fetchData(false)
   },
@@ -205,11 +205,11 @@
       }
       // 查询条件时间赋值
       if (this.timeRange && this.timeRange.length > 0) {
-        this.listQuery.beginTime = this.timeRange[0]
-        this.listQuery.endTime = this.timeRange[1]
+        this.listQuery.startDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
       } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+        this.listQuery.startDate = ''
+        this.listQuery.endDate = ''
       }
       // this.list = [
       //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, status: '1', alarmTime:'2021-07-04 08:33:00'},
diff --git a/src/views/alarm/listAlarmNow.vue b/src/views/alarm/listAlarmNow.vue
index 27a1039..6099af0 100644
--- a/src/views/alarm/listAlarmNow.vue
+++ b/src/views/alarm/listAlarmNow.vue
@@ -66,8 +66,8 @@
         keywords: '',
         alarmType: '',
         alarmLevel: '',
-        beginTime: '',
-        endTime: '',
+        startDate: '',
+        endDate: '',
         status: '1',
         offset: 1,
         limit: 20,
@@ -224,11 +224,11 @@
         this.listQuery.offset = 1
       }
       if (this.timeRange && this.timeRange.length > 0) {
-        this.listQuery.beginTime = this.timeRange[0]
-        this.listQuery.endTime = this.timeRange[1]
+        this.listQuery.startDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
       } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
+        this.listQuery.startDate = ''
+        this.listQuery.endDate = ''
       }
       // this.list = [
       //   {deviceNo:'2021030803100001', deviceName:'王泥岭',position:'王泥岭XXX', alarmLevelName:'一级报警', alarmTypeName:'污染物浓度超限',alarmContent:'PM2.5超标', alarmValue:124, alarmTime:'2021-07-04 08:33:00'}
diff --git a/src/views/alarmRule/simpleDeviceList.vue b/src/views/alarmRule/simpleDeviceList.vue
index 13a4d73..451c7e9 100644
--- a/src/views/alarmRule/simpleDeviceList.vue
+++ b/src/views/alarmRule/simpleDeviceList.vue
@@ -9,7 +9,7 @@
         <el-input v-model.trim="listQuery.position" size="small" placeholder="详细地址" clearable/>
       </search-item>
     </search-area>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
         <el-upload
           v-if="hasPerm('/environment/alarmRule/import')"
@@ -68,11 +68,11 @@
         //   align: 'center',
         //   width: 80
         // },
-        {
-          text: '区/县',
-          value: 'area',
-          align: 'center'
-        },
+        // {
+        //   text: '区/县',
+        //   value: 'area',
+        //   align: 'center'
+        // },
         {
           text: '详细地址',
           value: 'position',
@@ -128,14 +128,6 @@
       this.listLoading = true
       getDeviceListPage(this.listQuery).then(response => {
         this.list = response.data.rows
-        // this.list = [
-        //     {id:"1", deviceNo:"2021030803100001", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"2", deviceNo:"2021030803100002", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"3", deviceNo:"2021030803100003", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"4", deviceNo:"2021030803100004", deviceName:"王泥岭", area:'崇仁县', online:'1', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"5", deviceNo:"2021030803100005", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"},
-        //     {id:"6", deviceNo:"2021030803100006", deviceName:"王泥岭", area:'崇仁县', online:'2', deptName:"城管局", areaCode:'361024', lat:27.77740600, lng:116.05673800, notes:"无", position:"王泥岭", ts:"2021-01-12", deptid:'24', installDate:"2021-07-01"}
-        // ]
         this.total = response.data.total
         this.listLoading = false
       })
diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue
index c8f2842..9762796 100644
--- a/src/views/data/allDeviceData.vue
+++ b/src/views/data/allDeviceData.vue
@@ -122,16 +122,9 @@
     // 获取数据
     fetchData() {
       this.listLoading = true
-      getRealData().then(res =>{
+      getRealData(this.listQuery).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
       })
     },