diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 5aa4840..db5f420 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -81,7 +81,7 @@ export function getPictureList(data) {
   });
 }
 
-//实时查询
+//历史图片
 //获取电压-线路-杆塔等信息
 export function getSearchInfo(data) {
   return request({
@@ -285,7 +285,6 @@ export function getTerminalJoggle(data) {
   });
 }
 //添加设备信息
-
 export function addTerminalJoggle(data) {
   return request({
     url: "/api/addTerminal",
@@ -293,8 +292,15 @@ export function addTerminalJoggle(data) {
     data,
   });
 }
+//添加设备---获取-线路-杆塔
+export function getLineAndGtInfo(data) {
+  return request({
+    url: "/api/getLineAndGtList",
+    method: "post",
+    data,
+  });
+}
 //修改设备信息
-
 export function updateTerminalJoggle(data) {
   return request({
     url: "/api/updateTerminal",
@@ -303,7 +309,6 @@ export function updateTerminalJoggle(data) {
   });
 }
 //删除设备信息
-
 export function deleteTerminalJoggle(data) {
   return request({
     url: "/api/deleteTerminal",
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 6b2de45..2cd41ac 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -16,7 +16,7 @@
       <div class="searchBox">
         <el-form :inline="true" :model="formdata" class="demo-form-inline">
           <el-form-item label="电压等级">
-            <el-select v-model="formdata.dyid" >
+            <el-select v-model="formdata.dyId" @change="getSearchxl">
               <el-option
                 v-for="item in dyOptions"
                 :key="item.id"
@@ -26,7 +26,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="线路名称">
-            <el-select v-model="formdata.lineid" >
+            <el-select v-model="formdata.lineId" @change="getSearchgt">
               <el-option
                 v-for="item in xlOptions"
                 :key="item.id"
@@ -36,7 +36,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="杆塔名称">
-            <el-select v-model="formdata.towerid" >
+            <el-select v-model="formdata.towerId" >
               <el-option
                 v-for="item in gtOptions"
                 :key="item.id"
@@ -54,6 +54,16 @@
               value-format="timestamp"
             ></el-date-picker>
           </el-form-item>
+          <el-form-item label="告警原因">
+            <el-select v-model="formdata.warnCause" >
+              <el-option
+                v-for="item in gjOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="onSubmit">查询</el-button>
           </el-form-item>
@@ -85,7 +95,12 @@
               :formatter="dateFormat"
             >
             </el-table-column>
-            <el-table-column prop="alarmLevel" label="电压等级" min-width="75">
+            <el-table-column 
+              prop="dyLevel" 
+              label="电压等级" 
+              min-width="75"
+              :show-overflow-tooltip="true"
+            >
             </el-table-column>
             <el-table-column
               prop="lineName"
@@ -95,7 +110,7 @@
             >
             </el-table-column>
             <el-table-column
-              prop="meid"
+              prop="towerName"
               label="杆塔名称"
               min-width="115"
               :show-overflow-tooltip="true"
@@ -123,23 +138,24 @@
             >
             </el-table-column>
             <el-table-column
-              prop="isRead"
+              prop="status"
               label="是否已读"
               min-width="95"
               fixed="right"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.isRead == 0">未读</span>
-                <span v-if="scope.row.isRead == 1">已读</span>
+                <span v-if="scope.row.status == 0">未读</span>
+                <span v-if="scope.row.status == 1">已读</span>
               </template>
             </el-table-column>
           </el-table>
           <div class="pageNation">
             <el-pagination
               @current-change="handleCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="page"
               :page-size="pageSize"
-              layout=" prev, pager, next, jumper,total"
+              layout="sizes, prev, pager, next, jumper,total"
               :total="total"
             >
             </el-pagination>
@@ -163,7 +179,7 @@
 </template>
 
 <script>
-//import { list } from '@/utils/api/index';
+import { getSearchInfo, getRealtimePhoto } from "@/utils/api/index";
 import moment from "moment";
 export default {
   data() {
@@ -171,14 +187,12 @@ export default {
       dyOptions: [{ id: 0, name: '全部'}], //电压数据
       xlOptions: [{ id: 0, name: '全部'}], //线路数据
       gtOptions: [{ id: 0, name: '全部'}], //杆塔数据
-      zzOptions: [{ id: 0, name: '全部'}], //装置数据
-      tdOptions: [{ id: 0, name: '全部'}], //通道数据
+      gjOptions: [{ id: 0, name: '全部'}], //告警数据
       formdata: {
-        dyid: "",
-        lineid: "",
-        towerid: "",
-        channelid: "",
-        termid: "",
+        dyId: "",
+        lineId: "",
+        towerId: "",
+        warnCause:'',
         timeVal: "",
       },
       photoPic: "",
@@ -189,109 +203,171 @@ export default {
       total: 0, //总条数
     };
   },
+  mounted() {
+    this.getTableList();
+    this.getSearchdy();
+    this.getSearchgj();
+  },
   methods: {
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-      this.page = val;
-      this.getTableList();
+    //获取电压信息
+    getSearchdy() {
+      getSearchInfo({ type: 1 })
+        .then((res) => {
+          this.dyOptions = this.dyOptions.concat(res.data.list);
+          this.formdata.dyId = this.dyOptions[0].id;
+          this.getSearchxl();
+        })
+        .catch((err) => {});
+    },
+    //获取线路数据
+    getSearchxl() {
+      getSearchInfo({ type: 2, id: this.formdata.dyId })
+        .then((res) => {
+          this.xlOptions = [{ id: 0, name: "全部" }];
+          this.xlOptions = this.xlOptions.concat(res.data.list);
+          this.formdata.lineId = this.xlOptions[0].id;
+          this.getSearchgt();
+        })
+        .catch((err) => {});
+    },
+    //获取杆塔数据
+    getSearchgt() {
+      getSearchInfo({ type: 3, id: this.formdata.lineId })
+        .then((res) => {
+          this.gtOptions = [{ id: 0, name: "全部" }];
+          this.gtOptions = this.gtOptions.concat(res.data.list);
+          this.formdata.towerId = this.gtOptions[0].id;
+        })
+        .catch((err) => {});
+    },
+    //获取告警原因
+    getSearchgj() {
+      getSearchInfo({ type: 1, id: this.formdata.lineId })
+        .then((res) => {
+          this.gjOptions = [{ id: 0, name: "全部" }];
+          this.gjOptions = this.gjOptions.concat(res.data.list);
+          this.formdata.warnCause = this.gjOptions[0].id;
+        })
+        .catch((err) => {});
     },
+    //获取数据
     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,
-        },
-      ];
+            {
+                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);
+      //   });
     },
     //查询
     onSubmit() {
-      
+      this.getTableList()
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+    //点击分页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getTableList();
+    },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.getTableList();
+    },
     handleRowClick(row) {
       //this.$refs.multipleTable.toggleRowSelection(row);
       console.log(row);
@@ -304,10 +380,7 @@ export default {
       }
       return moment(date).format("YYYY-MM-DD HH:mm:ss");
     },
-  },
-  created() {
-    this.getTableList();
-  },
+  }
 };
 </script>
 <style lang="less">
@@ -318,7 +391,8 @@ export default {
   background: #ffffff;
   .searchMain {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
+    height: calc(100% - 62px);
+    max-height: calc(100% - 62px);
     padding: 16px;
     border-radius: 4px;
   }
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index daacb9b..0c9139e 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -121,7 +121,7 @@ import {
   addTerminalJoggle,
   updateTerminalJoggle,
   getAllChannelListJoggle,
-  getSearchInfo,
+  getLineAndGtInfo,
 } from "@/utils/api/index";
 export default {
   props: {
@@ -279,7 +279,7 @@ export default {
 
     //获取所有线路
     getLine() {
-      getSearchInfo({ type: 2 }).then((res) => {
+      getLineAndGtInfo({ type: 1 }).then((res) => {
         this.lineOptions = res.data.list;
         if (res.data.list.length == 0) {
           this.lineOptions = [];
@@ -298,7 +298,7 @@ export default {
     },
     //获取所有杆塔
     getTower() {
-      getSearchInfo({ type: 3, id: this.formInfo.lineid })
+      getLineAndGtInfo({ type: 2, id: this.formInfo.lineid })
         .then((res) => {
           if (res.data.list.length == 0) {
             this.toweridOptions = [];