diff --git a/coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_location.png b/coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_location.png
new file mode 100644
index 0000000..ca648f2
Binary files /dev/null and b/coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_location.png differ
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 31e08ed..da928d7 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,7 +17,7 @@
             android:id="@+id/toolbar_lay"
             layout="@layout/lay_title_right_bar" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <LinearLayout
@@ -25,6 +25,19 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+                <TextView
+                    android:id="@+id/tvCoalLocation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="50dp"
+                    android:drawablePadding="10dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="定位"
+                    android:gravity="center_vertical"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    app:drawableStartCompat="@drawable/ic_location" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -157,9 +170,173 @@
                         android:textSize="16sp"
                         app:drawableEndCompat="@drawable/ic_arrow_down_white" />
                 </LinearLayout>
+                <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="容积体积(L)"
+                            android:textColor="#6A6F87"
+                            android:textSize="16sp" />
+
+                        <EditText
+                            android:id="@+id/etInputVolume"
+                            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="装满容积时间(s)"
+                            android:textColor="#6A6F87"
+                            android:textSize="16sp" />
+
+                        <EditText
+                            android:id="@+id/etInputSecond"
+                            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>
+
+                </LinearLayout>
+
+                <com.allen.library.shape.ShapeButton
+                    android:id="@+id/btnCalculate"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:gravity="center"
+                    android:textSize="18sp"
+                    android:text="计算"
+                    android:layout_marginHorizontal="20dp"
+                    android:layout_marginVertical="20dp"
+                    android:textColor="@color/white"
+                    app:shapeCornersRadius="36dp"
+                    app:shapeSolidColor="#21A69A" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:background="@drawable/bg_stroke_gray">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="涌水量(m /h)："
+                        android:layout_marginStart="20dp"
+                        android:textColor="@color/white"
+                        android:textSize="18sp" />
+
+                    <TextView
+                        android:id="@+id/tvWaterYieldValue"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
+                        android:gravity="center_vertical"
+                        android:layout_marginStart="3dp"
+                        android:maxLines="1"
+                        android:includeFontPadding="false"
+                        android:textColor="#A3FEA6"
+                        android:text="10"
+                        android:textSize="18sp" />
+                </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:background="@drawable/bg_stroke_gray">
+                <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="#A3FEA6"
+                    android:textSize="16sp" />
+                <com.google.android.material.divider.MaterialDivider
+                    android:id="@+id/divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    app:dividerColor="#282C38" />
+                <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="5"
+                    android:maxLength="120"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#6A6F87"
+                    android:textCursorDrawable="@drawable/cursor_white"
+                    android:textSize="16sp" />
             </LinearLayout>
-        </ScrollView>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 </layout>
\ No newline at end of file