diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
index 16b00d5..0644cff 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
@@ -25,7 +25,7 @@
     val leftAxis: YAxis = this.axisLeft
     leftAxis.axisMinimum = 0f
     this.isScaleXEnabled = true //X轴可缩放
-    this.isScaleYEnabled = true //Y轴可缩放
+    this.isScaleYEnabled = false //Y轴不可缩放
     //设置x轴
     val xAxis: XAxis = this.xAxis
     xAxis.textColor = R.color.mainTextColor.convertColor()

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
index 16b00d5..0644cff 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
@@ -25,7 +25,7 @@
     val leftAxis: YAxis = this.axisLeft
     leftAxis.axisMinimum = 0f
     this.isScaleXEnabled = true //X轴可缩放
-    this.isScaleYEnabled = true //Y轴可缩放
+    this.isScaleYEnabled = false //Y轴不可缩放
     //设置x轴
     val xAxis: XAxis = this.xAxis
     xAxis.textColor = R.color.mainTextColor.convertColor()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 2a23622..28b0fb4 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -14,6 +14,7 @@
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.adapter.DeviceDataListAdapter
 import com.casic.qd.smartwell.base.BaseActivity
+import com.casic.qd.smartwell.extensions.navigatePageTo
 import com.casic.qd.smartwell.extensions.show
 import com.casic.qd.smartwell.extensions.showEmptyPage
 import com.casic.qd.smartwell.model.AreaModel
@@ -218,6 +219,19 @@
                             DeviceDataListAdapter(activity, activity.dataBeans)
                         activity.resultRecyclerView!!.layoutManager = LinearLayoutManager(activity)
                         activity.resultRecyclerView!!.adapter = activity.dataListAdapter
+                        activity.dataListAdapter.setOnItemClickListener(object :
+                            DeviceDataListAdapter.OnItemClickListener {
+                            override fun onClicked(position: Int) {
+                                val deviceCode = activity.dataBeans[position].devcode.toString()
+                                if (deviceCode.isBlank()) {
+                                    "设备编号异常，无法查看历史数据".show()
+                                    return
+                                }
+                                activity.navigatePageTo(
+                                    DeviceDataDetailActivity::class.java, deviceCode
+                                )
+                            }
+                        })
                     }
                 }
             }

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
index 16b00d5..0644cff 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
@@ -25,7 +25,7 @@
     val leftAxis: YAxis = this.axisLeft
     leftAxis.axisMinimum = 0f
     this.isScaleXEnabled = true //X轴可缩放
-    this.isScaleYEnabled = true //Y轴可缩放
+    this.isScaleYEnabled = false //Y轴不可缩放
     //设置x轴
     val xAxis: XAxis = this.xAxis
     xAxis.textColor = R.color.mainTextColor.convertColor()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 2a23622..28b0fb4 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -14,6 +14,7 @@
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.adapter.DeviceDataListAdapter
 import com.casic.qd.smartwell.base.BaseActivity
+import com.casic.qd.smartwell.extensions.navigatePageTo
 import com.casic.qd.smartwell.extensions.show
 import com.casic.qd.smartwell.extensions.showEmptyPage
 import com.casic.qd.smartwell.model.AreaModel
@@ -218,6 +219,19 @@
                             DeviceDataListAdapter(activity, activity.dataBeans)
                         activity.resultRecyclerView!!.layoutManager = LinearLayoutManager(activity)
                         activity.resultRecyclerView!!.adapter = activity.dataListAdapter
+                        activity.dataListAdapter.setOnItemClickListener(object :
+                            DeviceDataListAdapter.OnItemClickListener {
+                            override fun onClicked(position: Int) {
+                                val deviceCode = activity.dataBeans[position].devcode.toString()
+                                if (deviceCode.isBlank()) {
+                                    "设备编号异常，无法查看历史数据".show()
+                                    return
+                                }
+                                activity.navigatePageTo(
+                                    DeviceDataDetailActivity::class.java, deviceCode
+                                )
+                            }
+                        })
                     }
                 }
             }
diff --git a/app/src/main/res/drawable/ic_down.xml b/app/src/main/res/drawable/ic_down.xml
deleted file mode 100644
index 2beceb3..0000000
--- a/app/src/main/res/drawable/ic_down.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56px"
-    android:height="56px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/hintTextColor"
-        android:pathData="M85.3,320c0,-10.9 4.2,-21.8 12.5,-30.2 16.7,-16.7 43.7,-16.7 60.3,0L512,643.7l353.8,-353.8c16.7,-16.7 43.7,-16.7 60.3,0 16.7,16.7 16.7,43.7 0,60.3l-384,384c-16.7,16.7 -43.7,16.7 -60.3,0l-384,-384c-8.3,-8.4 -12.5,-19.3 -12.5,-30.2z" />
-</vector>

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
index 16b00d5..0644cff 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
@@ -25,7 +25,7 @@
     val leftAxis: YAxis = this.axisLeft
     leftAxis.axisMinimum = 0f
     this.isScaleXEnabled = true //X轴可缩放
-    this.isScaleYEnabled = true //Y轴可缩放
+    this.isScaleYEnabled = false //Y轴不可缩放
     //设置x轴
     val xAxis: XAxis = this.xAxis
     xAxis.textColor = R.color.mainTextColor.convertColor()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 2a23622..28b0fb4 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -14,6 +14,7 @@
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.adapter.DeviceDataListAdapter
 import com.casic.qd.smartwell.base.BaseActivity
+import com.casic.qd.smartwell.extensions.navigatePageTo
 import com.casic.qd.smartwell.extensions.show
 import com.casic.qd.smartwell.extensions.showEmptyPage
 import com.casic.qd.smartwell.model.AreaModel
@@ -218,6 +219,19 @@
                             DeviceDataListAdapter(activity, activity.dataBeans)
                         activity.resultRecyclerView!!.layoutManager = LinearLayoutManager(activity)
                         activity.resultRecyclerView!!.adapter = activity.dataListAdapter
+                        activity.dataListAdapter.setOnItemClickListener(object :
+                            DeviceDataListAdapter.OnItemClickListener {
+                            override fun onClicked(position: Int) {
+                                val deviceCode = activity.dataBeans[position].devcode.toString()
+                                if (deviceCode.isBlank()) {
+                                    "设备编号异常，无法查看历史数据".show()
+                                    return
+                                }
+                                activity.navigatePageTo(
+                                    DeviceDataDetailActivity::class.java, deviceCode
+                                )
+                            }
+                        })
                     }
                 }
             }
diff --git a/app/src/main/res/drawable/ic_down.xml b/app/src/main/res/drawable/ic_down.xml
deleted file mode 100644
index 2beceb3..0000000
--- a/app/src/main/res/drawable/ic_down.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56px"
-    android:height="56px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/hintTextColor"
-        android:pathData="M85.3,320c0,-10.9 4.2,-21.8 12.5,-30.2 16.7,-16.7 43.7,-16.7 60.3,0L512,643.7l353.8,-353.8c16.7,-16.7 43.7,-16.7 60.3,0 16.7,16.7 16.7,43.7 0,60.3l-384,384c-16.7,16.7 -43.7,16.7 -60.3,0l-384,-384c-8.3,-8.4 -12.5,-19.3 -12.5,-30.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_water.xml b/app/src/main/res/drawable/ic_home_water.xml
deleted file mode 100644
index a91cf6e..0000000
--- a/app/src/main/res/drawable/ic_home_water.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M803.58,419.14c-62.98,13.7 -124.8,-27.78 -138.05,-92.54C652.16,261.76 718.34,193.92 730.62,64c12.29,0 149.5,148.22 162.82,212.99 13.31,64.77 -26.88,128.45 -89.86,142.08zM864,304c6.02,-39.04 -32,-80 -32,-80s17.02,60.99 16,80c-0.96,19.01 -32,80 -32,80s41.98,-40.96 48,-80zM400.64,960C250.18,960 128,834.3 128,679.23c0,-155.07 183.36,-277.76 272.64,-568.96 28.16,6.02 272.77,413.95 272.77,568.96C673.41,834.3 551.3,960 400.64,960zM576,704c-13.7,73.15 -64,160 -64,160s116.54,-52.54 112,-176c-4.54,-123.46 -64,-144 -64,-144S589.7,630.85 576,704z"
-      android:fillColor="#1296db"/>
-</vector>

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
index 16b00d5..0644cff 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
@@ -25,7 +25,7 @@
     val leftAxis: YAxis = this.axisLeft
     leftAxis.axisMinimum = 0f
     this.isScaleXEnabled = true //X轴可缩放
-    this.isScaleYEnabled = true //Y轴可缩放
+    this.isScaleYEnabled = false //Y轴不可缩放
     //设置x轴
     val xAxis: XAxis = this.xAxis
     xAxis.textColor = R.color.mainTextColor.convertColor()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 2a23622..28b0fb4 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -14,6 +14,7 @@
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.adapter.DeviceDataListAdapter
 import com.casic.qd.smartwell.base.BaseActivity
+import com.casic.qd.smartwell.extensions.navigatePageTo
 import com.casic.qd.smartwell.extensions.show
 import com.casic.qd.smartwell.extensions.showEmptyPage
 import com.casic.qd.smartwell.model.AreaModel
@@ -218,6 +219,19 @@
                             DeviceDataListAdapter(activity, activity.dataBeans)
                         activity.resultRecyclerView!!.layoutManager = LinearLayoutManager(activity)
                         activity.resultRecyclerView!!.adapter = activity.dataListAdapter
+                        activity.dataListAdapter.setOnItemClickListener(object :
+                            DeviceDataListAdapter.OnItemClickListener {
+                            override fun onClicked(position: Int) {
+                                val deviceCode = activity.dataBeans[position].devcode.toString()
+                                if (deviceCode.isBlank()) {
+                                    "设备编号异常，无法查看历史数据".show()
+                                    return
+                                }
+                                activity.navigatePageTo(
+                                    DeviceDataDetailActivity::class.java, deviceCode
+                                )
+                            }
+                        })
                     }
                 }
             }
diff --git a/app/src/main/res/drawable/ic_down.xml b/app/src/main/res/drawable/ic_down.xml
deleted file mode 100644
index 2beceb3..0000000
--- a/app/src/main/res/drawable/ic_down.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56px"
-    android:height="56px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/hintTextColor"
-        android:pathData="M85.3,320c0,-10.9 4.2,-21.8 12.5,-30.2 16.7,-16.7 43.7,-16.7 60.3,0L512,643.7l353.8,-353.8c16.7,-16.7 43.7,-16.7 60.3,0 16.7,16.7 16.7,43.7 0,60.3l-384,384c-16.7,16.7 -43.7,16.7 -60.3,0l-384,-384c-8.3,-8.4 -12.5,-19.3 -12.5,-30.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_water.xml b/app/src/main/res/drawable/ic_home_water.xml
deleted file mode 100644
index a91cf6e..0000000
--- a/app/src/main/res/drawable/ic_home_water.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M803.58,419.14c-62.98,13.7 -124.8,-27.78 -138.05,-92.54C652.16,261.76 718.34,193.92 730.62,64c12.29,0 149.5,148.22 162.82,212.99 13.31,64.77 -26.88,128.45 -89.86,142.08zM864,304c6.02,-39.04 -32,-80 -32,-80s17.02,60.99 16,80c-0.96,19.01 -32,80 -32,80s41.98,-40.96 48,-80zM400.64,960C250.18,960 128,834.3 128,679.23c0,-155.07 183.36,-277.76 272.64,-568.96 28.16,6.02 272.77,413.95 272.77,568.96C673.41,834.3 551.3,960 400.64,960zM576,704c-13.7,73.15 -64,160 -64,160s116.54,-52.54 112,-176c-4.54,-123.46 -64,-144 -64,-144S589.7,630.85 576,704z"
-      android:fillColor="#1296db"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a2f2065..569deb8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,8 @@
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:scrollbars="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -49,7 +50,7 @@
             <com.youth.banner.Banner
                 android:id="@+id/mainBannerView"
                 android:layout_width="match_parent"
-                android:layout_height="200dp" />
+                android:layout_height="@dimen/dp_200" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/homeRecyclerView"
@@ -77,7 +78,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_80"
+                    android:layout_height="60dp"
                     android:orientation="horizontal">
 
                     <LinearLayout

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
index 16b00d5..0644cff 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt
@@ -25,7 +25,7 @@
     val leftAxis: YAxis = this.axisLeft
     leftAxis.axisMinimum = 0f
     this.isScaleXEnabled = true //X轴可缩放
-    this.isScaleYEnabled = true //Y轴可缩放
+    this.isScaleYEnabled = false //Y轴不可缩放
     //设置x轴
     val xAxis: XAxis = this.xAxis
     xAxis.textColor = R.color.mainTextColor.convertColor()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 2a23622..28b0fb4 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -14,6 +14,7 @@
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.adapter.DeviceDataListAdapter
 import com.casic.qd.smartwell.base.BaseActivity
+import com.casic.qd.smartwell.extensions.navigatePageTo
 import com.casic.qd.smartwell.extensions.show
 import com.casic.qd.smartwell.extensions.showEmptyPage
 import com.casic.qd.smartwell.model.AreaModel
@@ -218,6 +219,19 @@
                             DeviceDataListAdapter(activity, activity.dataBeans)
                         activity.resultRecyclerView!!.layoutManager = LinearLayoutManager(activity)
                         activity.resultRecyclerView!!.adapter = activity.dataListAdapter
+                        activity.dataListAdapter.setOnItemClickListener(object :
+                            DeviceDataListAdapter.OnItemClickListener {
+                            override fun onClicked(position: Int) {
+                                val deviceCode = activity.dataBeans[position].devcode.toString()
+                                if (deviceCode.isBlank()) {
+                                    "设备编号异常，无法查看历史数据".show()
+                                    return
+                                }
+                                activity.navigatePageTo(
+                                    DeviceDataDetailActivity::class.java, deviceCode
+                                )
+                            }
+                        })
                     }
                 }
             }
diff --git a/app/src/main/res/drawable/ic_down.xml b/app/src/main/res/drawable/ic_down.xml
deleted file mode 100644
index 2beceb3..0000000
--- a/app/src/main/res/drawable/ic_down.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56px"
-    android:height="56px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/hintTextColor"
-        android:pathData="M85.3,320c0,-10.9 4.2,-21.8 12.5,-30.2 16.7,-16.7 43.7,-16.7 60.3,0L512,643.7l353.8,-353.8c16.7,-16.7 43.7,-16.7 60.3,0 16.7,16.7 16.7,43.7 0,60.3l-384,384c-16.7,16.7 -43.7,16.7 -60.3,0l-384,-384c-8.3,-8.4 -12.5,-19.3 -12.5,-30.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_water.xml b/app/src/main/res/drawable/ic_home_water.xml
deleted file mode 100644
index a91cf6e..0000000
--- a/app/src/main/res/drawable/ic_home_water.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M803.58,419.14c-62.98,13.7 -124.8,-27.78 -138.05,-92.54C652.16,261.76 718.34,193.92 730.62,64c12.29,0 149.5,148.22 162.82,212.99 13.31,64.77 -26.88,128.45 -89.86,142.08zM864,304c6.02,-39.04 -32,-80 -32,-80s17.02,60.99 16,80c-0.96,19.01 -32,80 -32,80s41.98,-40.96 48,-80zM400.64,960C250.18,960 128,834.3 128,679.23c0,-155.07 183.36,-277.76 272.64,-568.96 28.16,6.02 272.77,413.95 272.77,568.96C673.41,834.3 551.3,960 400.64,960zM576,704c-13.7,73.15 -64,160 -64,160s116.54,-52.54 112,-176c-4.54,-123.46 -64,-144 -64,-144S589.7,630.85 576,704z"
-      android:fillColor="#1296db"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a2f2065..569deb8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,8 @@
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:scrollbars="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -49,7 +50,7 @@
             <com.youth.banner.Banner
                 android:id="@+id/mainBannerView"
                 android:layout_width="match_parent"
-                android:layout_height="200dp" />
+                android:layout_height="@dimen/dp_200" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/homeRecyclerView"
@@ -77,7 +78,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_80"
+                    android:layout_height="60dp"
                     android:orientation="horizontal">
 
                     <LinearLayout
diff --git a/app/src/main/res/mipmap-xxhdpi/bg_home_data.jpg b/app/src/main/res/mipmap-xxhdpi/bg_home_data.jpg
deleted file mode 100644
index 3d11f73..0000000
--- a/app/src/main/res/mipmap-xxhdpi/bg_home_data.jpg
+++ /dev/null
Binary files differ