diff --git a/coalMiningApp/app/src/main/AndroidManifest.xml b/coalMiningApp/app/src/main/AndroidManifest.xml
index b3dfae6..c92b113 100644
--- a/coalMiningApp/app/src/main/AndroidManifest.xml
+++ b/coalMiningApp/app/src/main/AndroidManifest.xml
@@ -63,6 +63,9 @@
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.user.activity.DataSyncActivity" />
         <activity android:name=".ui.wateryield.WaterYieldObserveActivity" />
+        <activity android:name=".ui.wateryield.WaterYieldAddObservePointActivity"
+            android:windowSoftInputMode="adjustPan"/>
+        <activity android:name=".ui.wateryield.WaterYieldHomeActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/home/fragment/HomeFragment.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/home/fragment/HomeFragment.kt
index d804910..4026d80 100644
--- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/home/fragment/HomeFragment.kt
+++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/home/fragment/HomeFragment.kt
@@ -16,7 +16,7 @@ import com.zmkg.coaloperation.superfuntion.onPageChangeCallback
 import com.zmkg.coaloperation.ui.home.adapter.HomeMenuAdapter
 import com.zmkg.coaloperation.ui.home.bean.HomeMenuBean
 import com.zmkg.coaloperation.ui.home.viewmodel.HomeViewModel
-import com.zmkg.coaloperation.ui.wateryield.WaterYieldObserveActivity
+import com.zmkg.coaloperation.ui.wateryield.WaterYieldHomeActivity
 import com.zmkg.coaloperation.utils.DictUtils
 
 
@@ -78,7 +78,7 @@ class HomeFragment :
 
         val menuList = mutableListOf(
             HomeMenuBean(index = 1, name = "涌水量观测", type = 0, onClick = {
-                toActivity(WaterYieldObserveActivity::class.java)
+                toActivity(WaterYieldHomeActivity::class.java)
             }),
             HomeMenuBean(index = 2, name = "导线测量", type = 0),
             HomeMenuBean(index = 3, name = "瓦斯巡检", type = 0),
diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldAddObservePointActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldAddObservePointActivity.kt
new file mode 100644
index 0000000..c235b84
--- /dev/null
+++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldAddObservePointActivity.kt
@@ -0,0 +1,29 @@
+package com.zmkg.coaloperation.ui.wateryield
+
+import android.os.Bundle
+import android.view.View
+import com.zmkg.coaloperation.R
+import com.zmkg.coaloperation.base.BaseVMBActivity
+import com.zmkg.coaloperation.base.viewmodel.TestViewModel
+import com.zmkg.coaloperation.databinding.ActivityAboutUsBinding
+import com.zmkg.coaloperation.databinding.ActivityWaterYieldAddObservePointBinding
+
+/**
+ * 涌水量添加观测点
+ */
+class WaterYieldAddObservePointActivity : BaseVMBActivity<TestViewModel, ActivityWaterYieldAddObservePointBinding>(R.layout.activity_water_yield_add_observe_point) {
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.toolbarLay.title = "添加观测点"
+//        mBinding.toolbarLay.rightText = "添加观测点"
+    }
+
+    override fun initData() {
+    }
+
+    override fun bindEvent() {
+    }
+
+    override fun processClick(v: View?) {
+    }
+
+}
\ No newline at end of file
diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldHomeActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldHomeActivity.kt
new file mode 100644
index 0000000..05756a8
--- /dev/null
+++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldHomeActivity.kt
@@ -0,0 +1,103 @@
+package com.zmkg.coaloperation.ui.wateryield
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.zmkg.coaloperation.R
+import com.zmkg.coaloperation.adapter.WaterYieldObserveAdapter
+import com.zmkg.coaloperation.base.BaseVMBActivity
+import com.zmkg.coaloperation.base.viewmodel.TestViewModel
+import com.zmkg.coaloperation.bean.WorkOption
+import com.zmkg.coaloperation.databinding.ActivityWaterYieldHomeBinding
+import com.zmkg.coaloperation.db.entity.water.WaterYieldObserveEntity
+import com.zmkg.coaloperation.utils.PickerUtil
+
+/**
+ * 涌水量观察首页
+ */
+class WaterYieldHomeActivity :
+    BaseVMBActivity<TestViewModel, ActivityWaterYieldHomeBinding>(R.layout.activity_water_yield_home) {
+
+    val observeList: MutableList<WaterYieldObserveEntity> = mutableListOf()
+    val observeAdapter by lazy {
+        WaterYieldObserveAdapter(observeList).apply {
+            setOnItemClickListener { adapter, view, position ->
+                toActivity(WaterYieldObserveActivity::class.java)
+            }
+        }
+    }
+
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.toolbarLay.title = "涌水量观测"
+        mBinding.toolbarLay.rightText = "添加观测点"
+        mBinding.toolbarLay.titleTvRight.setOnClickListener {
+            toActivity(WaterYieldAddObservePointActivity::class.java)
+        }
+        initTestObserveData()
+        mBinding.rvWaterYield.let {
+            it.layoutManager = LinearLayoutManager(this)
+            it.adapter = observeAdapter
+        }
+    }
+
+    private fun initTestObserveData() {
+        observeList.run {
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点A", observeTime = "2024-09-01 15:15:00", observeState = "0"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点B", observeTime = "2024-10-09 10:36:00", observeState = "0"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点C", observeTime = "2024-11-13 16:56:00", observeState = "0"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点D", observeTime = "2024-12-19 12:13:00", observeState = "0"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点E", observeTime = "2025-01-09 08:36:00", observeState = "1"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点F", observeTime = "2025-02-20 18:20:00", observeState = "1"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点G", observeTime = "2025-03-09 11:25:00", observeState = "1"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点H", observeTime = "2025-04-30 13:30:00", observeState = "1"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点I", observeTime = "2025-05-06 07:55:00", observeState = "1"
+            ))
+            add(WaterYieldObserveEntity(
+                observeId = 1, observePoint = "观测点J", observeTime = "2025-06-08 14:13:00", observeState = "1"
+            ))
+        }
+    }
+
+    override fun initData() {
+    }
+
+    override fun bindEvent() {
+        val list = mutableListOf<WorkOption>()
+        list.add(WorkOption("1", "观测点A"))
+        list.add(WorkOption("2", "观测点B"))
+        list.add(WorkOption("3", "观测点C"))
+        list.add(WorkOption("4", "观测点D"))
+        list.add(WorkOption("5", "观测点E"))
+        list.add(WorkOption("6", "观测点F"))
+        list.add(WorkOption("7", "观测点G"))
+        list.add(WorkOption("8", "观测点H"))
+        mBinding.llSelectObservePoint.setOnClickListener {
+            PickerUtil.showOptionPicker(this, "请选择观测点", list) { option ->
+                mBinding.tvObservePoint.let {
+                    it.text = option.name
+                    it.tag = option.id
+                }
+            }
+        }
+    }
+
+    override fun processClick(v: View?) {
+    }
+}
\ No newline at end of file
diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveActivity.kt
index 129a1da..9f931f7 100644
--- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveActivity.kt
+++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveActivity.kt
@@ -10,87 +10,52 @@ import com.zmkg.coaloperation.base.viewmodel.TestViewModel
 import com.zmkg.coaloperation.bean.WorkOption
 import com.zmkg.coaloperation.databinding.ActivityWaterYieldObserveBinding
 import com.zmkg.coaloperation.db.entity.water.WaterYieldObserveEntity
+import com.zmkg.coaloperation.utils.DictUtils
 import com.zmkg.coaloperation.utils.PickerUtil
 
 /**
- * 关于我们
+ * 观测页面
  */
 class WaterYieldObserveActivity :
     BaseVMBActivity<TestViewModel, ActivityWaterYieldObserveBinding>(R.layout.activity_water_yield_observe) {
 
-    val observeList: MutableList<WaterYieldObserveEntity> = mutableListOf()
-    val observeAdapter by lazy {
-        WaterYieldObserveAdapter(observeList).apply {
-            setOnItemClickListener { adapter, view, position ->
-
-            }
-        }
-    }
 
     override fun initView(savedInstanceState: Bundle?) {
         mBinding.toolbarLay.title = "涌水量观测"
-        mBinding.toolbarLay.rightText = "添加观测点"
-        mBinding.toolbarLay.titleTvRight.setOnClickListener {
-
-        }
-        initTestObserveData()
-        mBinding.rvWaterYield.let {
-            it.layoutManager = LinearLayoutManager(this)
-            it.adapter = observeAdapter
-        }
+//        mBinding.toolbarLay.rightText = "添加观测点"
+//        mBinding.toolbarLay.titleTvRight.setOnClickListener {
+//            toActivity(WaterYieldAddObservePointActivity::class.java)
+//        }
     }
 
-    private fun initTestObserveData() {
-        observeList.run {
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点A", observeTime = "2024-09-01 15:15:00", observeState = "0"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点B", observeTime = "2024-10-09 10:36:00", observeState = "0"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点C", observeTime = "2024-11-13 16:56:00", observeState = "0"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点D", observeTime = "2024-12-19 12:13:00", observeState = "0"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点E", observeTime = "2025-01-09 08:36:00", observeState = "1"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点F", observeTime = "2025-02-20 18:20:00", observeState = "1"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点G", observeTime = "2025-03-09 11:25:00", observeState = "1"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点H", observeTime = "2025-04-30 13:30:00", observeState = "1"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点I", observeTime = "2025-05-06 07:55:00", observeState = "1"
-            ))
-            add(WaterYieldObserveEntity(
-                observeId = 1, observePoint = "观测点J", observeTime = "2025-06-08 14:13:00", observeState = "1"
-            ))
-        }
-    }
 
     override fun initData() {
     }
 
     override fun bindEvent() {
-        val list = mutableListOf<WorkOption>()
-        list.add(WorkOption("1", "观测点A"))
-        list.add(WorkOption("2", "观测点B"))
-        list.add(WorkOption("3", "观测点C"))
-        list.add(WorkOption("4", "观测点D"))
-        list.add(WorkOption("5", "观测点E"))
-        list.add(WorkOption("6", "观测点F"))
-        list.add(WorkOption("7", "观测点G"))
-        list.add(WorkOption("8", "观测点H"))
-        mBinding.llSelectObservePoint.setOnClickListener {
-            PickerUtil.showOptionPicker(this, "请选择观测点", list) { option ->
-                mBinding.tvObservePoint.let {
+        val methodList = mutableListOf(
+            WorkOption(id = "1", name = "浮标法"),
+            WorkOption(id = "2", name = "容积法")
+        )
+        mBinding.tvObserveMethod.setOnClickListener {
+            PickerUtil.showOptionPicker(this, "请选择观测方法", methodList) { option ->
+              mBinding.tvObserveMethod.let {
+                  it.text = option.name
+                  it.tag = option.id
+              }
+            }
+        }
+
+        val personList = mutableListOf(
+            WorkOption(id = "1", name = "张三"),
+            WorkOption(id = "2", name = "李四"),
+            WorkOption(id = "3", name = "王五"),
+            WorkOption(id = "4", name = "赵六"),
+            WorkOption(id = "5", name = "刘七")
+        )
+        mBinding.tvObservePerson.setOnClickListener {
+            PickerUtil.showOptionPicker(this, "请选择观测人", personList) { option ->
+                mBinding.tvObservePerson.let {
                     it.text = option.name
                     it.tag = option.id
                 }
diff --git a/coalMiningApp/app/src/main/res/drawable/bg_stroke_gray.xml b/coalMiningApp/app/src/main/res/drawable/bg_stroke_gray.xml
index c1f17ab..1929cac 100644
--- a/coalMiningApp/app/src/main/res/drawable/bg_stroke_gray.xml
+++ b/coalMiningApp/app/src/main/res/drawable/bg_stroke_gray.xml
@@ -4,7 +4,7 @@
     <stroke
         android:width="1dp"
         android:color="#282C38" />
-    <solid android:color="#17181c" />
+    <solid android:color="#17181C" />
     <corners
         android:radius="10dp" />
 </shape>
\ No newline at end of file
diff --git a/coalMiningApp/app/src/main/res/layout/activity_water_yield_add_observe_point.xml b/coalMiningApp/app/src/main/res/layout/activity_water_yield_add_observe_point.xml
new file mode 100644
index 0000000..fa3fc95
--- /dev/null
+++ b/coalMiningApp/app/src/main/res/layout/activity_water_yield_add_observe_point.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black_bg"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/lay_title_right_bar" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                android:background="@drawable/bg_stroke_gray"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:gravity="center_vertical"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="start|center_vertical"
+                        android:text="业务类型"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tvBusinessType"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="end|center_vertical"
+                        android:background="@color/transparent"
+                        android:ellipsize="end"
+                        android:gravity="end|center_vertical"
+                        android:maxLines="1"
+                        android:text="涌水量观测"
+                        android:textColor="@color/white"
+                        android:textSize="16sp" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="分区名称"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tvAreaName"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
+                        android:drawablePadding="12dp"
+                        android:hint="请选择"
+                        android:paddingStart="5dp"
+                        android:paddingTop="3dp"
+                        android:paddingEnd="5dp"
+                        android:paddingBottom="3dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#6A6F87"
+                        android:textSize="16sp"
+                        app:drawableEndCompat="@drawable/ic_point_arrow_right" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="观测人"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tvObservePerson"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
+                        android:drawablePadding="12dp"
+                        android:hint="请选择"
+                        android:paddingStart="5dp"
+                        android:paddingTop="3dp"
+                        android:paddingEnd="5dp"
+                        android:paddingBottom="3dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#6A6F87"
+                        android:textSize="16sp"
+                        app:drawableEndCompat="@drawable/ic_point_arrow_right" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="回风巷长度"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <EditText
+                        android:id="@+id/etAirReturnRoadway"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginStart="10dp"
+                        android:background="@drawable/bg_solid_black"
+                        android:gravity="center_vertical"
+                        android:hint="请输入"
+                        android:maxWidth="100dp"
+                        android:maxLines="1"
+                        android:minWidth="80dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#6A6F87"
+                        android:textCursorDrawable="@drawable/cursor_white"
+                        android:textSize="16sp" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="X"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <EditText
+                        android:id="@+id/etInputX"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginStart="10dp"
+                        android:background="@drawable/bg_solid_black"
+                        android:gravity="center_vertical"
+                        android:hint="请输入"
+                        android:maxWidth="100dp"
+                        android:maxLines="1"
+                        android:minWidth="80dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#6A6F87"
+                        android:textCursorDrawable="@drawable/cursor_white"
+                        android:textSize="16sp" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="Y"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <EditText
+                        android:id="@+id/etInputY"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginStart="10dp"
+                        android:background="@drawable/bg_solid_black"
+                        android:gravity="center_vertical"
+                        android:hint="请输入"
+                        android:maxWidth="100dp"
+                        android:maxLines="1"
+                        android:minWidth="80dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#6A6F87"
+                        android:textCursorDrawable="@drawable/cursor_white"
+                        android:textSize="16sp" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="Z"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <EditText
+                        android:id="@+id/etInputZ"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginStart="10dp"
+                        android:background="@drawable/bg_solid_black"
+                        android:gravity="center_vertical"
+                        android:hint="请输入"
+                        android:maxWidth="100dp"
+                        android:maxLines="1"
+                        android:minWidth="80dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#6A6F87"
+                        android:textCursorDrawable="@drawable/cursor_white"
+                        android:textSize="16sp" />
+                </FrameLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="20dp"
+                    android:gravity="center_vertical"
+                    android:text="备注"
+                    android:textColor="#6A6F87"
+                    android:textSize="16sp" />
+
+                <EditText
+                    android:id="@+id/etRemark"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="15dp"
+                    android:layout_marginBottom="10dp"
+                    android:background="@color/transparent"
+                    android:gravity="top"
+                    android:hint="请输入备注内容，120字以内"
+                    android:lines="3"
+                    android:maxLength="120"
+                    android:padding="5dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="@color/white"
+                    android:textCursorDrawable="@drawable/cursor_white"
+                    android:textSize="16sp" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <com.allen.library.shape.ShapeButton
+            android:id="@+id/btAddObservePoint"
+            android:layout_width="250dp"
+            android:layout_height="50dp"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:gravity="center"
+            android:text="添加"
+            android:textColor="@color/white"
+            android:textSize="18sp"
+            app:shapeCornersRadius="36dp"
+            app:shapeSolidColor="#21A69A" />
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/coalMiningApp/app/src/main/res/layout/activity_water_yield_home.xml b/coalMiningApp/app/src/main/res/layout/activity_water_yield_home.xml
new file mode 100644
index 0000000..d45f0e8
--- /dev/null
+++ b/coalMiningApp/app/src/main/res/layout/activity_water_yield_home.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black_bg"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/lay_title_right_bar" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:baselineAligned="false"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:paddingHorizontal="20dp">
+
+            <com.allen.library.shape.ShapeLinearLayout
+                android:id="@+id/llSelectObservePoint"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                app:shapeCornersRadius="10dp"
+                android:gravity="center"
+                app:shapeSolidColor="#17181C">
+
+                <TextView
+                    android:id="@+id/tvObservePoint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:hint="请选择观测点"
+                    app:drawableEndCompat="@drawable/ic_arrow_down_gray"
+                    app:shapeCornersRadius="10dp"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:drawablePadding="10dp"
+                    app:shapeSolidColor="#17181C"
+                    android:textSize="14sp"
+                    android:textColor="@color/white"
+                    android:textColorHint="@color/hint_text_color2" />
+
+            </com.allen.library.shape.ShapeLinearLayout>
+
+            <com.allen.library.shape.ShapeLinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1.24"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dp"
+                app:shapeCornersRadius="10dp"
+                android:gravity="center"
+                app:shapeSolidColor="#17181C" >
+
+                <EditText
+                    android:id="@+id/etInputText"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:hint="请输入搜索内容"
+                    app:drawableStartCompat="@drawable/ic_search_gray"
+                    app:shapeCornersRadius="10dp"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:drawablePadding="10dp"
+                    app:shapeSolidColor="#17181C"
+                    android:textSize="14sp"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginEnd="15dp"
+                    android:textColor="@color/white"
+                    android:textCursorDrawable="@drawable/cursor_white"
+                    android:background="@color/transparent"
+                    android:textColorHint="@color/hint_text_color2" />
+
+            </com.allen.library.shape.ShapeLinearLayout>
+
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvWaterYield"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="8dp"
+                tools:listitem="@layout/list_item_water_yield_observe"
+                android:overScrollMode="never" />
+
+            <com.allen.library.shape.ShapeButton
+                android:id="@+id/btnStopObserve"
+                android:layout_width="250dp"
+                android:layout_height="50dp"
+                android:layout_gravity="bottom|center_horizontal"
+                android:gravity="center"
+                android:textSize="18sp"
+                android:text="结束观测"
+                android:layout_marginBottom="20dp"
+                android:textColor="@color/white"
+                app:shapeCornersRadius="36dp"
+                app:shapeSolidColor="#21A69A" />
+        </FrameLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml b/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml
index d45f0e8..31e08ed 100644
--- a/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml
+++ b/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml
@@ -17,98 +17,149 @@
             android:id="@+id/toolbar_lay"
             layout="@layout/lay_title_right_bar" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:baselineAligned="false"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:paddingHorizontal="20dp">
-
-            <com.allen.library.shape.ShapeLinearLayout
-                android:id="@+id/llSelectObservePoint"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                app:shapeCornersRadius="10dp"
-                android:gravity="center"
-                app:shapeSolidColor="#17181C">
-
-                <TextView
-                    android:id="@+id/tvObservePoint"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:hint="请选择观测点"
-                    app:drawableEndCompat="@drawable/ic_arrow_down_gray"
-                    app:shapeCornersRadius="10dp"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:drawablePadding="10dp"
-                    app:shapeSolidColor="#17181C"
-                    android:textSize="14sp"
-                    android:textColor="@color/white"
-                    android:textColorHint="@color/hint_text_color2" />
-
-            </com.allen.library.shape.ShapeLinearLayout>
-
-            <com.allen.library.shape.ShapeLinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1.24"
-                android:layout_height="match_parent"
-                android:layout_marginStart="10dp"
-                app:shapeCornersRadius="10dp"
-                android:gravity="center"
-                app:shapeSolidColor="#17181C" >
-
-                <EditText
-                    android:id="@+id/etInputText"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:hint="请输入搜索内容"
-                    app:drawableStartCompat="@drawable/ic_search_gray"
-                    app:shapeCornersRadius="10dp"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:drawablePadding="10dp"
-                    app:shapeSolidColor="#17181C"
-                    android:textSize="14sp"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginEnd="15dp"
-                    android:textColor="@color/white"
-                    android:textCursorDrawable="@drawable/cursor_white"
-                    android:background="@color/transparent"
-                    android:textColorHint="@color/hint_text_color2" />
-
-            </com.allen.library.shape.ShapeLinearLayout>
-
-        </LinearLayout>
-
-        <FrameLayout
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rvWaterYield"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                tools:listitem="@layout/list_item_water_yield_observe"
-                android:overScrollMode="never" />
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:background="@drawable/bg_stroke_gray"
+                    android:layout_marginHorizontal="20dp">
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp"
+                        android:background="@drawable/bottom_border"
+                        android:paddingStart="20dp"
+                        android:paddingEnd="15dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="观测点"
+                            android:textColor="#6A6F87"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/tvObservePoint"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="end|center_vertical"
+                            android:drawablePadding="12dp"
+                            android:hint="请选择"
+                            android:paddingStart="5dp"
+                            android:paddingTop="3dp"
+                            android:paddingEnd="5dp"
+                            android:paddingBottom="3dp"
+                            android:textColor="@color/white"
+                            android:textColorHint="#6A6F87"
+                            android:textSize="16sp"
+                            app:drawableEndCompat="@drawable/ic_point_arrow_right" />
+                    </FrameLayout>
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp"
+                        android:background="@drawable/bottom_border"
+                        android:paddingStart="20dp"
+                        android:paddingEnd="15dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="观测点坐标"
+                            android:textColor="#6A6F87"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/tvObservePointValue"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="end|center_vertical"
+                            android:drawablePadding="12dp"
+                            android:hint="请选择"
+                            android:paddingStart="5dp"
+                            android:paddingTop="3dp"
+                            android:paddingEnd="5dp"
+                            android:paddingBottom="3dp"
+                            android:textColor="@color/white"
+                            android:textColorHint="#6A6F87"
+                            android:textSize="16sp"
+                            app:drawableEndCompat="@drawable/ic_point_arrow_right" />
+                    </FrameLayout>
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp"
+                        android:paddingStart="20dp"
+                        android:paddingEnd="15dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="观测人"
+                            android:textColor="#6A6F87"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/tvObservePerson"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="end|center_vertical"
+                            android:drawablePadding="12dp"
+                            android:hint="请选择"
+                            android:paddingStart="5dp"
+                            android:paddingTop="3dp"
+                            android:paddingEnd="5dp"
+                            android:paddingBottom="3dp"
+                            android:textColor="@color/white"
+                            android:textColorHint="#6A6F87"
+                            android:textSize="16sp"
+                            app:drawableEndCompat="@drawable/ic_point_arrow_right" />
+                    </FrameLayout>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_marginStart="20dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="观测方法"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tvObserveMethod"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="end|center_vertical"
+                        android:drawablePadding="12dp"
+                        android:hint="请选择"
+                        android:gravity="center_vertical"
+                        android:layout_marginStart="10dp"
+                        android:paddingStart="5dp"
+                        android:paddingTop="3dp"
+                        android:paddingEnd="5dp"
+                        android:paddingBottom="3dp"
+                        android:textColor="#A3FEA6"
+                        android:textColorHint="#A3FEA6"
+                        android:textSize="16sp"
+                        app:drawableEndCompat="@drawable/ic_arrow_down_white" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </ScrollView>
 
-            <com.allen.library.shape.ShapeButton
-                android:id="@+id/btnStopObserve"
-                android:layout_width="250dp"
-                android:layout_height="50dp"
-                android:layout_gravity="bottom|center_horizontal"
-                android:gravity="center"
-                android:textSize="18sp"
-                android:text="结束观测"
-                android:layout_marginBottom="20dp"
-                android:textColor="@color/white"
-                app:shapeCornersRadius="36dp"
-                app:shapeSolidColor="#21A69A" />
-        </FrameLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file