diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 5441843..ba63678 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -65,6 +65,15 @@
     responseType: 'blob',
   })
 }
+// 导出列表 --数据查询
+export function exportDeviceData(params: any) {
+  return request({
+    url: '/system/busDevice/dataExport',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
 
 // 详情
 export function getDeviceDetail(id: any) {

diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 5441843..ba63678 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -65,6 +65,15 @@
     responseType: 'blob',
   })
 }
+// 导出列表 --数据查询
+export function exportDeviceData(params: any) {
+  return request({
+    url: '/system/busDevice/dataExport',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
 
 // 详情
 export function getDeviceDetail(id: any) {
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 4152ae2..1dd57cc 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -24,7 +24,7 @@
 const fetchData = () => {
   loadingTable.value = true
   getMessage().then((res) => {
-    list.value = res.data.rows.reverse()
+    list.value = res.data.rows
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false

diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 5441843..ba63678 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -65,6 +65,15 @@
     responseType: 'blob',
   })
 }
+// 导出列表 --数据查询
+export function exportDeviceData(params: any) {
+  return request({
+    url: '/system/busDevice/dataExport',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
 
 // 详情
 export function getDeviceDetail(id: any) {
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 4152ae2..1dd57cc 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -24,7 +24,7 @@
 const fetchData = () => {
   loadingTable.value = true
   getMessage().then((res) => {
-    list.value = res.data.rows.reverse()
+    list.value = res.data.rows
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index df9f331..19230de 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -150,7 +150,7 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows.reverse()
+    messageData.value = res.data.rows
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false

diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 5441843..ba63678 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -65,6 +65,15 @@
     responseType: 'blob',
   })
 }
+// 导出列表 --数据查询
+export function exportDeviceData(params: any) {
+  return request({
+    url: '/system/busDevice/dataExport',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
 
 // 详情
 export function getDeviceDetail(id: any) {
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 4152ae2..1dd57cc 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -24,7 +24,7 @@
 const fetchData = () => {
   loadingTable.value = true
   getMessage().then((res) => {
-    list.value = res.data.rows.reverse()
+    list.value = res.data.rows
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index df9f331..19230de 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -150,7 +150,7 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows.reverse()
+    messageData.value = res.data.rows
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1b1e313..70a6eee 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -4,9 +4,11 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="DeviceDetailDataSearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { getDataSearch } from '@/api/home/device/device'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 const $route = useRoute()
 const listQuery = ref({
@@ -213,6 +215,25 @@
     resizePage()
   }
 }
+const { proxy } = getCurrentInstance() as any
+
+// 导出列表
+const exportList = () => {
+  if (!list.value.length) {
+    ElMessage.warning('暂无导出数据')
+    return
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportDeviceData(listQuery.value).then((res) => {
+    exportFile(res.data, '设备数据查询列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
+}
 </script>
 
 <template>
@@ -231,7 +252,7 @@
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
         导出
       </el-button>
       <el-button type="primary" style="margin-left: 10px;" @click="changeView">