diff --git a/src/api/environment/data.js b/src/api/environment/data.js
new file mode 100644
index 0000000..1c2df04
--- /dev/null
+++ b/src/api/environment/data.js
@@ -0,0 +1,42 @@
+/**
+ * 数据管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 单设备数据查询
+export function getRealDataByDevice() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 全部设备实时数据查询
+export function getRealData() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 单设备历史数据查询
+export function getHistoryData(params) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params
+  })
+}
+
+// 历史记录批量导出
+export function batchExportData(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/environment/data.js b/src/api/environment/data.js
new file mode 100644
index 0000000..1c2df04
--- /dev/null
+++ b/src/api/environment/data.js
@@ -0,0 +1,42 @@
+/**
+ * 数据管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 单设备数据查询
+export function getRealDataByDevice() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 全部设备实时数据查询
+export function getRealData() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 单设备历史数据查询
+export function getHistoryData(params) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params
+  })
+}
+
+// 历史记录批量导出
+export function batchExportData(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index 04bc9dd..ea00ad5 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -1,18 +1,18 @@
 /**
- * 公厕管理接口
+ * 设备管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
-// 公厕查询
-export function getToiletListPage(params) {
+// 设备查询
+export function getDeviceListPage(params) {
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
     params
   })
 }
-// 公厕查询
-export function getToiletList(pid) {
+// 设备查询
+export function getDeviceList(pid) {
   return request({
     url: '/sanitation/toilet/list',
     method: 'get',
@@ -22,24 +22,24 @@
   })
 }
 
-// 添加公厕
-export function addToilet(params) {
+// 添加设备
+export function addDevice(params) {
   return request({
     url: '/sanitation/toilet/add',
     method: 'post',
     params
   })
 }
-// 修改公厕机构
-export function updateToilet(params) {
+// 修改设备机构
+export function updateDevice(params) {
   return request({
     url: '/sanitation/toilet/update',
     method: 'post',
     params
   })
 }
-// 删除公厕机构
-export function delToilet(ids) {
+// 删除设备机构
+export function delDevice(ids) {
   return request({
     url: '/sanitation/toilet/delete',
     method: 'post',
@@ -52,8 +52,8 @@
   })
 }
 
-// 公厕查询
-export function getToiletCleanListPage(params) {
+// 设备查询
+export function getDeviceCleanListPage(params) {
   return request({
     url: '/sanitation/toilet/jobRecord',
     method: 'get',
@@ -62,7 +62,7 @@
 }
 
 // 批量导入
-export function batchImportToilet(fileobj) {
+export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
@@ -73,7 +73,7 @@
   })
 }
 // 批量导出
-export function batchExportToilet(params, config) {
+export function batchExportDevice(params, config) {
   return request({
     url: '/sanitation/toilet/export',
     method: 'get',
@@ -83,24 +83,3 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}

diff --git a/src/api/environment/data.js b/src/api/environment/data.js
new file mode 100644
index 0000000..1c2df04
--- /dev/null
+++ b/src/api/environment/data.js
@@ -0,0 +1,42 @@
+/**
+ * 数据管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 单设备数据查询
+export function getRealDataByDevice() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 全部设备实时数据查询
+export function getRealData() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 单设备历史数据查询
+export function getHistoryData(params) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params
+  })
+}
+
+// 历史记录批量导出
+export function batchExportData(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index 04bc9dd..ea00ad5 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -1,18 +1,18 @@
 /**
- * 公厕管理接口
+ * 设备管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
-// 公厕查询
-export function getToiletListPage(params) {
+// 设备查询
+export function getDeviceListPage(params) {
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
     params
   })
 }
-// 公厕查询
-export function getToiletList(pid) {
+// 设备查询
+export function getDeviceList(pid) {
   return request({
     url: '/sanitation/toilet/list',
     method: 'get',
@@ -22,24 +22,24 @@
   })
 }
 
-// 添加公厕
-export function addToilet(params) {
+// 添加设备
+export function addDevice(params) {
   return request({
     url: '/sanitation/toilet/add',
     method: 'post',
     params
   })
 }
-// 修改公厕机构
-export function updateToilet(params) {
+// 修改设备机构
+export function updateDevice(params) {
   return request({
     url: '/sanitation/toilet/update',
     method: 'post',
     params
   })
 }
-// 删除公厕机构
-export function delToilet(ids) {
+// 删除设备机构
+export function delDevice(ids) {
   return request({
     url: '/sanitation/toilet/delete',
     method: 'post',
@@ -52,8 +52,8 @@
   })
 }
 
-// 公厕查询
-export function getToiletCleanListPage(params) {
+// 设备查询
+export function getDeviceCleanListPage(params) {
   return request({
     url: '/sanitation/toilet/jobRecord',
     method: 'get',
@@ -62,7 +62,7 @@
 }
 
 // 批量导入
-export function batchImportToilet(fileobj) {
+export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
@@ -73,7 +73,7 @@
   })
 }
 // 批量导出
-export function batchExportToilet(params, config) {
+export function batchExportDevice(params, config) {
   return request({
     url: '/sanitation/toilet/export',
     method: 'get',
@@ -83,24 +83,3 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue
index 24aeed5..f15fb7b 100644
--- a/src/views/data/allDeviceData.vue
+++ b/src/views/data/allDeviceData.vue
@@ -28,6 +28,8 @@
 
 <script>
 import { getToday } from '@/utils/dateutils'
+import { getRealData } from '@/api/environment/data'
+
 export default {
   name: 'EnvironmentData',
   components: { getToday },
@@ -113,46 +115,23 @@
       } // 表格属性
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-        this.fetchData()
-      } else {
-        this.listQuery.startTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  activated() {
-    if (this.$route.query) {
-      this.listQuery.keywords = this.$route.query.name
-    }
-  },
   created() {
-    if (this.$route.query) {
-      this.listQuery.keywords = this.$route.query.name
-    }
-    this.listQuery.startTime = getToday('yyyy-MM-dd 00:00:00')
-    this.listQuery.endTime = getToday('yyyy-MM-dd hh:mm:ss')
-    this.timeRange = [this.listQuery.startTime, this.listQuery.endTime]
     this.fetchData()
   },
   methods: {
+    // 获取数据
     fetchData() {
       this.listLoading = true
-      const that = this
-      setTimeout(function() {
-        that.list = [
+      // 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' }
         ]
-        that.total = 4
-        that.listLoading = false
-      }, 500)
+        this.total = 4
+        this.listLoading = false
+      // })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
@@ -163,10 +142,6 @@
         this.listQuery.offset = val.page
       }
       this.fetchData()
-    },
-    // 重置后的操作， 若不需要显示重置按钮则不需要写
-    clearInput() {
-      this.$message.success('clearInput')
     }
   }
 }

diff --git a/src/api/environment/data.js b/src/api/environment/data.js
new file mode 100644
index 0000000..1c2df04
--- /dev/null
+++ b/src/api/environment/data.js
@@ -0,0 +1,42 @@
+/**
+ * 数据管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 单设备数据查询
+export function getRealDataByDevice() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 全部设备实时数据查询
+export function getRealData() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 单设备历史数据查询
+export function getHistoryData(params) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params
+  })
+}
+
+// 历史记录批量导出
+export function batchExportData(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index 04bc9dd..ea00ad5 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -1,18 +1,18 @@
 /**
- * 公厕管理接口
+ * 设备管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
-// 公厕查询
-export function getToiletListPage(params) {
+// 设备查询
+export function getDeviceListPage(params) {
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
     params
   })
 }
-// 公厕查询
-export function getToiletList(pid) {
+// 设备查询
+export function getDeviceList(pid) {
   return request({
     url: '/sanitation/toilet/list',
     method: 'get',
@@ -22,24 +22,24 @@
   })
 }
 
-// 添加公厕
-export function addToilet(params) {
+// 添加设备
+export function addDevice(params) {
   return request({
     url: '/sanitation/toilet/add',
     method: 'post',
     params
   })
 }
-// 修改公厕机构
-export function updateToilet(params) {
+// 修改设备机构
+export function updateDevice(params) {
   return request({
     url: '/sanitation/toilet/update',
     method: 'post',
     params
   })
 }
-// 删除公厕机构
-export function delToilet(ids) {
+// 删除设备机构
+export function delDevice(ids) {
   return request({
     url: '/sanitation/toilet/delete',
     method: 'post',
@@ -52,8 +52,8 @@
   })
 }
 
-// 公厕查询
-export function getToiletCleanListPage(params) {
+// 设备查询
+export function getDeviceCleanListPage(params) {
   return request({
     url: '/sanitation/toilet/jobRecord',
     method: 'get',
@@ -62,7 +62,7 @@
 }
 
 // 批量导入
-export function batchImportToilet(fileobj) {
+export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
@@ -73,7 +73,7 @@
   })
 }
 // 批量导出
-export function batchExportToilet(params, config) {
+export function batchExportDevice(params, config) {
   return request({
     url: '/sanitation/toilet/export',
     method: 'get',
@@ -83,24 +83,3 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue
index 24aeed5..f15fb7b 100644
--- a/src/views/data/allDeviceData.vue
+++ b/src/views/data/allDeviceData.vue
@@ -28,6 +28,8 @@
 
 <script>
 import { getToday } from '@/utils/dateutils'
+import { getRealData } from '@/api/environment/data'
+
 export default {
   name: 'EnvironmentData',
   components: { getToday },
@@ -113,46 +115,23 @@
       } // 表格属性
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-        this.fetchData()
-      } else {
-        this.listQuery.startTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  activated() {
-    if (this.$route.query) {
-      this.listQuery.keywords = this.$route.query.name
-    }
-  },
   created() {
-    if (this.$route.query) {
-      this.listQuery.keywords = this.$route.query.name
-    }
-    this.listQuery.startTime = getToday('yyyy-MM-dd 00:00:00')
-    this.listQuery.endTime = getToday('yyyy-MM-dd hh:mm:ss')
-    this.timeRange = [this.listQuery.startTime, this.listQuery.endTime]
     this.fetchData()
   },
   methods: {
+    // 获取数据
     fetchData() {
       this.listLoading = true
-      const that = this
-      setTimeout(function() {
-        that.list = [
+      // 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' }
         ]
-        that.total = 4
-        that.listLoading = false
-      }, 500)
+        this.total = 4
+        this.listLoading = false
+      // })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
@@ -163,10 +142,6 @@
         this.listQuery.offset = val.page
       }
       this.fetchData()
-    },
-    // 重置后的操作， 若不需要显示重置按钮则不需要写
-    clearInput() {
-      this.$message.success('clearInput')
     }
   }
 }
diff --git a/src/views/data/chooseDevice.vue b/src/views/data/chooseDevice.vue
index e9e53d5..9d08241 100644
--- a/src/views/data/chooseDevice.vue
+++ b/src/views/data/chooseDevice.vue
@@ -1,30 +1,48 @@
 <!--选择设备-->
 <template>
-  <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible" :fullscreen="false" width="60%" append-to-body>
-
+  <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible" :fullscreen="false" append-to-body>
+    <el-scrollbar class="dialog-scroll">
+      <el-tree
+        v-loading="dataLoading"
+        class="filter-tree"
+        :data="deviceList"
+        :props="defaultProps"
+        node-key="deviceNo"
+        :highlight-current="true"
+        icon-class="el-icon-video-camera"
+        :current-node-key="currentDevice.deviceNo"
+        default-expand-all
+        @node-click="handleNodeClick"
+      >
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <i class="el-icon-video-camera"></i>
+        <span style="margin-left: 5px;">{{ data.deviceNo }} ( {{data.deviceName}} )</span>
+      </span>
+      </el-tree>
+    </el-scrollbar>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button :disabled="currentDevice==null" 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 { Uploadimg } from '@/api/common'
-import { getAreaList, getAreaByDept } from '@/api/system/area'
-import ChoosePointDialog from "../mapViews/choosePointDialog";
-import DeptSelect from "../../components/DeptSelect/index";
-import MapView from "../mapViews/mapView";
-import LMarker from "vue2-leaflet/src/components/LMarker";
-import { icon } from 'leaflet'
+import { getDeviceList } from '@/api/environment/device'
 
 export default {
   name: 'ChooseDevice',
-  components: {LMarker, MapView, DeptSelect, ChoosePointDialog},
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示
       currentDevice:null, // 当前选中设备,
       deviceList:[], // 设备列表
       dialogTitle: '选择设备', // 表头显示标题
-      dataLoading: false
+      dataLoading: false, // 加载框
+      defaultProps: {
+        children: 'children',
+        label: 'deviceNo'
+      } // 树形设置
     }
   },
   methods: {
@@ -33,29 +51,45 @@
      */
     initDialog: function(currentDevice) {
       this.dialogFormVisible = true
+      this.currentDevice = currentDevice
       this.fetchData()
     },
     // 查询所有设备列表
-    fetchRealData(){
+    fetchData(){
       this.dataLoading = true
       // TODO: 请求数据
-      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
+      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.dataLoading = false
+      })
+    },
+    // 点击设备
+    handleNodeClick(data){
+      this.currentDevice = data
+      console.log(data)
+    },
+    // 确定选择
+    saveData(){
+      this.$emit('click', this.currentDevice)
+      this.dialogFormVisible = false
     },
     cancel: function() {
       this.dialogFormVisible = false
-      this.$emit('watchChild')
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .dialog-scroll{
+    height:400px;
+  }
 </style>

diff --git a/src/api/environment/data.js b/src/api/environment/data.js
new file mode 100644
index 0000000..1c2df04
--- /dev/null
+++ b/src/api/environment/data.js
@@ -0,0 +1,42 @@
+/**
+ * 数据管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 单设备数据查询
+export function getRealDataByDevice() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 全部设备实时数据查询
+export function getRealData() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 单设备历史数据查询
+export function getHistoryData(params) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params
+  })
+}
+
+// 历史记录批量导出
+export function batchExportData(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/environment/device.js b/src/api/environment/device.js
index 04bc9dd..ea00ad5 100644
--- a/src/api/environment/device.js
+++ b/src/api/environment/device.js
@@ -1,18 +1,18 @@
 /**
- * 公厕管理接口
+ * 设备管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
-// 公厕查询
-export function getToiletListPage(params) {
+// 设备查询
+export function getDeviceListPage(params) {
   return request({
     url: '/sanitation/toilet/listPage',
     method: 'get',
     params
   })
 }
-// 公厕查询
-export function getToiletList(pid) {
+// 设备查询
+export function getDeviceList(pid) {
   return request({
     url: '/sanitation/toilet/list',
     method: 'get',
@@ -22,24 +22,24 @@
   })
 }
 
-// 添加公厕
-export function addToilet(params) {
+// 添加设备
+export function addDevice(params) {
   return request({
     url: '/sanitation/toilet/add',
     method: 'post',
     params
   })
 }
-// 修改公厕机构
-export function updateToilet(params) {
+// 修改设备机构
+export function updateDevice(params) {
   return request({
     url: '/sanitation/toilet/update',
     method: 'post',
     params
   })
 }
-// 删除公厕机构
-export function delToilet(ids) {
+// 删除设备机构
+export function delDevice(ids) {
   return request({
     url: '/sanitation/toilet/delete',
     method: 'post',
@@ -52,8 +52,8 @@
   })
 }
 
-// 公厕查询
-export function getToiletCleanListPage(params) {
+// 设备查询
+export function getDeviceCleanListPage(params) {
   return request({
     url: '/sanitation/toilet/jobRecord',
     method: 'get',
@@ -62,7 +62,7 @@
 }
 
 // 批量导入
-export function batchImportToilet(fileobj) {
+export function batchImportDevice(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
   return request({
@@ -73,7 +73,7 @@
   })
 }
 // 批量导出
-export function batchExportToilet(params, config) {
+export function batchExportDevice(params, config) {
   return request({
     url: '/sanitation/toilet/export',
     method: 'get',
@@ -83,24 +83,3 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue
index 24aeed5..f15fb7b 100644
--- a/src/views/data/allDeviceData.vue
+++ b/src/views/data/allDeviceData.vue
@@ -28,6 +28,8 @@
 
 <script>
 import { getToday } from '@/utils/dateutils'
+import { getRealData } from '@/api/environment/data'
+
 export default {
   name: 'EnvironmentData',
   components: { getToday },
@@ -113,46 +115,23 @@
       } // 表格属性
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-        this.fetchData()
-      } else {
-        this.listQuery.startTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  activated() {
-    if (this.$route.query) {
-      this.listQuery.keywords = this.$route.query.name
-    }
-  },
   created() {
-    if (this.$route.query) {
-      this.listQuery.keywords = this.$route.query.name
-    }
-    this.listQuery.startTime = getToday('yyyy-MM-dd 00:00:00')
-    this.listQuery.endTime = getToday('yyyy-MM-dd hh:mm:ss')
-    this.timeRange = [this.listQuery.startTime, this.listQuery.endTime]
     this.fetchData()
   },
   methods: {
+    // 获取数据
     fetchData() {
       this.listLoading = true
-      const that = this
-      setTimeout(function() {
-        that.list = [
+      // 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' }
         ]
-        that.total = 4
-        that.listLoading = false
-      }, 500)
+        this.total = 4
+        this.listLoading = false
+      // })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
@@ -163,10 +142,6 @@
         this.listQuery.offset = val.page
       }
       this.fetchData()
-    },
-    // 重置后的操作， 若不需要显示重置按钮则不需要写
-    clearInput() {
-      this.$message.success('clearInput')
     }
   }
 }
diff --git a/src/views/data/chooseDevice.vue b/src/views/data/chooseDevice.vue
index e9e53d5..9d08241 100644
--- a/src/views/data/chooseDevice.vue
+++ b/src/views/data/chooseDevice.vue
@@ -1,30 +1,48 @@
 <!--选择设备-->
 <template>
-  <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible" :fullscreen="false" width="60%" append-to-body>
-
+  <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible" :fullscreen="false" append-to-body>
+    <el-scrollbar class="dialog-scroll">
+      <el-tree
+        v-loading="dataLoading"
+        class="filter-tree"
+        :data="deviceList"
+        :props="defaultProps"
+        node-key="deviceNo"
+        :highlight-current="true"
+        icon-class="el-icon-video-camera"
+        :current-node-key="currentDevice.deviceNo"
+        default-expand-all
+        @node-click="handleNodeClick"
+      >
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <i class="el-icon-video-camera"></i>
+        <span style="margin-left: 5px;">{{ data.deviceNo }} ( {{data.deviceName}} )</span>
+      </span>
+      </el-tree>
+    </el-scrollbar>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button :disabled="currentDevice==null" 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 { Uploadimg } from '@/api/common'
-import { getAreaList, getAreaByDept } from '@/api/system/area'
-import ChoosePointDialog from "../mapViews/choosePointDialog";
-import DeptSelect from "../../components/DeptSelect/index";
-import MapView from "../mapViews/mapView";
-import LMarker from "vue2-leaflet/src/components/LMarker";
-import { icon } from 'leaflet'
+import { getDeviceList } from '@/api/environment/device'
 
 export default {
   name: 'ChooseDevice',
-  components: {LMarker, MapView, DeptSelect, ChoosePointDialog},
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示
       currentDevice:null, // 当前选中设备,
       deviceList:[], // 设备列表
       dialogTitle: '选择设备', // 表头显示标题
-      dataLoading: false
+      dataLoading: false, // 加载框
+      defaultProps: {
+        children: 'children',
+        label: 'deviceNo'
+      } // 树形设置
     }
   },
   methods: {
@@ -33,29 +51,45 @@
      */
     initDialog: function(currentDevice) {
       this.dialogFormVisible = true
+      this.currentDevice = currentDevice
       this.fetchData()
     },
     // 查询所有设备列表
-    fetchRealData(){
+    fetchData(){
       this.dataLoading = true
       // TODO: 请求数据
-      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
+      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.dataLoading = false
+      })
+    },
+    // 点击设备
+    handleNodeClick(data){
+      this.currentDevice = data
+      console.log(data)
+    },
+    // 确定选择
+    saveData(){
+      this.$emit('click', this.currentDevice)
+      this.dialogFormVisible = false
     },
     cancel: function() {
       this.dialogFormVisible = false
-      this.$emit('watchChild')
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .dialog-scroll{
+    height:400px;
+  }
 </style>
diff --git a/src/views/data/pointData.vue b/src/views/data/pointData.vue
index cd7edac..9834728 100644
--- a/src/views/data/pointData.vue
+++ b/src/views/data/pointData.vue
@@ -1,7 +1,8 @@
+<!--历史数据-->
 <template>
   <app-container>
     <div class="choose-device">
-      <el-button type="primary" size="small">选择设备</el-button>
+      <el-button type="primary" size="small" @click="chooseDevice">选择设备</el-button>
       <span class="detail"><span class="title">设备编号：</span>{{currentDevice.deviceNo}}</span>
       <span class="detail"><span class="title">安装点位：</span>{{currentDevice.deviceName}}</span>
       <span class="detail"><span class="title">地址：</span>{{currentDevice.position}}</span>
@@ -41,59 +42,37 @@
         历史数据
       </div>
       <div class="edit_btns">
-        <el-button type="primary" size="small">导出数据</el-button>
+        <el-button type="primary" size="small" @click="exportData">导出数据</el-button>
       </div>
     </div>
+    <!--图表-->
     <div style="padding:12px;">
       <ve-line :data="chartData" :settings="chartSettings"/>
     </div>
-
-    <!--<el-row style="height: 12px;background-color: #ebebeb"/>-->
-    <!--<div style="padding: 10px 10px 0px 10px">-->
-      <!--<el-tabs v-model="activeName" type="card" @tab-click="lineSearch">-->
-        <!--<el-tab-pane-->
-          <!--v-for="(item, index) in tabs"-->
-          <!--:key="item.name"-->
-          <!--:label="item.title"-->
-          <!--:name="item.name"/>-->
-      <!--</el-tabs>-->
-    <!--</div>-->
-
+    <!--列表-->
     <normal-table :data="list" :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"/>
     </normal-table>
+    <!--选择设备弹窗-->
+    <choose-device ref="chooseDevice" @click="changeDevice"/>
   </app-container>
 </template>
 
 <script>
   import {getToday} from '@/utils/dateutils'
-  import ElSlPanel from "element-ui/packages/color-picker/src/components/sv-panel";
+  import ChooseDevice from "./chooseDevice";
+  import { getDeviceList } from '@/api/environment/device'
+  import { getHistoryData, batchExportData } from '@/api/environment/data'
 
   export default {
     name: 'PointData',
-    components: {ElSlPanel, getToday},
+    components: {ChooseDevice, getToday},
     data() {
       return {
         deviceList: [], //所有设备列表
-        currentDevice: {
-          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"
-
-        },// 当前设备
+        currentDevice: {},// 当前设备
         searchTypes:[
           {name:'分钟平均值', value:'minute'},
           {name:'小时平均值', value:'hour'},
@@ -152,79 +131,98 @@
         } // 表格属性
       }
     },
-    watch: {
-      timeRange(val) {
-        if (val && val.length > 0) {
-          this.listQuery.startDate = val[0]
-          this.listQuery.endDate = val[1]
-          this.fetchData()
-        } else {
-          this.listQuery.startDate = ''
-          this.listQuery.endDate = ''
-        }
-      }
-    },
-    activated() {
-      if (this.$route.query) {
-        this.listQuery.keywords = this.$route.query.name
-      }
-    },
     created() {
-      if (this.$route.query) {
-        this.listQuery.keywords = this.$route.query.name
-      }
-      this.listQuery.startDate = getToday('yyyy-MM-dd 00:00:00')
-      this.listQuery.endDate = getToday('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [this.listQuery.startDate, this.listQuery.endDate]
-      this.fetchData()
+      this.timeRange = [getToday('yyyy-MM-dd 00:00:00'), getToday('yyyy-MM-dd hh:mm:ss')]
+      this.fetchDeviceList()
     },
     methods: {
-      fetchData() {
-        this.lineSearch()
-        // this.listLoading = true
-        const that = this
-        // setTimeout(function () {
-        //       that.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' }
-        //       ]
-        //       that.total = 4
-        //   that.listLoading = false
-        // }, 500)
+      // 查询所有设备列表,设置默认设备
+      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.fetchData()
+        })
       },
-      lineSearch() {
-        const labelMap = {}
-        const metrics = []
-        const columns = [{text: '名称', value: 'ts', align: 'center'}]
-        for(const item of this.paramsList){
-          if(this.listQuery.params.length==0){
-            labelMap[item.value] = item.name
-            metrics.push(item.value)
-            columns.push({text:item.name, value:item.value})
-          }else{
-            if(this.listQuery.params.indexOf(item.value)>-1){
+      // 查询设备历史数据
+      fetchData() {
+        if(this.currentDevice){
+          // 查询条件时间赋值
+          if (this.timeRange && this.timeRange.length > 0) {
+            this.listQuery.startDate = this.timeRange[0]
+            this.listQuery.endDate = this.timeRange[1]
+          } else {
+            this.listQuery.startDate = ''
+            this.listQuery.endDate = ''
+          }
+          // 根据选择的参数列表过滤参数
+          const labelMap = {}
+          const metrics = []
+          const columns = [{text: '名称', value: 'ts', align: 'center'}]
+          for(const item of this.paramsList){
+            if(this.listQuery.params.length==0){
               labelMap[item.value] = item.name
               metrics.push(item.value)
+              columns.push({text:item.name, value:item.value})
+            }else{
+              if(this.listQuery.params.indexOf(item.value)>-1){
+                labelMap[item.value] = item.name
+                metrics.push(item.value)
+              }
             }
           }
+          this.columns = columns
+          this.chartSettings = {
+            labelMap: labelMap,
+            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
         }
-        this.columns = columns
-        this.chartSettings = {
-          labelMap: labelMap,
-          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.listLoading = false
+      },
+      // 打开选择设备弹窗
+      chooseDevice(){
+        this.$refs.chooseDevice.initDialog(this.currentDevice)
+      },
+      // 更换设备
+      changeDevice(currentDevice){
+        this.currentDevice = currentDevice
+        this.fetchData()
+      },
+      exportData(){
+// 全屏加载动画
+        const loading = this.$loading({
+          lock: true,
+          text: '数据处理中,请稍后...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        batchExportData(this.listQuery).then(res => {
+          loading.close() // 关闭加载动画
+          const blob = new Blob([res.data])
+          const fileName = `历史数据.xlsx`
+          exportFile(blob, fileName)
+        }).catch((res) => {
+          loading.close()
+        })
       },
       // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
       changePage(val) {