diff --git a/app/SmartTown.jks b/app/SmartTown.jks
new file mode 100644
index 0000000..585d7db
--- /dev/null
+++ b/app/SmartTown.jks
Binary files differ

diff --git a/app/SmartTown.jks b/app/SmartTown.jks
new file mode 100644
index 0000000..585d7db
--- /dev/null
+++ b/app/SmartTown.jks
Binary files differ
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index f21feab..19aafdd 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -29,6 +29,7 @@
     private lateinit var wellViewModel: WellViewModel
     private lateinit var infrastructureViewModel: InfrastructureViewModel
     private lateinit var deviceViewModel: DeviceViewModel
+    private val xAxisLabel = arrayListOf("井盖状态监测仪", "液位监测仪", "有害气体监测仪", "噪声记录仪", "消防栓防盗水监测仪")
 
     override fun initLayoutView(): Int = R.layout.fragment_statistics
 
@@ -51,21 +52,16 @@
             if (it.code == 200) {
                 var totalAlarm = 0
 
-                val xAxisLabel: MutableList<String> = ArrayList()
                 val barEntries: MutableList<BarEntry> = ArrayList()
 
                 it.data.forEachIndexed { index, dataModel ->
                     totalAlarm += dataModel.`_$1`.toInt() + dataModel.`_$2`.toInt()
 
-                    if (dataModel.`_$1` != "0" || dataModel.`_$2` != "0") {
-                        xAxisLabel.add(dataModel.deviceType)
-                        barEntries.add(
-                            BarEntry(
-                                index.toFloat(),
-                                dataModel.`_$1`.toFloat() + dataModel.`_$2`.toFloat()
-                            )
+                    barEntries.add(
+                        BarEntry(
+                            index.toFloat(), dataModel.`_$1`.toFloat() + dataModel.`_$2`.toFloat()
                         )
-                    }
+                    )
                 }
                 totalAlarmView.text = totalAlarm.toString()
 

diff --git a/app/SmartTown.jks b/app/SmartTown.jks
new file mode 100644
index 0000000..585d7db
--- /dev/null
+++ b/app/SmartTown.jks
Binary files differ
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index f21feab..19aafdd 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -29,6 +29,7 @@
     private lateinit var wellViewModel: WellViewModel
     private lateinit var infrastructureViewModel: InfrastructureViewModel
     private lateinit var deviceViewModel: DeviceViewModel
+    private val xAxisLabel = arrayListOf("井盖状态监测仪", "液位监测仪", "有害气体监测仪", "噪声记录仪", "消防栓防盗水监测仪")
 
     override fun initLayoutView(): Int = R.layout.fragment_statistics
 
@@ -51,21 +52,16 @@
             if (it.code == 200) {
                 var totalAlarm = 0
 
-                val xAxisLabel: MutableList<String> = ArrayList()
                 val barEntries: MutableList<BarEntry> = ArrayList()
 
                 it.data.forEachIndexed { index, dataModel ->
                     totalAlarm += dataModel.`_$1`.toInt() + dataModel.`_$2`.toInt()
 
-                    if (dataModel.`_$1` != "0" || dataModel.`_$2` != "0") {
-                        xAxisLabel.add(dataModel.deviceType)
-                        barEntries.add(
-                            BarEntry(
-                                index.toFloat(),
-                                dataModel.`_$1`.toFloat() + dataModel.`_$2`.toFloat()
-                            )
+                    barEntries.add(
+                        BarEntry(
+                            index.toFloat(), dataModel.`_$1`.toFloat() + dataModel.`_$2`.toFloat()
                         )
-                    }
+                    )
                 }
                 totalAlarmView.text = totalAlarm.toString()
 
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index c893dc8..8ba5e8d 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -44,20 +44,12 @@
     }
 
     public static class DataModel {
-        private String deviceType;
         @SerializedName("1")
         private String _$1;
+        private String deviceType;
         @SerializedName("2")
         private String _$2;
 
-        public String getDeviceType() {
-            return deviceType;
-        }
-
-        public void setDeviceType(String deviceType) {
-            this.deviceType = deviceType;
-        }
-
         public String get_$1() {
             return _$1;
         }
@@ -66,6 +58,14 @@
             this._$1 = _$1;
         }
 
+        public String getDeviceType() {
+            return deviceType;
+        }
+
+        public void setDeviceType(String deviceType) {
+            this.deviceType = deviceType;
+        }
+
         public String get_$2() {
             return _$2;
         }