diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 99f136a..94f2e06 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -81,6 +81,16 @@ export function getPictureList(data) {
   });
 }
 
+//告警功能
+//获取告警列表
+export function getAlarmList(data) {
+  return request({
+    url: "/api/getTerminalAlarmList",
+    method: "post",
+    data,
+  });
+}
+
 //历史图片
 //获取电压-线路-杆塔等信息
 export function getSearchInfo(data) {
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 2cd41ac..f5e38cd 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -124,14 +124,14 @@
             >
             </el-table-column>
             <el-table-column
-              prop="companyName"
+              prop="termId"
               label="设备编号"
               min-width="75"
               :show-overflow-tooltip="true"
             >
             </el-table-column>
             <el-table-column
-              prop="alarmInfo"
+              prop="name"
               label="告警原因"
               min-width="155"
               :show-overflow-tooltip="true"
@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import { getSearchInfo, getRealtimePhoto } from "@/utils/api/index";
+import { getSearchInfo, getAlarmList } from "@/utils/api/index";
 import moment from "moment";
 export default {
   data() {
@@ -204,6 +204,10 @@ export default {
     };
   },
   mounted() {
+    this.$set(this.formdata, "timeVal", [
+      new Date(new Date().toLocaleDateString()).getTime(),
+      new Date().getTime(),
+    ]);
     this.getTableList();
     this.getSearchdy();
     this.getSearchgj();
@@ -252,104 +256,17 @@ export default {
     },
     //获取数据
     getTableList() {
-      this.tableData = [
-            {
-                alarmId: "336a07658a964309855e7084013e545f",
-                earlyAlarmId: null,
-                companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b",
-                companyName: "xytest",
-                teamId: null,
-                teamName: null,
-                lineId: "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f",
-                lineName: "i1测试线路-SH",
-                logictowerId: "38fb2783-4d41-490d-8b80-806ecb4822e0",
-                towerName: "XYIGQ10C221000080",
-                monitorPointId: "8f0ebae8-e314-1d43-c700-2a50139f5489",
-                orientation: "10",
-                orientationName: "白天",
-                photoName: "XYIGQ10C221000080_20230505040011_1_255_res.jpg",
-                phtotUrl: "/",
-                dangerCode: "0101",
-                dangerName: "跨高铁(电铁)",
-                alarmInfo: '["YanWu"]',
-                alarmTime: 1683230415000,
-                status: 0,
-                outvalue: null,
-                alarmFlag: null,
-                collectConfigId: null,
-                collectUser: null,
-                analysersrc: "2",
-                alarmObjects: null,
-                photoPath:
-                  "/local/XYIGQ10C221000080/202305/backend/XYIGQ10C221000080_20230505040011_1_255_res.jpg",
-                alarmLevel: "1",
-                alarmSource: "1",
-                isRead: 1,
-                readStatus: null,
-                readTime: 1683279356000,
-                readUserName: null,
-                ifDispatch: null,
-                dispatchState: null,
-                dispatchTime: null,
-                channel: 1,
-                deviceId: "097ba6dc-9ece-4da4-a636-00eacc39fad5",
-                meid: "XYIGQ10C221000080",
-                dealTime: null,
-                overTimeStatus: null,
-                manufacturerCode: null,
-                manufacturerName: null,
-                sendWechat: null,
-                presettingNum: null,
-                presettingName: null,
-                referencepicname: null,
-                photoId: null,
-                weatherStatus: null,
-                jingKongLength: null,
-                shuiPingLength: null,
-                chuiZhiLength: null,
-                companyIdSelect: null,
-                timeStart: null,
-                timeEnd: null,
-                voltageCode: "5",
-                voltageName: "220kV",
-                alarmLevelName: null,
-                alarmInfoName: null,
-                ifDispatchLocationId: null,
-                userId: null,
-                earlyalarmTime: null,
-                lng: null,
-                lat: null,
-                timeExcel: null,
-                alarmTimeExcel: null,
-                sendPerson: null,
-                readPerson: null,
-                readTimeExcel: null,
-                statusName: null,
-                dealTimeDeal: null,
-                dealPersonDeal: null,
-                statusDeal: null,
-                measureDeal: null,
-                ramarkDeal: null,
-                analyseName: null,
-                workCount: null,
-                photoserver: null,
-                alarmDeal: [],
-                photoEarlyAlarm: null,
-                companyPath: null,
-              },
-            ];
-      this.total = 36;
-      this.photoPic = "http://180.166.218.222:8104/media" + this.tableData[0].photoPath;
       this.$set(this.formdata, "pageindex", this.page);
       this.$set(this.formdata, "pagesize", this.pageSize);
-      // getRealtimePhoto(this.formdata)
-      //   .then((res) => {
-      //     this.picList = res.data.list;
-      //     this.total = res.data.total;
-      //   })
-      //   .catch((err) => {
-      //     console.log(err);
-      //   });
+      getAlarmList(this.formdata)
+        .then((res) => {
+          this.tableData = res.data.list;
+          this.total = res.data.total;
+          // this.photoPic = "http://180.166.218.222:8104/media" + this.tableData[0].photoPath;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     //查询
     onSubmit() {