diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 7d544d7..87cab8c 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,6 +2,7 @@
 
 import android.graphics.Point
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -36,7 +37,6 @@
 import kotlinx.android.synthetic.main.include_home_data_overview.view.*
 import kotlinx.android.synthetic.main.include_home_device_chart.*
 import kotlinx.android.synthetic.main.include_home_device_type_chart.*
-import kotlinx.android.synthetic.main.include_home_device_type_chart.deviceTypeChart
 import kotlinx.android.synthetic.main.include_home_order_chart.*
 import kotlinx.android.synthetic.main.include_home_well_chart.*
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
@@ -139,10 +139,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -307,7 +307,7 @@
                     barEntries.add(BarEntry(index.toFloat(), completedValue))
                 }
                 ChartViewHelper.setBarChartData(
-                    orderBarChart, xAxisLabel, barEntries, "monthOrderData"
+                    orderBarChart, xAxisLabel, barEntries, "completedData"
                 )
             }
         })

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 7d544d7..87cab8c 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,6 +2,7 @@
 
 import android.graphics.Point
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -36,7 +37,6 @@
 import kotlinx.android.synthetic.main.include_home_data_overview.view.*
 import kotlinx.android.synthetic.main.include_home_device_chart.*
 import kotlinx.android.synthetic.main.include_home_device_type_chart.*
-import kotlinx.android.synthetic.main.include_home_device_type_chart.deviceTypeChart
 import kotlinx.android.synthetic.main.include_home_order_chart.*
 import kotlinx.android.synthetic.main.include_home_well_chart.*
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
@@ -139,10 +139,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -307,7 +307,7 @@
                     barEntries.add(BarEntry(index.toFloat(), completedValue))
                 }
                 ChartViewHelper.setBarChartData(
-                    orderBarChart, xAxisLabel, barEntries, "monthOrderData"
+                    orderBarChart, xAxisLabel, barEntries, "completedData"
                 )
             }
         })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
index a1b4784..f912ecf 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
@@ -11,6 +11,7 @@
 import com.github.mikephil.charting.charts.LineChart
 import com.github.mikephil.charting.charts.PieChart
 import com.github.mikephil.charting.data.*
+import com.github.mikephil.charting.formatter.DefaultValueFormatter
 import com.github.mikephil.charting.formatter.ValueFormatter
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
@@ -47,6 +48,7 @@
         dataSet.valueLinePart1Length = 0.75f //标签指示线前半截长度
         dataSet.valueLinePart2Length = 0.75f //标签指示线后半截长度
         val data = PieData(dataSet)
+        data.setValueFormatter(DefaultValueFormatter(0)) // 保留整数
         data.setValueTextSize(12f)
         data.setValueTextColor(R.color.mainThemeColor.convertColor(context)) //数据值颜色
         chart.data = data
@@ -72,6 +74,7 @@
         dataSet.color = R.color.color_8.convertColor(context)
         barDataSets.add(dataSet)
         val barData = BarData(barDataSets)
+        barData.setValueFormatter(DefaultValueFormatter(0)) // 保留整数
         barData.barWidth = 0.75f
         //添加自定义Marker
         val markerView = BarChartMarkerView(context)

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 7d544d7..87cab8c 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,6 +2,7 @@
 
 import android.graphics.Point
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -36,7 +37,6 @@
 import kotlinx.android.synthetic.main.include_home_data_overview.view.*
 import kotlinx.android.synthetic.main.include_home_device_chart.*
 import kotlinx.android.synthetic.main.include_home_device_type_chart.*
-import kotlinx.android.synthetic.main.include_home_device_type_chart.deviceTypeChart
 import kotlinx.android.synthetic.main.include_home_order_chart.*
 import kotlinx.android.synthetic.main.include_home_well_chart.*
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
@@ -139,10 +139,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -307,7 +307,7 @@
                     barEntries.add(BarEntry(index.toFloat(), completedValue))
                 }
                 ChartViewHelper.setBarChartData(
-                    orderBarChart, xAxisLabel, barEntries, "monthOrderData"
+                    orderBarChart, xAxisLabel, barEntries, "completedData"
                 )
             }
         })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
index a1b4784..f912ecf 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
@@ -11,6 +11,7 @@
 import com.github.mikephil.charting.charts.LineChart
 import com.github.mikephil.charting.charts.PieChart
 import com.github.mikephil.charting.data.*
+import com.github.mikephil.charting.formatter.DefaultValueFormatter
 import com.github.mikephil.charting.formatter.ValueFormatter
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
@@ -47,6 +48,7 @@
         dataSet.valueLinePart1Length = 0.75f //标签指示线前半截长度
         dataSet.valueLinePart2Length = 0.75f //标签指示线后半截长度
         val data = PieData(dataSet)
+        data.setValueFormatter(DefaultValueFormatter(0)) // 保留整数
         data.setValueTextSize(12f)
         data.setValueTextColor(R.color.mainThemeColor.convertColor(context)) //数据值颜色
         chart.data = data
@@ -72,6 +74,7 @@
         dataSet.color = R.color.color_8.convertColor(context)
         barDataSets.add(dataSet)
         val barData = BarData(barDataSets)
+        barData.setValueFormatter(DefaultValueFormatter(0)) // 保留整数
         barData.barWidth = 0.75f
         //添加自定义Marker
         val markerView = BarChartMarkerView(context)
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt
index d671c11..7db2604 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.widgets
 
 import android.content.Context
-import android.util.Log
 import android.widget.TextView
 import com.casic.app.smartwell.sanxi.R
 import com.github.mikephil.charting.components.MarkerView
@@ -36,7 +35,8 @@
             when (dateType) {
                 "wellType" -> dataView.text = String.format("井数量：${dataValue}")
                 "deviceType" -> dataView.text = String.format("设备数量：${dataValue}")
-                else -> dataView.text = String.format("数量：${dataValue}")
+                "completedData" -> dataView.text = String.format("已完成：${dataValue}")
+                else -> dataView.text = String.format("未完成：${dataValue}")
             }
         } catch (e1: Exception) {
             e1.printStackTrace()

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 7d544d7..87cab8c 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,6 +2,7 @@
 
 import android.graphics.Point
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -36,7 +37,6 @@
 import kotlinx.android.synthetic.main.include_home_data_overview.view.*
 import kotlinx.android.synthetic.main.include_home_device_chart.*
 import kotlinx.android.synthetic.main.include_home_device_type_chart.*
-import kotlinx.android.synthetic.main.include_home_device_type_chart.deviceTypeChart
 import kotlinx.android.synthetic.main.include_home_order_chart.*
 import kotlinx.android.synthetic.main.include_home_well_chart.*
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
@@ -139,10 +139,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -307,7 +307,7 @@
                     barEntries.add(BarEntry(index.toFloat(), completedValue))
                 }
                 ChartViewHelper.setBarChartData(
-                    orderBarChart, xAxisLabel, barEntries, "monthOrderData"
+                    orderBarChart, xAxisLabel, barEntries, "completedData"
                 )
             }
         })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
index a1b4784..f912ecf 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/ChartViewHelper.kt
@@ -11,6 +11,7 @@
 import com.github.mikephil.charting.charts.LineChart
 import com.github.mikephil.charting.charts.PieChart
 import com.github.mikephil.charting.data.*
+import com.github.mikephil.charting.formatter.DefaultValueFormatter
 import com.github.mikephil.charting.formatter.ValueFormatter
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
@@ -47,6 +48,7 @@
         dataSet.valueLinePart1Length = 0.75f //标签指示线前半截长度
         dataSet.valueLinePart2Length = 0.75f //标签指示线后半截长度
         val data = PieData(dataSet)
+        data.setValueFormatter(DefaultValueFormatter(0)) // 保留整数
         data.setValueTextSize(12f)
         data.setValueTextColor(R.color.mainThemeColor.convertColor(context)) //数据值颜色
         chart.data = data
@@ -72,6 +74,7 @@
         dataSet.color = R.color.color_8.convertColor(context)
         barDataSets.add(dataSet)
         val barData = BarData(barDataSets)
+        barData.setValueFormatter(DefaultValueFormatter(0)) // 保留整数
         barData.barWidth = 0.75f
         //添加自定义Marker
         val markerView = BarChartMarkerView(context)
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt
index d671c11..7db2604 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/widgets/BarChartMarkerView.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.widgets
 
 import android.content.Context
-import android.util.Log
 import android.widget.TextView
 import com.casic.app.smartwell.sanxi.R
 import com.github.mikephil.charting.components.MarkerView
@@ -36,7 +35,8 @@
             when (dateType) {
                 "wellType" -> dataView.text = String.format("井数量：${dataValue}")
                 "deviceType" -> dataView.text = String.format("设备数量：${dataValue}")
-                else -> dataView.text = String.format("数量：${dataValue}")
+                "completedData" -> dataView.text = String.format("已完成：${dataValue}")
+                else -> dataView.text = String.format("未完成：${dataValue}")
             }
         } catch (e1: Exception) {
             e1.printStackTrace()
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 2c64371..c41eda8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -72,16 +72,64 @@
 
                     <include layout="@layout/include_home_data_overview" />
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_10"
+                        android:text="布防撤防统计"
+                        android:textColor="@color/mainTextColor"
+                        android:textSize="@dimen/sp_18" />
+
                     <include layout="@layout/include_home_well_chart" />
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_10"
+                        android:text="井类型数量统计"
+                        android:textColor="@color/mainTextColor"
+                        android:textSize="@dimen/sp_18" />
+
                     <include layout="@layout/include_home_well_type_chart" />
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_10"
+                        android:text="设备数量统计"
+                        android:textColor="@color/mainTextColor"
+                        android:textSize="@dimen/sp_18" />
+
                     <include layout="@layout/include_home_device_chart" />
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_10"
+                        android:text="设备在线情况统计"
+                        android:textColor="@color/mainTextColor"
+                        android:textSize="@dimen/sp_18" />
+
                     <include layout="@layout/include_home_device_type_chart" />
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_10"
+                        android:text="7日报警趋势"
+                        android:textColor="@color/mainTextColor"
+                        android:textSize="@dimen/sp_18" />
+
                     <include layout="@layout/include_home_alarm_chart" />
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_10"
+                        android:text="30日工单统计"
+                        android:textColor="@color/mainTextColor"
+                        android:textSize="@dimen/sp_18" />
+
                     <include layout="@layout/include_home_order_chart" />
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>