diff --git a/src/api/home/alarm/report.ts b/src/api/home/alarm/report.ts
new file mode 100644
index 0000000..285ba35
--- /dev/null
+++ b/src/api/home/alarm/report.ts
@@ -0,0 +1,12 @@
+/**
+ * 报表生成接口
+ */
+import request from '@/api/index'
+
+export function getReportList(data: any) {
+  return request({
+    url: '/statics/alarmRecords/report',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/home/alarm/report.ts b/src/api/home/alarm/report.ts
new file mode 100644
index 0000000..285ba35
--- /dev/null
+++ b/src/api/home/alarm/report.ts
@@ -0,0 +1,12 @@
+/**
+ * 报表生成接口
+ */
+import request from '@/api/index'
+
+export function getReportList(data: any) {
+  return request({
+    url: '/statics/alarmRecords/report',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/report/components/detail.vue b/src/views/home/alarm/report/components/detail.vue
index 7d892bb..180a9e9 100644
--- a/src/views/home/alarm/report/components/detail.vue
+++ b/src/views/home/alarm/report/components/detail.vue
@@ -12,86 +12,52 @@
     {
       text: '日期',
       value: 'date',
-      width: 120
+      width: 130,
     },
     {
       text: '工况类报警',
-      value: 'workingCondition',
-      width: 110,
+      value: 'alarmSum',
+      width: 130,
     },
     {
       text: '非工况类报警',
-      value: 'noWorkingCondition',
-      width: 110,
+      value: 'noAlarmSum',
+      width: 150,
     },
     {
       text: '设备故障报警',
-      value: 'deviceFault',
-      width: 110,
+      value: 'faultSum',
+      width: 150,
     },
     {
       text: '未确认',
-      value: 'unconfirmed',
-      width: 110,
+      value: 'noConfirmAlarmSum',
+      width: 130,
     },
     {
       text: '总计(工况类报警+非工况类报警)',
-      value: 'count',
+      value: 'alarmCount',
     },
     {
       text: '设备总数',
-      value: 'deviceAll',
-      width: 110,
+      value: 'deviceSum',
+      width: 130,
     },
   ])
-  const tableHeight = ref(undefined)
+const tableHeight = ref(undefined)
 const loading = ref(false)
 const initDialog = (row: any) => {
   title.value = row.deptName
   dialogFormVisible.value = true
-
+  // console.log(row, '123')
 
   // 获取接口
   loading.value = true
   setTimeout(() => {
-    tableData.value = [
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-    ]
+    tableData.value = row.day.map((item: any) => ({
+      ...item,
+      alarmCount: Number(item.alarmSum) + Number(item.noAlarmSum),
+    }))
     if (tableData.value.length > 7) {
       tableHeight.value = 300
     }
@@ -99,7 +65,7 @@
       tableHeight.value = undefined
     }
     loading.value = false
-  }, 2000);
+  }, 1000)
 }
 
 defineExpose({
@@ -112,12 +78,14 @@
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" :title="title" append-to-body width="50%">
-
-    <div class="container" v-loading="loading">
-      <el-table class="table" :data="tableData" border show-summary stripe style="width: 100%" :height="tableHeight">
-        <el-table-column v-for="item in tableColumn" :key="item.text" align="center" :prop="item.value"
-          :label="item.text" :width="item.width"></el-table-column>
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" :title="title" append-to-body width="60%">
+    <div />
+    <div v-loading="loading" class="container">
+      <el-table class="table" :data="tableData" border show-summary stripe style="width: 100%;" :height="tableHeight">
+        <el-table-column
+          v-for="item in tableColumn" :key="item.text" align="center" :prop="item.value"
+          :label="item.text" :width="item.width" :sortable="item.text !== '日期'"
+        />
       </el-table>
     </div>
     <template #footer>

diff --git a/src/api/home/alarm/report.ts b/src/api/home/alarm/report.ts
new file mode 100644
index 0000000..285ba35
--- /dev/null
+++ b/src/api/home/alarm/report.ts
@@ -0,0 +1,12 @@
+/**
+ * 报表生成接口
+ */
+import request from '@/api/index'
+
+export function getReportList(data: any) {
+  return request({
+    url: '/statics/alarmRecords/report',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/report/components/detail.vue b/src/views/home/alarm/report/components/detail.vue
index 7d892bb..180a9e9 100644
--- a/src/views/home/alarm/report/components/detail.vue
+++ b/src/views/home/alarm/report/components/detail.vue
@@ -12,86 +12,52 @@
     {
       text: '日期',
       value: 'date',
-      width: 120
+      width: 130,
     },
     {
       text: '工况类报警',
-      value: 'workingCondition',
-      width: 110,
+      value: 'alarmSum',
+      width: 130,
     },
     {
       text: '非工况类报警',
-      value: 'noWorkingCondition',
-      width: 110,
+      value: 'noAlarmSum',
+      width: 150,
     },
     {
       text: '设备故障报警',
-      value: 'deviceFault',
-      width: 110,
+      value: 'faultSum',
+      width: 150,
     },
     {
       text: '未确认',
-      value: 'unconfirmed',
-      width: 110,
+      value: 'noConfirmAlarmSum',
+      width: 130,
     },
     {
       text: '总计(工况类报警+非工况类报警)',
-      value: 'count',
+      value: 'alarmCount',
     },
     {
       text: '设备总数',
-      value: 'deviceAll',
-      width: 110,
+      value: 'deviceSum',
+      width: 130,
     },
   ])
-  const tableHeight = ref(undefined)
+const tableHeight = ref(undefined)
 const loading = ref(false)
 const initDialog = (row: any) => {
   title.value = row.deptName
   dialogFormVisible.value = true
-
+  // console.log(row, '123')
 
   // 获取接口
   loading.value = true
   setTimeout(() => {
-    tableData.value = [
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-      {
-        date: '2025-03-06',
-        workingCondition: '2',
-        noWorkingCondition: '2',
-        deviceFault: '2',
-        unconfirmed: '2',
-        deviceAll: '2',
-        count: '5'
-      },
-    ]
+    tableData.value = row.day.map((item: any) => ({
+      ...item,
+      alarmCount: Number(item.alarmSum) + Number(item.noAlarmSum),
+    }))
     if (tableData.value.length > 7) {
       tableHeight.value = 300
     }
@@ -99,7 +65,7 @@
       tableHeight.value = undefined
     }
     loading.value = false
-  }, 2000);
+  }, 1000)
 }
 
 defineExpose({
@@ -112,12 +78,14 @@
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" :title="title" append-to-body width="50%">
-
-    <div class="container" v-loading="loading">
-      <el-table class="table" :data="tableData" border show-summary stripe style="width: 100%" :height="tableHeight">
-        <el-table-column v-for="item in tableColumn" :key="item.text" align="center" :prop="item.value"
-          :label="item.text" :width="item.width"></el-table-column>
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" :title="title" append-to-body width="60%">
+    <div />
+    <div v-loading="loading" class="container">
+      <el-table class="table" :data="tableData" border show-summary stripe style="width: 100%;" :height="tableHeight">
+        <el-table-column
+          v-for="item in tableColumn" :key="item.text" align="center" :prop="item.value"
+          :label="item.text" :width="item.width" :sortable="item.text !== '日期'"
+        />
       </el-table>
     </div>
     <template #footer>
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index bbc936d..ace829b 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -4,13 +4,17 @@
   Date: 2025-03-04
  -->
 <script lang="ts" setup name="AlarmReport">
-import { shortcuts } from '@/utils/common'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import detail from './detail.vue'
+import { shortcuts } from '@/utils/common'
+import { exportFile } from '@/utils/exportUtils'
+import { exportExcel } from '@/utils/exportXlsx'
+import { getReportList } from '@/api/home/alarm/report'
 const listQuery = ref({
   begTime: '',
-  endTime: ''
+  endTime: '',
 })
-
+const timeCount = ref('')
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
@@ -18,160 +22,154 @@
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.begTime = `${newVal[0]}`
-      listQuery.value.endTime = `${newVal[1]}`
+      listQuery.value.begTime = `${dayjs(newVal[0]).format('YYYY-MM-DD')} 00:00:00`
+      listQuery.value.endTime = `${dayjs(newVal[1]).format('YYYY-MM-DD')} 23:59:59`
     }
   }
 })
 
-const tableData = ref<any[]>([
-  {
-    deptName: '第一分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '第二分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '第三分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '第四分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '第五分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '昌平分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '怀柔分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '密云分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '平谷分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '高压分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '房山分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-  {
-    deptName: '延庆分公司',
-    workingCondition: '8',
-    noWorkingCondition: '5',
-    deviceFault: '10',
-    unconfirmed: '2',
-    count: '13',
-    deviceAll: '20'
-  },
-])
+const tableData = ref<any[]>([])
+// 查询数据
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  getReportList(listQuery.value).then((res) => {
+    // console.log(res.data, '111')
+    const deptList = [
+      '高压管网',
+      '第一分公司',
+      '第二分公司',
+      '第三分公司',
+      '第四分公司',
+      '第五分公司',
+      '怀柔有限公司',
+      '密云有限公司',
+      '平谷有限公司',
+      '延庆有限公司',
+      '昌平有限公司',
+      '房山有限公司',
+    ]
+    tableData.value = res.data.map((item: any) => ({
+      ...item,
+      alarmCount: Number(item.alarmSum) + Number(item.noAlarmSum),
+    }))
+    // 过滤
+    tableData.value = tableData.value.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+    // 排序
+    const arr = [] as any[]
+    deptList.forEach((item: string) => {
+      const data = tableData.value.filter((citem: any) => citem.dept.includes(item))
+      if (data.length) {
+        arr.push(data[0])
+      }
+    })
+    tableData.value = arr
 
+    if (tableData.value.length) {
+      const data = tableData.value[0]
+      if (data.day.length) {
+        if (data.day.length === 1) {
+          timeCount.value = data.day[0].date
+        }
+        else {
+          timeCount.value = `${data.day[0].date}~${data.day[data.day.length - 1].date}`
+        }
+      }
+      else {
+        timeCount.value = ''
+      }
+    }
+    else {
+      timeCount.value = ''
+    }
+    loading.value = false
+  })
+}
+fetchData()
 // 点击分公司名称
 const detailRef = ref()
 const viewDeptDetail = (row: any) => {
-  console.log(row, '1111')
+  if (!row.day.length) {
+    ElMessage.warning('无详情数据')
+    return
+  }
   detailRef.value.initDialog(row)
 }
-</script>
 
+// 导出
+const exportList = () => {
+  if (!tableData.value.length) {
+    ElMessage.warning('暂无导出数据')
+    return
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  const data = JSON.parse(JSON.stringify(tableData.value))
+  // 添加合计行
+  data.push({
+    dept: '合计',
+    alarmSum: tableData.value.map((item: any) => Number(item.alarmSum || '0')).reduce((pre, next) => pre + next),
+    noAlarmSum: tableData.value.map((item: any) => Number(item.noAlarmSum || '0')).reduce((pre, next) => pre + next),
+    faultSum: tableData.value.map((item: any) => Number(item.faultSum || '0')).reduce((pre, next) => pre + next),
+    noConfirmAlarmSum: tableData.value.map((item: any) => Number(item.noConfirmAlarmSum || '0')).reduce((pre, next) => pre + next),
+    alarmCount: tableData.value.map((item: any) => Number(item.alarmCount || '0')).reduce((pre, next) => pre + next),
+    deviceSum: tableData.value.map((item: any) => Number(item.deviceSum || '0')).reduce((pre, next) => pre + next),
+  })
+  exportExcel({
+    json: data.map((item: any, index: number) => ({ '1dept': item.dept, '2alarmSum': item.alarmSum, '3noAlarmSum': item.noAlarmSum, '4faultSum': item.faultSum, '5noConfirmAlarmSum': item.noConfirmAlarmSum, '6alarmCount': item.alarmCount, '7deviceSum': item.deviceSum })),
+    name: '报表数据',
+    titleArr: ['子公司', '工况类报警', '非工况类报警', '设备故障报警', '未确认', '总计(工况类报警+非工况类报警)', '设备总数'],
+    sheetName: 'sheet1',
+  })
+  loading.close()
+  // exportCurrentAlarm(listQuery.value).then((res) => {
+  //   exportFile(res.data, '报表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+}
+</script>
 
 <template>
   <div class="container">
     <detail ref="detailRef" />
     <div class="header">
-      <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
-        style="width: 380px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
-        start-placeholder="开始时间" end-placeholder="结束时间" clearable />
-      <el-button type="primary" style="margin-left: 15px;">生成报表</el-button>
-      <el-button type="primary">导出</el-button>
+      <el-date-picker
+        v-model="datetimerange" type="daterange" format="YYYY-MM-DD" :shortcuts="shortcuts"
+        style="width: 380px;" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间"
+        end-placeholder="结束时间" clearable
+      />
+      <!-- <el-date-picker v-model="listQuery.time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" /> -->
+      <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
+        生成报表
+      </el-button>
+      <el-button type="primary" @click="exportList">
+        导出
+      </el-button>
     </div>
     <div class="body">
-      <el-table class="table" :data="tableData" border show-summary stripe style="width: 100%">
+      <el-table v-loading="loading" class="table" :data="tableData" border show-summary stripe style="width: 100%;">
         <el-table-column align="center" prop="" label="">
           <el-table-column align="center" label="子公司">
             <template #default="scope">
-              <el-link type="primary" @click="viewDeptDetail(scope.row)">{{ scope.row.deptName }}</el-link>
+              <el-link type="primary" @click="viewDeptDetail(scope.row)">
+                {{ scope.row.dept }}
+              </el-link>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="workingCondition" label="工况类报警" />
-          <el-table-column align="center" prop="noWorkingCondition" label="非工况类报警" />
-          <el-table-column align="center" prop="deviceFault" label="设备故障报警" />
-          <el-table-column align="center" prop="unconfirmed" label="未确认" />
+          <el-table-column sortable align="center" prop="alarmSum" label="工况类报警" />
+          <el-table-column sortable align="center" prop="noAlarmSum" label="非工况类报警" />
+          <el-table-column sortable align="center" prop="faultSum" label="设备故障报警" />
+          <el-table-column sortable align="center" prop="noConfirmAlarmSum" label="未确认" />
         </el-table-column>
-        <el-table-column align="center" prop="" label="统计时间" width="400">
-          <el-table-column align="center" prop="count" label="总计(工况类报警+非工况类报警)" />
+        <el-table-column align="center" prop="" label="统计时间" width="300">
+          <el-table-column sortable align="center" prop="alarmCount" width="300" label="总计(工况类报警+非工况类报警)" />
         </el-table-column>
-        <el-table-column align="center" prop="" label="2025年2月12日" width="200">
-          <el-table-column align="center" prop="deviceAll" label="设备总数" />
+        <el-table-column align="center" prop="" :label="timeCount" width="200">
+          <el-table-column sortable align="center" prop="deviceSum" width="200" label="设备总数" />
         </el-table-column>
       </el-table>
     </div>