diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d7c573..3fcef8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,6 +50,7 @@
         <activity
             android:name=".view.BigImageActivity"
             android:theme="@style/Theme.BigImageActivity" />
+        <activity android:name=".view.AlarmListByWellActivity" />
 
         <!--高德Key-->
         <meta-data

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d7c573..3fcef8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,6 +50,7 @@
         <activity
             android:name=".view.BigImageActivity"
             android:theme="@style/Theme.BigImageActivity" />
+        <activity android:name=".view.AlarmListByWellActivity" />
 
         <!--高德Key-->
         <meta-data
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
new file mode 100644
index 0000000..faef2da
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
@@ -0,0 +1,235 @@
+package com.casic.app.smartwell.sanxi.view
+
+import android.content.Context
+import android.os.Handler
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.casic.app.smartwell.sanxi.R
+import com.casic.app.smartwell.sanxi.adapter.AlarmListAdapter
+import com.casic.app.smartwell.sanxi.base.BaseActivity
+import com.casic.app.smartwell.sanxi.extensions.*
+import com.casic.app.smartwell.sanxi.model.AlarmListModel
+import com.casic.app.smartwell.sanxi.utils.*
+import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
+import com.jzxiang.pickerview.TimePickerDialog
+import com.jzxiang.pickerview.data.Type
+import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet
+import kotlinx.android.synthetic.main.activity_alarm_list_by_well.*
+import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
+
+class AlarmListByWellActivity : BaseActivity(), DrawerLayout.DrawerListener {
+
+    private val context: Context = this@AlarmListByWellActivity
+    private lateinit var weakReferenceHandler: WeakReferenceHandler
+    private lateinit var alarmViewModel: AlarmViewModel
+    private lateinit var alarmListAdapter: AlarmListAdapter
+    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var keywords = ""
+    private var alarmContent = ""
+    private var pageIndex = 1
+    private var isRefresh = false
+    private var isLoadMore = false
+
+    override fun initLayoutView(): Int = R.layout.activity_alarm_list_by_well
+
+    override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "告警记录"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
+    }
+
+    override fun initData() {
+        keywords = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        weakReferenceHandler = WeakReferenceHandler(callback)
+        //告警类型
+        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        //默认加载所有数据
+        obtainAlarmListByPage()
+    }
+
+    override fun initEvent() {
+        resultRefreshLayout.setOnRefreshListener {
+            isRefresh = true
+            //刷新之后页码重置
+            pageIndex = 1
+            obtainAlarmListByPage()
+        }
+        resultRefreshLayout.setOnLoadMoreListener {
+            isLoadMore = true
+            pageIndex++
+            obtainAlarmListByPage()
+        }
+
+        alarmViewModel.listModel.observe(this, {
+            if (it.code == 200) {
+                val dataRows = it.data?.rows
+                when {
+                    isRefresh -> {
+                        dataBeans.clear()
+                        dataBeans = dataRows!!
+                        resultRefreshLayout.finishRefresh()
+                        isRefresh = false
+                    }
+                    isLoadMore -> {
+                        if (dataRows?.size == 0) {
+                            "到底了，别拉了".show()
+                        }
+                        dataBeans.addAll(dataRows!!)
+                        resultRefreshLayout.finishLoadMore()
+                        isLoadMore = false
+                    }
+                    else -> {
+                        dataBeans = dataRows!!
+                    }
+                }
+                weakReferenceHandler.sendEmptyMessage(2022061001)
+            }
+        })
+
+        alarmViewModel.contentModel.observe(this, {
+            if (it.code == 200) {
+                val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(this)
+                sheetBuilder.setTitle("告警内容")
+                it.data?.list?.forEach { dataBean ->
+                    sheetBuilder.addItem(dataBean.name)
+                }
+                sheetBuilder.setGravityCenter(true)
+                    .setOnSheetItemClickListener { dialog, _, position, tag ->
+                        alarmContentView.text = tag
+                        alarmContent = it.data!!.list!![position].value.toString()
+
+                        dialog.dismiss()
+                    }.build().show()
+            }
+        })
+    }
+
+    override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+
+    }
+
+    override fun onDrawerOpened(drawerView: View) {
+        val wellCodeView = drawerView.findViewById<TextView>(R.id.wellCodeView)
+        val alarmContentView = drawerView.findViewById<TextView>(R.id.alarmContentView)
+        val searchButton = drawerView.findViewById<Button>(R.id.searchButton)
+        val clearButton = drawerView.findViewById<Button>(R.id.clearButton)
+
+        wellCodeView.text = keywords
+
+        alarmContentView.setOnClickListener {
+            //获取类型对应的报警内容，只有运维才能看到设备异常的数据
+            alarmViewModel.obtainAlarmContent("1")
+        }
+
+        startTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择开始时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    startTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        endTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择结束时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) {
+                        "结束时间不合法，不能早于开始时间".show()
+                        return@setCallBack
+                    }
+                    endTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        searchButton.setOnClickListener {
+            pageIndex = 1
+            obtainAlarmListByPage()
+
+            rightDrawerLayout.closeDrawer(GravityCompat.END)
+        }
+
+        clearButton.setOnClickListener {
+            alarmContentView.text = ""
+            // alarmContent 也需要清空，不然查询依旧是上次选择的类型
+            alarmContent = ""
+            startTimeView.text = ""
+            endTimeView.text = ""
+        }
+    }
+
+    override fun onDrawerClosed(drawerView: View) {
+
+    }
+
+    override fun onDrawerStateChanged(newState: Int) {
+
+    }
+
+    private fun obtainAlarmListByPage() {
+        alarmViewModel.obtainAlarmList(
+            keywords, "", alarmContent, startTimeView.text.toString(),
+            endTimeView.text.toString(), "", pageIndex
+        )
+    }
+
+    private val callback = Handler.Callback {
+        if (it.what == 2022061001) {
+            if (isRefresh || isLoadMore) {
+                alarmListAdapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.showEmptyPage {
+                        pageIndex = 1
+                        obtainAlarmListByPage()
+                    }
+                } else {
+                    emptyView!!.hide()
+                    alarmListAdapter = AlarmListAdapter(this, dataBeans, false)
+                    resultRecyclerView!!.layoutManager = LinearLayoutManager(context)
+                    resultRecyclerView!!.adapter = alarmListAdapter
+                    alarmListAdapter.setOnItemClickListener(object :
+                        AlarmListAdapter.OnItemClickListener {
+                        override fun onClicked(position: Int) {
+                            val wellId = dataBeans[position].wellId.toString()
+                            if (wellId.isBlank()) {
+                                "井编号异常，无法查看详情".show()
+                                return
+                            }
+                            navigatePageTo<WellDetailActivity>(wellId)
+                        }
+
+                        override fun onOperationClicked(position: Int) {
+
+                        }
+                    })
+                }
+            }
+        }
+        true
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d7c573..3fcef8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,6 +50,7 @@
         <activity
             android:name=".view.BigImageActivity"
             android:theme="@style/Theme.BigImageActivity" />
+        <activity android:name=".view.AlarmListByWellActivity" />
 
         <!--高德Key-->
         <meta-data
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
new file mode 100644
index 0000000..faef2da
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
@@ -0,0 +1,235 @@
+package com.casic.app.smartwell.sanxi.view
+
+import android.content.Context
+import android.os.Handler
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.casic.app.smartwell.sanxi.R
+import com.casic.app.smartwell.sanxi.adapter.AlarmListAdapter
+import com.casic.app.smartwell.sanxi.base.BaseActivity
+import com.casic.app.smartwell.sanxi.extensions.*
+import com.casic.app.smartwell.sanxi.model.AlarmListModel
+import com.casic.app.smartwell.sanxi.utils.*
+import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
+import com.jzxiang.pickerview.TimePickerDialog
+import com.jzxiang.pickerview.data.Type
+import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet
+import kotlinx.android.synthetic.main.activity_alarm_list_by_well.*
+import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
+
+class AlarmListByWellActivity : BaseActivity(), DrawerLayout.DrawerListener {
+
+    private val context: Context = this@AlarmListByWellActivity
+    private lateinit var weakReferenceHandler: WeakReferenceHandler
+    private lateinit var alarmViewModel: AlarmViewModel
+    private lateinit var alarmListAdapter: AlarmListAdapter
+    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var keywords = ""
+    private var alarmContent = ""
+    private var pageIndex = 1
+    private var isRefresh = false
+    private var isLoadMore = false
+
+    override fun initLayoutView(): Int = R.layout.activity_alarm_list_by_well
+
+    override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "告警记录"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
+    }
+
+    override fun initData() {
+        keywords = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        weakReferenceHandler = WeakReferenceHandler(callback)
+        //告警类型
+        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        //默认加载所有数据
+        obtainAlarmListByPage()
+    }
+
+    override fun initEvent() {
+        resultRefreshLayout.setOnRefreshListener {
+            isRefresh = true
+            //刷新之后页码重置
+            pageIndex = 1
+            obtainAlarmListByPage()
+        }
+        resultRefreshLayout.setOnLoadMoreListener {
+            isLoadMore = true
+            pageIndex++
+            obtainAlarmListByPage()
+        }
+
+        alarmViewModel.listModel.observe(this, {
+            if (it.code == 200) {
+                val dataRows = it.data?.rows
+                when {
+                    isRefresh -> {
+                        dataBeans.clear()
+                        dataBeans = dataRows!!
+                        resultRefreshLayout.finishRefresh()
+                        isRefresh = false
+                    }
+                    isLoadMore -> {
+                        if (dataRows?.size == 0) {
+                            "到底了，别拉了".show()
+                        }
+                        dataBeans.addAll(dataRows!!)
+                        resultRefreshLayout.finishLoadMore()
+                        isLoadMore = false
+                    }
+                    else -> {
+                        dataBeans = dataRows!!
+                    }
+                }
+                weakReferenceHandler.sendEmptyMessage(2022061001)
+            }
+        })
+
+        alarmViewModel.contentModel.observe(this, {
+            if (it.code == 200) {
+                val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(this)
+                sheetBuilder.setTitle("告警内容")
+                it.data?.list?.forEach { dataBean ->
+                    sheetBuilder.addItem(dataBean.name)
+                }
+                sheetBuilder.setGravityCenter(true)
+                    .setOnSheetItemClickListener { dialog, _, position, tag ->
+                        alarmContentView.text = tag
+                        alarmContent = it.data!!.list!![position].value.toString()
+
+                        dialog.dismiss()
+                    }.build().show()
+            }
+        })
+    }
+
+    override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+
+    }
+
+    override fun onDrawerOpened(drawerView: View) {
+        val wellCodeView = drawerView.findViewById<TextView>(R.id.wellCodeView)
+        val alarmContentView = drawerView.findViewById<TextView>(R.id.alarmContentView)
+        val searchButton = drawerView.findViewById<Button>(R.id.searchButton)
+        val clearButton = drawerView.findViewById<Button>(R.id.clearButton)
+
+        wellCodeView.text = keywords
+
+        alarmContentView.setOnClickListener {
+            //获取类型对应的报警内容，只有运维才能看到设备异常的数据
+            alarmViewModel.obtainAlarmContent("1")
+        }
+
+        startTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择开始时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    startTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        endTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择结束时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) {
+                        "结束时间不合法，不能早于开始时间".show()
+                        return@setCallBack
+                    }
+                    endTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        searchButton.setOnClickListener {
+            pageIndex = 1
+            obtainAlarmListByPage()
+
+            rightDrawerLayout.closeDrawer(GravityCompat.END)
+        }
+
+        clearButton.setOnClickListener {
+            alarmContentView.text = ""
+            // alarmContent 也需要清空，不然查询依旧是上次选择的类型
+            alarmContent = ""
+            startTimeView.text = ""
+            endTimeView.text = ""
+        }
+    }
+
+    override fun onDrawerClosed(drawerView: View) {
+
+    }
+
+    override fun onDrawerStateChanged(newState: Int) {
+
+    }
+
+    private fun obtainAlarmListByPage() {
+        alarmViewModel.obtainAlarmList(
+            keywords, "", alarmContent, startTimeView.text.toString(),
+            endTimeView.text.toString(), "", pageIndex
+        )
+    }
+
+    private val callback = Handler.Callback {
+        if (it.what == 2022061001) {
+            if (isRefresh || isLoadMore) {
+                alarmListAdapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.showEmptyPage {
+                        pageIndex = 1
+                        obtainAlarmListByPage()
+                    }
+                } else {
+                    emptyView!!.hide()
+                    alarmListAdapter = AlarmListAdapter(this, dataBeans, false)
+                    resultRecyclerView!!.layoutManager = LinearLayoutManager(context)
+                    resultRecyclerView!!.adapter = alarmListAdapter
+                    alarmListAdapter.setOnItemClickListener(object :
+                        AlarmListAdapter.OnItemClickListener {
+                        override fun onClicked(position: Int) {
+                            val wellId = dataBeans[position].wellId.toString()
+                            if (wellId.isBlank()) {
+                                "井编号异常，无法查看详情".show()
+                                return
+                            }
+                            navigatePageTo<WellDetailActivity>(wellId)
+                        }
+
+                        override fun onOperationClicked(position: Int) {
+
+                        }
+                    })
+                }
+            }
+        }
+        true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
index 34a18dd..a23129f 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
@@ -228,7 +228,6 @@
         )
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     private val callback = Handler.Callback {
         if (it.what == 2022060802) {
             if (isRefresh || isLoadMore) {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d7c573..3fcef8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,6 +50,7 @@
         <activity
             android:name=".view.BigImageActivity"
             android:theme="@style/Theme.BigImageActivity" />
+        <activity android:name=".view.AlarmListByWellActivity" />
 
         <!--高德Key-->
         <meta-data
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
new file mode 100644
index 0000000..faef2da
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
@@ -0,0 +1,235 @@
+package com.casic.app.smartwell.sanxi.view
+
+import android.content.Context
+import android.os.Handler
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.casic.app.smartwell.sanxi.R
+import com.casic.app.smartwell.sanxi.adapter.AlarmListAdapter
+import com.casic.app.smartwell.sanxi.base.BaseActivity
+import com.casic.app.smartwell.sanxi.extensions.*
+import com.casic.app.smartwell.sanxi.model.AlarmListModel
+import com.casic.app.smartwell.sanxi.utils.*
+import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
+import com.jzxiang.pickerview.TimePickerDialog
+import com.jzxiang.pickerview.data.Type
+import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet
+import kotlinx.android.synthetic.main.activity_alarm_list_by_well.*
+import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
+
+class AlarmListByWellActivity : BaseActivity(), DrawerLayout.DrawerListener {
+
+    private val context: Context = this@AlarmListByWellActivity
+    private lateinit var weakReferenceHandler: WeakReferenceHandler
+    private lateinit var alarmViewModel: AlarmViewModel
+    private lateinit var alarmListAdapter: AlarmListAdapter
+    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var keywords = ""
+    private var alarmContent = ""
+    private var pageIndex = 1
+    private var isRefresh = false
+    private var isLoadMore = false
+
+    override fun initLayoutView(): Int = R.layout.activity_alarm_list_by_well
+
+    override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "告警记录"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
+    }
+
+    override fun initData() {
+        keywords = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        weakReferenceHandler = WeakReferenceHandler(callback)
+        //告警类型
+        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        //默认加载所有数据
+        obtainAlarmListByPage()
+    }
+
+    override fun initEvent() {
+        resultRefreshLayout.setOnRefreshListener {
+            isRefresh = true
+            //刷新之后页码重置
+            pageIndex = 1
+            obtainAlarmListByPage()
+        }
+        resultRefreshLayout.setOnLoadMoreListener {
+            isLoadMore = true
+            pageIndex++
+            obtainAlarmListByPage()
+        }
+
+        alarmViewModel.listModel.observe(this, {
+            if (it.code == 200) {
+                val dataRows = it.data?.rows
+                when {
+                    isRefresh -> {
+                        dataBeans.clear()
+                        dataBeans = dataRows!!
+                        resultRefreshLayout.finishRefresh()
+                        isRefresh = false
+                    }
+                    isLoadMore -> {
+                        if (dataRows?.size == 0) {
+                            "到底了，别拉了".show()
+                        }
+                        dataBeans.addAll(dataRows!!)
+                        resultRefreshLayout.finishLoadMore()
+                        isLoadMore = false
+                    }
+                    else -> {
+                        dataBeans = dataRows!!
+                    }
+                }
+                weakReferenceHandler.sendEmptyMessage(2022061001)
+            }
+        })
+
+        alarmViewModel.contentModel.observe(this, {
+            if (it.code == 200) {
+                val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(this)
+                sheetBuilder.setTitle("告警内容")
+                it.data?.list?.forEach { dataBean ->
+                    sheetBuilder.addItem(dataBean.name)
+                }
+                sheetBuilder.setGravityCenter(true)
+                    .setOnSheetItemClickListener { dialog, _, position, tag ->
+                        alarmContentView.text = tag
+                        alarmContent = it.data!!.list!![position].value.toString()
+
+                        dialog.dismiss()
+                    }.build().show()
+            }
+        })
+    }
+
+    override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+
+    }
+
+    override fun onDrawerOpened(drawerView: View) {
+        val wellCodeView = drawerView.findViewById<TextView>(R.id.wellCodeView)
+        val alarmContentView = drawerView.findViewById<TextView>(R.id.alarmContentView)
+        val searchButton = drawerView.findViewById<Button>(R.id.searchButton)
+        val clearButton = drawerView.findViewById<Button>(R.id.clearButton)
+
+        wellCodeView.text = keywords
+
+        alarmContentView.setOnClickListener {
+            //获取类型对应的报警内容，只有运维才能看到设备异常的数据
+            alarmViewModel.obtainAlarmContent("1")
+        }
+
+        startTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择开始时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    startTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        endTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择结束时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) {
+                        "结束时间不合法，不能早于开始时间".show()
+                        return@setCallBack
+                    }
+                    endTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        searchButton.setOnClickListener {
+            pageIndex = 1
+            obtainAlarmListByPage()
+
+            rightDrawerLayout.closeDrawer(GravityCompat.END)
+        }
+
+        clearButton.setOnClickListener {
+            alarmContentView.text = ""
+            // alarmContent 也需要清空，不然查询依旧是上次选择的类型
+            alarmContent = ""
+            startTimeView.text = ""
+            endTimeView.text = ""
+        }
+    }
+
+    override fun onDrawerClosed(drawerView: View) {
+
+    }
+
+    override fun onDrawerStateChanged(newState: Int) {
+
+    }
+
+    private fun obtainAlarmListByPage() {
+        alarmViewModel.obtainAlarmList(
+            keywords, "", alarmContent, startTimeView.text.toString(),
+            endTimeView.text.toString(), "", pageIndex
+        )
+    }
+
+    private val callback = Handler.Callback {
+        if (it.what == 2022061001) {
+            if (isRefresh || isLoadMore) {
+                alarmListAdapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.showEmptyPage {
+                        pageIndex = 1
+                        obtainAlarmListByPage()
+                    }
+                } else {
+                    emptyView!!.hide()
+                    alarmListAdapter = AlarmListAdapter(this, dataBeans, false)
+                    resultRecyclerView!!.layoutManager = LinearLayoutManager(context)
+                    resultRecyclerView!!.adapter = alarmListAdapter
+                    alarmListAdapter.setOnItemClickListener(object :
+                        AlarmListAdapter.OnItemClickListener {
+                        override fun onClicked(position: Int) {
+                            val wellId = dataBeans[position].wellId.toString()
+                            if (wellId.isBlank()) {
+                                "井编号异常，无法查看详情".show()
+                                return
+                            }
+                            navigatePageTo<WellDetailActivity>(wellId)
+                        }
+
+                        override fun onOperationClicked(position: Int) {
+
+                        }
+                    })
+                }
+            }
+        }
+        true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
index 34a18dd..a23129f 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
@@ -228,7 +228,6 @@
         )
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     private val callback = Handler.Callback {
         if (it.what == 2022060802) {
             if (isRefresh || isLoadMore) {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt
index 1202bd0..a1388ad 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt
@@ -214,7 +214,7 @@
                         }
 
                         override fun onHistoryClicked(position: Int) {
-
+                            navigatePageTo<AlarmListByWellActivity>(dataBeans[position].wellCode)
                         }
 
                         override fun onEditClicked(position: Int) {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d7c573..3fcef8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,6 +50,7 @@
         <activity
             android:name=".view.BigImageActivity"
             android:theme="@style/Theme.BigImageActivity" />
+        <activity android:name=".view.AlarmListByWellActivity" />
 
         <!--高德Key-->
         <meta-data
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
new file mode 100644
index 0000000..faef2da
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmListByWellActivity.kt
@@ -0,0 +1,235 @@
+package com.casic.app.smartwell.sanxi.view
+
+import android.content.Context
+import android.os.Handler
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.casic.app.smartwell.sanxi.R
+import com.casic.app.smartwell.sanxi.adapter.AlarmListAdapter
+import com.casic.app.smartwell.sanxi.base.BaseActivity
+import com.casic.app.smartwell.sanxi.extensions.*
+import com.casic.app.smartwell.sanxi.model.AlarmListModel
+import com.casic.app.smartwell.sanxi.utils.*
+import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
+import com.jzxiang.pickerview.TimePickerDialog
+import com.jzxiang.pickerview.data.Type
+import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet
+import kotlinx.android.synthetic.main.activity_alarm_list_by_well.*
+import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
+
+class AlarmListByWellActivity : BaseActivity(), DrawerLayout.DrawerListener {
+
+    private val context: Context = this@AlarmListByWellActivity
+    private lateinit var weakReferenceHandler: WeakReferenceHandler
+    private lateinit var alarmViewModel: AlarmViewModel
+    private lateinit var alarmListAdapter: AlarmListAdapter
+    private var dataBeans: MutableList<AlarmListModel.DataBean.RowsBean> = ArrayList()
+    private var keywords = ""
+    private var alarmContent = ""
+    private var pageIndex = 1
+    private var isRefresh = false
+    private var isLoadMore = false
+
+    override fun initLayoutView(): Int = R.layout.activity_alarm_list_by_well
+
+    override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "告警记录"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
+    }
+
+    override fun initData() {
+        keywords = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        weakReferenceHandler = WeakReferenceHandler(callback)
+        //告警类型
+        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        //默认加载所有数据
+        obtainAlarmListByPage()
+    }
+
+    override fun initEvent() {
+        resultRefreshLayout.setOnRefreshListener {
+            isRefresh = true
+            //刷新之后页码重置
+            pageIndex = 1
+            obtainAlarmListByPage()
+        }
+        resultRefreshLayout.setOnLoadMoreListener {
+            isLoadMore = true
+            pageIndex++
+            obtainAlarmListByPage()
+        }
+
+        alarmViewModel.listModel.observe(this, {
+            if (it.code == 200) {
+                val dataRows = it.data?.rows
+                when {
+                    isRefresh -> {
+                        dataBeans.clear()
+                        dataBeans = dataRows!!
+                        resultRefreshLayout.finishRefresh()
+                        isRefresh = false
+                    }
+                    isLoadMore -> {
+                        if (dataRows?.size == 0) {
+                            "到底了，别拉了".show()
+                        }
+                        dataBeans.addAll(dataRows!!)
+                        resultRefreshLayout.finishLoadMore()
+                        isLoadMore = false
+                    }
+                    else -> {
+                        dataBeans = dataRows!!
+                    }
+                }
+                weakReferenceHandler.sendEmptyMessage(2022061001)
+            }
+        })
+
+        alarmViewModel.contentModel.observe(this, {
+            if (it.code == 200) {
+                val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(this)
+                sheetBuilder.setTitle("告警内容")
+                it.data?.list?.forEach { dataBean ->
+                    sheetBuilder.addItem(dataBean.name)
+                }
+                sheetBuilder.setGravityCenter(true)
+                    .setOnSheetItemClickListener { dialog, _, position, tag ->
+                        alarmContentView.text = tag
+                        alarmContent = it.data!!.list!![position].value.toString()
+
+                        dialog.dismiss()
+                    }.build().show()
+            }
+        })
+    }
+
+    override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+
+    }
+
+    override fun onDrawerOpened(drawerView: View) {
+        val wellCodeView = drawerView.findViewById<TextView>(R.id.wellCodeView)
+        val alarmContentView = drawerView.findViewById<TextView>(R.id.alarmContentView)
+        val searchButton = drawerView.findViewById<Button>(R.id.searchButton)
+        val clearButton = drawerView.findViewById<Button>(R.id.clearButton)
+
+        wellCodeView.text = keywords
+
+        alarmContentView.setOnClickListener {
+            //获取类型对应的报警内容，只有运维才能看到设备异常的数据
+            alarmViewModel.obtainAlarmContent("1")
+        }
+
+        startTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择开始时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    startTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        endTimeView.setOnClickListener {
+            TimePickerDialog.Builder()
+                .setThemeColor(R.color.mainThemeColor.convertColor(this))
+                .setTitleStringId("请选择结束时间")
+                .setWheelItemTextSize(16)
+                .setCyclic(false)
+                .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+                .setMaxMillseconds(System.currentTimeMillis())
+                .setType(Type.ALL)
+                .setCallBack { _: TimePickerDialog?, millSeconds: Long ->
+                    if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) {
+                        "结束时间不合法，不能早于开始时间".show()
+                        return@setCallBack
+                    }
+                    endTimeView.text = millSeconds.timestampToTime()
+                }.build().show(supportFragmentManager, "all")
+        }
+
+        searchButton.setOnClickListener {
+            pageIndex = 1
+            obtainAlarmListByPage()
+
+            rightDrawerLayout.closeDrawer(GravityCompat.END)
+        }
+
+        clearButton.setOnClickListener {
+            alarmContentView.text = ""
+            // alarmContent 也需要清空，不然查询依旧是上次选择的类型
+            alarmContent = ""
+            startTimeView.text = ""
+            endTimeView.text = ""
+        }
+    }
+
+    override fun onDrawerClosed(drawerView: View) {
+
+    }
+
+    override fun onDrawerStateChanged(newState: Int) {
+
+    }
+
+    private fun obtainAlarmListByPage() {
+        alarmViewModel.obtainAlarmList(
+            keywords, "", alarmContent, startTimeView.text.toString(),
+            endTimeView.text.toString(), "", pageIndex
+        )
+    }
+
+    private val callback = Handler.Callback {
+        if (it.what == 2022061001) {
+            if (isRefresh || isLoadMore) {
+                alarmListAdapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.showEmptyPage {
+                        pageIndex = 1
+                        obtainAlarmListByPage()
+                    }
+                } else {
+                    emptyView!!.hide()
+                    alarmListAdapter = AlarmListAdapter(this, dataBeans, false)
+                    resultRecyclerView!!.layoutManager = LinearLayoutManager(context)
+                    resultRecyclerView!!.adapter = alarmListAdapter
+                    alarmListAdapter.setOnItemClickListener(object :
+                        AlarmListAdapter.OnItemClickListener {
+                        override fun onClicked(position: Int) {
+                            val wellId = dataBeans[position].wellId.toString()
+                            if (wellId.isBlank()) {
+                                "井编号异常，无法查看详情".show()
+                                return
+                            }
+                            navigatePageTo<WellDetailActivity>(wellId)
+                        }
+
+                        override fun onOperationClicked(position: Int) {
+
+                        }
+                    })
+                }
+            }
+        }
+        true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
index 34a18dd..a23129f 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/AlarmManageActivity.kt
@@ -228,7 +228,6 @@
         )
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     private val callback = Handler.Callback {
         if (it.what == 2022060802) {
             if (isRefresh || isLoadMore) {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt
index 1202bd0..a1388ad 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt
@@ -214,7 +214,7 @@
                         }
 
                         override fun onHistoryClicked(position: Int) {
-
+                            navigatePageTo<AlarmListByWellActivity>(dataBeans[position].wellCode)
                         }
 
                         override fun onEditClicked(position: Int) {
diff --git a/app/src/main/res/layout/activity_alarm_list_by_well.xml b/app/src/main/res/layout/activity_alarm_list_by_well.xml
new file mode 100644
index 0000000..898718b
--- /dev/null
+++ b/app/src/main/res/layout/activity_alarm_list_by_well.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical"
+    tools:context=".view.AlarmManageActivity">
+
+    <include layout="@layout/include_select_title" />
+
+    <androidx.drawerlayout.widget.DrawerLayout
+        android:id="@+id/rightDrawerLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        tools:openDrawer="right">
+
+        <!-- 内容区 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <include layout="@layout/include_empty_view" />
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/resultRefreshLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/dp_10">
+
+                <com.scwang.smartrefresh.layout.header.ClassicsHeader
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <androidx.core.widget.NestedScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:fillViewport="true"
+                    android:scrollbars="vertical">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/resultRecyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:scrollbars="none" />
+                </androidx.core.widget.NestedScrollView>
+
+                <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+        </LinearLayout>
+
+        <!-- 侧滑抽屉区 android:clickable="true"可解决点击事件穿透问题-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:background="@color/white"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/itemLayoutHeight"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/RelativeTextViewStyle"
+                        android:text="井编号" />
+
+                    <TextView
+                        android:id="@+id/wellCodeView"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|end"
+                        android:paddingHorizontal="@dimen/dp_10"
+                        android:textColor="@color/subTextColor"
+                        android:textSize="@dimen/sp_16" />
+                </LinearLayout>
+
+                <View style="@style/DividerViewStyle" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/itemLayoutHeight"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/RelativeTextViewStyle"
+                        android:text="告警内容" />
+
+                    <TextView
+                        android:id="@+id/alarmContentView"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|end"
+                        android:hint="请选择"
+                        android:paddingHorizontal="@dimen/dp_10"
+                        android:textColor="@color/subTextColor"
+                        android:textSize="@dimen/sp_16" />
+                </LinearLayout>
+
+                <View style="@style/DividerViewStyle" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/itemLayoutHeight"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/RelativeTextViewStyle"
+                        android:text="开始时间" />
+
+                    <TextView
+                        android:id="@+id/startTimeView"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="end|center_vertical"
+                        android:hint="点击选择报警开始时间"
+                        android:paddingHorizontal="@dimen/dp_10"
+                        android:textColor="@color/subTextColor"
+                        android:textSize="@dimen/sp_16" />
+                </LinearLayout>
+
+                <View style="@style/DividerViewStyle" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/itemLayoutHeight"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/RelativeTextViewStyle"
+                        android:text="结束时间" />
+
+                    <TextView
+                        android:id="@+id/endTimeView"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="end|center_vertical"
+                        android:hint="点击选择报警结束时间"
+                        android:paddingHorizontal="@dimen/dp_10"
+                        android:textColor="@color/subTextColor"
+                        android:textSize="@dimen/sp_16" />
+                </LinearLayout>
+
+                <View style="@style/DividerViewStyle" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="@dimen/dp_20">
+
+                <Button
+                    android:id="@+id/clearButton"
+                    style="@style/WhiteButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_marginEnd="@dimen/dp_10"
+                    android:layout_weight="1"
+                    android:text="清空" />
+
+                <Button
+                    android:id="@+id/searchButton"
+                    style="@style/MainButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_weight="1"
+                    android:text="查询" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
+</LinearLayout>
\ No newline at end of file