diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
index fdf5a4c01..435816907 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
@@ -25,19 +25,8 @@
           </el-col>
           <el-col :span="4" style="text-align: center;">
             <el-button style="margin-left: 10px;" @click="queryData(true)">查询</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10" style="text-align: center;">
-            <div style="display: inline-block;margin-right: 5px;">设备编号:</div>
-            <el-input v-model="deviceCode" placeholder="请输入内容" style="width:220px;" size="small" />
-          </el-col>
-          <el-col :span="10" style="text-align: center;">
-            <div style="display: inline-block;margin-right: 5px;margin-left: 10px;">元素编号:</div>
-            <el-input v-model="elementCode" placeholder="请输入内容" style="width:220px;" size="small" />
-          </el-col>
-          <el-col :span="4" style="text-align: center;">
             <el-button style="margin-left: 10px;" @click="queryData(false)">撤销查询</el-button>
+
           </el-col>
         </el-row>
       </div>
@@ -66,7 +55,11 @@
         <el-table-column prop="level" label="报警级别" />
         <el-table-column prop="time" label="日期/时间" width="150px" />
         <el-table-column prop="code" label="报警序号" />
-        <el-table-column prop="deviceCode" label="设备编号" />
+        <el-table-column prop="deviceCode" label="设备编号">
+          <template slot-scope="scope">
+            <span>{{ handleDeviceName(scope.row.deviceCode) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="address" label="信号编号" />
         <el-table-column prop="address" label="元素编号" />
         <el-table-column prop="confirmed" label="确认">
@@ -76,7 +69,7 @@
         </el-table-column>
         <el-table-column prop="confirmedUserName" label="确认人编号" width="120px" />
         <el-table-column prop="confirmTime" label="确认时间" width="150px" />
-        <el-table-column prop="recover" label="恢复">
+        <el-table-column prop="recoverTime" label="恢复">
           <template slot-scope="scope">
             <span>{{ scope.row.recovered? 'Y':'N' }}</span>
           </template>
@@ -145,6 +138,10 @@ export default {
             }).catch(() => {
                 this.$message.error('确认消息失败！');
             });
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            return device.name;
         }
     }
 };
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
index 74c12aff9..9168fc971 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
@@ -32,7 +32,11 @@
             <span>{{ handleDeviceType(scope.row.deviceCode) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="deviceCode" label="设备编号" />
+        <el-table-column prop="deviceCode" label="设备编号">
+          <template slot-scope="scope">
+            <span>{{ handleDeviceName(scope.row.deviceCode) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="code" label="故障号" />
         <el-table-column prop="description" label="故障描述" />
         <el-table-column prop="recover" label="已恢复">
@@ -101,6 +105,10 @@ export default {
         handleDeviceType(code) {
             const device = this.$store.getters['map/getDeviceByCode'](code);
             return deviceType[device.type];
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            return device.name;
         }
     }
 };