diff --git a/src/filters/ems.js b/src/filters/ems.js
index 50fd795..1c31605 100644
--- a/src/filters/ems.js
+++ b/src/filters/ems.js
@@ -6,9 +6,14 @@ export const formatNumber = (val) => {
 }
 
 
-export const formatDate = (val) => {
+export const formatDate = (val,toSeconds = false) => {
   if(!val) return ''
   const date = new Date(val)
   const month = date.getMonth() + 1,day = date.getDate()
-  return `${date.getFullYear()}-${month<10?'0'+month : month}-${day<10 ? '0'+day : day}`
+  if(!toSeconds){
+    return `${date.getFullYear()}-${month<10?'0'+month : month}-${day<10 ? '0'+day : day}`
+  }else{
+    const hours = date.getHours(),minuets=date.getMinutes(),seconds = date.getSeconds();
+    return `${date.getFullYear()}-${month<10?'0'+month : month}-${day<10 ? '0'+day : day} ${hours<10 ? '0'+hours : hours}:${minuets<10 ? '0'+minuets : minuets}:${seconds<10 ? '0'+seconds : seconds}`
+  }
 }
diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index 20723ad..109bfa1 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -48,7 +48,7 @@
           max-height="500"
           style="width: 100%;margin-top:25px;">
           <el-table-column
-            prop="name"
+            prop="deviceName"
             width="200"
             label="设备名称">
           </el-table-column>
@@ -61,17 +61,22 @@
           </el-table-column>
           <el-table-column
             prop="alarmContent"
-            min-width="400"
             show-overflow-tooltip
             label="告警内容">
           </el-table-column>
           <el-table-column
             prop="alarmStartTime"
             label="告警发生时间">
+            <template slot-scope="scope">
+              <span>{{formatDate(scope.row.alarmStartTime,true)}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="alarmEndTime"
             label="告警结束时间">
+            <template slot-scope="scope">
+              <span>{{formatDate(scope.row.alarmEndTime,true)}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             label="状态">
@@ -101,7 +106,7 @@
 <script>
 import {getAlarmDetailList} from'@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {formatDate} from '@/filters/ems'
+import { formatDate } from '@/filters/ems'
 export default {
   name:'DzjkGzgj',
   mixins:[getQuerySiteId],
@@ -129,6 +134,7 @@ export default {
     }
   },
   methods:{
+    formatDate,
     // 判断是否是同一天
     isSameDay(day1, day2) {
       const date1 = new Date(day1),date2 = new Date(day2)
@@ -205,12 +211,13 @@ export default {
           end = alarmEndTime
         }else{
           start=''
-          end = now
-          end.setDate(end.getDate() - 1);
+          end = ''
+            // now
+          // end.setDate(end.getDate() - 1);
         }
       }
       getAlarmDetailList({deviceType,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(start),alarmEndTime:formatDate(end)}).then(response => {
-        this.tableData=response?.data || [];
+        this.tableData=response?.rows || [];
         this.totalSize = response?.total || 0
       }).finally(() => {this.loading=false})
     },