diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
index b96fac1..d14b678 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt
@@ -139,12 +139,13 @@
                                 item.alarmTime.formatToDate()
                             }
 
-                            val color = when (item.alarmStatus) {
+                            val color = when (item.alarmStatusName) {
                                 "正在报警" -> R.color.redTextColor.convertColor(this@AlarmListActivity)
-                                else -> R.color.greenColor.convertColor(this@AlarmListActivity)
+                                "手动消警" -> R.color.greenColor.convertColor(this@AlarmListActivity)
+                                else -> R.color.hintTextColor.convertColor(this@AlarmListActivity)
                             }
 
-                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatus)
+                            viewHolder.setText(R.id.alarmStatusView, item.alarmStatusName)
                                 .setBackgroundColor(R.id.alarmStatusView, color)
                                 .setText(R.id.alarmContentView, item.alarmContent)
                                 .setText(R.id.workRoadView, item.workRoad)