diff --git a/src/views/projectFront/rainfallMonitor/alarmWarning.vue b/src/views/projectFront/rainfallMonitor/alarmWarning.vue
index 8db86199..25a78d55 100644
--- a/src/views/projectFront/rainfallMonitor/alarmWarning.vue
+++ b/src/views/projectFront/rainfallMonitor/alarmWarning.vue
@@ -53,7 +53,13 @@
     <div class="table_wrap whiteBlock">
       <vue-scroll style="height: 88%">
         <el-table class="tables" :data="List">
-          <!-- 报警名称 -->
+          <el-table-column
+            :label="$t('message.projectInfo.devName')"
+            prop="devName"
+            align="center"
+            width="150"
+          >
+          </el-table-column>
           <el-table-column
             prop="alarmContent"
             label="报警内容"
@@ -172,26 +178,23 @@ export default {
       rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => {
         if (result.success) {
           this.deviceIdArr = result.result;
-          if (result.result.length > 0) {
-            this.queryInfo.deviceId = result.result[0].devSn;
-          }
-          console.log("get设备列表", this.deviceIdArr);
+          // if (result.result.length > 0) {
+          //   this.queryInfo.deviceId = result.result[0].devSn;
+          // }
+          // console.log("get设备列表", this.deviceIdArr);
         }
       });
     },
     getList() {
-      let timeObj = {
-        startTime: this.time ? this.time[0] : "",
-        endTime: this.time ? this.time[1] : "",
+      let data = {
+        devSn: this.queryInfo.deviceId,
+        projectSn: this.$store.state.projectSn,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        alarmTime_begin: this.time ? this.time[0] : "",
+        alarmTime_end: this.time ? this.time[1] : "",
       };
-      rainAlarmList(
-        Object.assign(
-          this.queryInfo,
-          this.pagInfo,
-          { projectSn: this.$store.state.projectSn },
-          timeObj
-        )
-      ).then((result) => {
+      rainAlarmList(data).then((result) => {
         if (result.success) {
           this.List = result.result.records;
           this.pagInfo.total = result.result.total;
diff --git a/src/views/projectFront/rainfallMonitor/relaTimeData.vue b/src/views/projectFront/rainfallMonitor/relaTimeData.vue
index 2d49a0dd..cd7f1020 100644
--- a/src/views/projectFront/rainfallMonitor/relaTimeData.vue
+++ b/src/views/projectFront/rainfallMonitor/relaTimeData.vue
@@ -29,6 +29,7 @@
           v-model="valueTime"
           type="daterange"
           range-separator="-"
+          value-format="yyyy-MM-dd"
           :start-placeholder="$t('message.projectInfo.start')"
           :end-placeholder="$t('message.projectInfo.end')"
         >
@@ -145,7 +146,7 @@
             align="center"
             :label="$t('message.projectInfo.uploadDate')"
             width="200"
-            prop="updateDate"
+            prop="recordTime"
           >
           </el-table-column>
         </el-table>
@@ -201,10 +202,10 @@ export default {
       rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => {
         if (result.success) {
           this.devList = result.result;
-          if (result.result.length > 0) {
-            this.devSn = result.result[0].devSn;
-          }
-          console.log("get设备列表", this.devList);
+          // if (result.result.length > 0) {
+          //   this.devSn = result.result[0].devSn;
+          // }
+          // console.log("get设备列表", this.devList);
         }
       });
     },
@@ -230,12 +231,12 @@ export default {
     },
     selectDustNoisePageList() {
       let data = {
-        deviceId: this.devSn,
+        devSn: this.devSn,
         projectSn: this.$store.state.projectSn,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        startTime: this.valueTime ? this.valueTime[0] : "",
-        endTime: this.valueTime ? this.valueTime[1] : "",
+        recordTime_begin: this.valueTime ? this.valueTime[0] : "",
+        recordTime_end: this.valueTime ? this.valueTime[1] : "",
       };
       rainRecordPageApi(data).then((res) => {
         console.log(res);