diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
index d6a17ff..1986aa8 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.br.ktd.adapter.AlarmAdapter
 import com.casic.br.ktd.databinding.FragmentAlarmBinding
@@ -31,6 +32,8 @@
     private var page = 1
     private var isRefresh = false
     private var isLoadMore = false
+    private var alarmType = ""
+    private var alarmStatus = ""
     private var startTime = ""
     private var endTime = ""
 
@@ -89,6 +92,39 @@
                 }).build().show()
         }
 
+        binding.alarmTypeView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapter: AdapterView<*>?, view: View?, i: Int, l: Long) {
+                alarmType = if (i == 0) {
+                    ""
+                } else {
+                    i.toString()
+                }
+                getAlarmsByPage(true)
+            }
+
+            override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+            }
+        }
+
+        binding.alarmStatusView.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapter: AdapterView<*>?, view: View?, i: Int, l: Long
+                ) {
+                    alarmStatus = if (i == 0) {
+                        ""
+                    } else {
+                        (i - 1).toString()
+                    }
+                    getAlarmsByPage(true)
+                }
+
+                override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+                }
+            }
+
         binding.resetParamView.setOnClickListener {
             binding.selectedDateView.text = ""
 
@@ -122,7 +158,7 @@
             page++
         }
         alarmViewModel.getAlarmsByPage(
-            startTime, "", "", endTime, page
+            startTime, alarmStatus, alarmType, endTime, page
         )
     }
 

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
index d6a17ff..1986aa8 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.br.ktd.adapter.AlarmAdapter
 import com.casic.br.ktd.databinding.FragmentAlarmBinding
@@ -31,6 +32,8 @@
     private var page = 1
     private var isRefresh = false
     private var isLoadMore = false
+    private var alarmType = ""
+    private var alarmStatus = ""
     private var startTime = ""
     private var endTime = ""
 
@@ -89,6 +92,39 @@
                 }).build().show()
         }
 
+        binding.alarmTypeView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapter: AdapterView<*>?, view: View?, i: Int, l: Long) {
+                alarmType = if (i == 0) {
+                    ""
+                } else {
+                    i.toString()
+                }
+                getAlarmsByPage(true)
+            }
+
+            override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+            }
+        }
+
+        binding.alarmStatusView.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapter: AdapterView<*>?, view: View?, i: Int, l: Long
+                ) {
+                    alarmStatus = if (i == 0) {
+                        ""
+                    } else {
+                        (i - 1).toString()
+                    }
+                    getAlarmsByPage(true)
+                }
+
+                override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+                }
+            }
+
         binding.resetParamView.setOnClickListener {
             binding.selectedDateView.text = ""
 
@@ -122,7 +158,7 @@
             page++
         }
         alarmViewModel.getAlarmsByPage(
-            startTime, "", "", endTime, page
+            startTime, alarmStatus, alarmType, endTime, page
         )
     }
 
diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
index 1d1118d..b381939 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
@@ -315,7 +315,7 @@
                 }
 
                 routeView.setOnClickListener {
-                    taskViewModel.getTaskDetail(id)
+                    taskViewModel.getTaskDetail(id, "", "", "", "", "")
                 }
             }
         }

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
index d6a17ff..1986aa8 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.br.ktd.adapter.AlarmAdapter
 import com.casic.br.ktd.databinding.FragmentAlarmBinding
@@ -31,6 +32,8 @@
     private var page = 1
     private var isRefresh = false
     private var isLoadMore = false
+    private var alarmType = ""
+    private var alarmStatus = ""
     private var startTime = ""
     private var endTime = ""
 
@@ -89,6 +92,39 @@
                 }).build().show()
         }
 
+        binding.alarmTypeView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapter: AdapterView<*>?, view: View?, i: Int, l: Long) {
+                alarmType = if (i == 0) {
+                    ""
+                } else {
+                    i.toString()
+                }
+                getAlarmsByPage(true)
+            }
+
+            override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+            }
+        }
+
+        binding.alarmStatusView.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapter: AdapterView<*>?, view: View?, i: Int, l: Long
+                ) {
+                    alarmStatus = if (i == 0) {
+                        ""
+                    } else {
+                        (i - 1).toString()
+                    }
+                    getAlarmsByPage(true)
+                }
+
+                override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+                }
+            }
+
         binding.resetParamView.setOnClickListener {
             binding.selectedDateView.text = ""
 
@@ -122,7 +158,7 @@
             page++
         }
         alarmViewModel.getAlarmsByPage(
-            startTime, "", "", endTime, page
+            startTime, alarmStatus, alarmType, endTime, page
         )
     }
 
diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
index 1d1118d..b381939 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
@@ -315,7 +315,7 @@
                 }
 
                 routeView.setOnClickListener {
-                    taskViewModel.getTaskDetail(id)
+                    taskViewModel.getTaskDetail(id, "", "", "", "", "")
                 }
             }
         }
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index ba19143..613429f 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -39,7 +39,6 @@
                             endTime,
                             binding.gasValueView.text.toString(),
                             "",
-                            binding.alarmCodeView.text.toString(),
                             binding.taskLocationView.text.toString()
                         )
                     }
@@ -55,7 +54,6 @@
                     endTime,
                     textView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     binding.taskLocationView.text.toString()
                 )
             }
@@ -71,7 +69,6 @@
                         endTime,
                         binding.gasValueView.text.toString(),
                         "",
-                        binding.alarmCodeView.text.toString(),
                         binding.taskLocationView.text.toString()
                     )
                 }
@@ -82,22 +79,6 @@
             }
 
         //键盘搜索
-        binding.alarmCodeView.setOnEditorActionListener { textView, arg, keyEvent ->
-            if (arg == EditorInfo.IME_ACTION_SEARCH) {
-                taskViewModel.getTaskDetail(
-                    taskId,
-                    startTime,
-                    endTime,
-                    binding.gasValueView.text.toString(),
-                    "",
-                    textView.text.toString(),
-                    binding.taskLocationView.text.toString()
-                )
-            }
-            false
-        }
-
-        //键盘搜索
         binding.taskLocationView.setOnEditorActionListener { textView, arg, keyEvent ->
             if (arg == EditorInfo.IME_ACTION_SEARCH) {
                 taskViewModel.getTaskDetail(
@@ -106,7 +87,6 @@
                     endTime,
                     binding.gasValueView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     textView.text.toString()
                 )
             }
@@ -118,10 +98,9 @@
             endTime = ""
             binding.gasValueView.setText("")
             binding.handleStateView.setSelection(0)
-            binding.alarmCodeView.setText("")
             binding.taskLocationView.setText("")
 
-            taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+            taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         }
     }
 
@@ -129,7 +108,7 @@
         taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java]
-        taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+        taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         taskViewModel.detailResult.observe(this) {
             if (it.code == 200) {
                 if (it.data.size == 0) {

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
index d6a17ff..1986aa8 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.br.ktd.adapter.AlarmAdapter
 import com.casic.br.ktd.databinding.FragmentAlarmBinding
@@ -31,6 +32,8 @@
     private var page = 1
     private var isRefresh = false
     private var isLoadMore = false
+    private var alarmType = ""
+    private var alarmStatus = ""
     private var startTime = ""
     private var endTime = ""
 
@@ -89,6 +92,39 @@
                 }).build().show()
         }
 
+        binding.alarmTypeView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapter: AdapterView<*>?, view: View?, i: Int, l: Long) {
+                alarmType = if (i == 0) {
+                    ""
+                } else {
+                    i.toString()
+                }
+                getAlarmsByPage(true)
+            }
+
+            override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+            }
+        }
+
+        binding.alarmStatusView.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapter: AdapterView<*>?, view: View?, i: Int, l: Long
+                ) {
+                    alarmStatus = if (i == 0) {
+                        ""
+                    } else {
+                        (i - 1).toString()
+                    }
+                    getAlarmsByPage(true)
+                }
+
+                override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+                }
+            }
+
         binding.resetParamView.setOnClickListener {
             binding.selectedDateView.text = ""
 
@@ -122,7 +158,7 @@
             page++
         }
         alarmViewModel.getAlarmsByPage(
-            startTime, "", "", endTime, page
+            startTime, alarmStatus, alarmType, endTime, page
         )
     }
 
diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
index 1d1118d..b381939 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
@@ -315,7 +315,7 @@
                 }
 
                 routeView.setOnClickListener {
-                    taskViewModel.getTaskDetail(id)
+                    taskViewModel.getTaskDetail(id, "", "", "", "", "")
                 }
             }
         }
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index ba19143..613429f 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -39,7 +39,6 @@
                             endTime,
                             binding.gasValueView.text.toString(),
                             "",
-                            binding.alarmCodeView.text.toString(),
                             binding.taskLocationView.text.toString()
                         )
                     }
@@ -55,7 +54,6 @@
                     endTime,
                     textView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     binding.taskLocationView.text.toString()
                 )
             }
@@ -71,7 +69,6 @@
                         endTime,
                         binding.gasValueView.text.toString(),
                         "",
-                        binding.alarmCodeView.text.toString(),
                         binding.taskLocationView.text.toString()
                     )
                 }
@@ -82,22 +79,6 @@
             }
 
         //键盘搜索
-        binding.alarmCodeView.setOnEditorActionListener { textView, arg, keyEvent ->
-            if (arg == EditorInfo.IME_ACTION_SEARCH) {
-                taskViewModel.getTaskDetail(
-                    taskId,
-                    startTime,
-                    endTime,
-                    binding.gasValueView.text.toString(),
-                    "",
-                    textView.text.toString(),
-                    binding.taskLocationView.text.toString()
-                )
-            }
-            false
-        }
-
-        //键盘搜索
         binding.taskLocationView.setOnEditorActionListener { textView, arg, keyEvent ->
             if (arg == EditorInfo.IME_ACTION_SEARCH) {
                 taskViewModel.getTaskDetail(
@@ -106,7 +87,6 @@
                     endTime,
                     binding.gasValueView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     textView.text.toString()
                 )
             }
@@ -118,10 +98,9 @@
             endTime = ""
             binding.gasValueView.setText("")
             binding.handleStateView.setSelection(0)
-            binding.alarmCodeView.setText("")
             binding.taskLocationView.setText("")
 
-            taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+            taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         }
     }
 
@@ -129,7 +108,7 @@
         taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java]
-        taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+        taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         taskViewModel.detailResult.observe(this) {
             if (it.code == 200) {
                 if (it.data.size == 0) {
diff --git a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
index 6fdd744..b5f185c 100644
--- a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
@@ -75,8 +75,7 @@
         b: String,
         c: String,
         d: String,
-        e: String,
-        f: String
+        e: String
     ) = launch({
         val response = RetrofitServiceManager.getTaskDetail(taskId)
         val responseCode = response.separateResponseCode()

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
index d6a17ff..1986aa8 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.br.ktd.adapter.AlarmAdapter
 import com.casic.br.ktd.databinding.FragmentAlarmBinding
@@ -31,6 +32,8 @@
     private var page = 1
     private var isRefresh = false
     private var isLoadMore = false
+    private var alarmType = ""
+    private var alarmStatus = ""
     private var startTime = ""
     private var endTime = ""
 
@@ -89,6 +92,39 @@
                 }).build().show()
         }
 
+        binding.alarmTypeView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapter: AdapterView<*>?, view: View?, i: Int, l: Long) {
+                alarmType = if (i == 0) {
+                    ""
+                } else {
+                    i.toString()
+                }
+                getAlarmsByPage(true)
+            }
+
+            override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+            }
+        }
+
+        binding.alarmStatusView.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapter: AdapterView<*>?, view: View?, i: Int, l: Long
+                ) {
+                    alarmStatus = if (i == 0) {
+                        ""
+                    } else {
+                        (i - 1).toString()
+                    }
+                    getAlarmsByPage(true)
+                }
+
+                override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+                }
+            }
+
         binding.resetParamView.setOnClickListener {
             binding.selectedDateView.text = ""
 
@@ -122,7 +158,7 @@
             page++
         }
         alarmViewModel.getAlarmsByPage(
-            startTime, "", "", endTime, page
+            startTime, alarmStatus, alarmType, endTime, page
         )
     }
 
diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
index 1d1118d..b381939 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
@@ -315,7 +315,7 @@
                 }
 
                 routeView.setOnClickListener {
-                    taskViewModel.getTaskDetail(id)
+                    taskViewModel.getTaskDetail(id, "", "", "", "", "")
                 }
             }
         }
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index ba19143..613429f 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -39,7 +39,6 @@
                             endTime,
                             binding.gasValueView.text.toString(),
                             "",
-                            binding.alarmCodeView.text.toString(),
                             binding.taskLocationView.text.toString()
                         )
                     }
@@ -55,7 +54,6 @@
                     endTime,
                     textView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     binding.taskLocationView.text.toString()
                 )
             }
@@ -71,7 +69,6 @@
                         endTime,
                         binding.gasValueView.text.toString(),
                         "",
-                        binding.alarmCodeView.text.toString(),
                         binding.taskLocationView.text.toString()
                     )
                 }
@@ -82,22 +79,6 @@
             }
 
         //键盘搜索
-        binding.alarmCodeView.setOnEditorActionListener { textView, arg, keyEvent ->
-            if (arg == EditorInfo.IME_ACTION_SEARCH) {
-                taskViewModel.getTaskDetail(
-                    taskId,
-                    startTime,
-                    endTime,
-                    binding.gasValueView.text.toString(),
-                    "",
-                    textView.text.toString(),
-                    binding.taskLocationView.text.toString()
-                )
-            }
-            false
-        }
-
-        //键盘搜索
         binding.taskLocationView.setOnEditorActionListener { textView, arg, keyEvent ->
             if (arg == EditorInfo.IME_ACTION_SEARCH) {
                 taskViewModel.getTaskDetail(
@@ -106,7 +87,6 @@
                     endTime,
                     binding.gasValueView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     textView.text.toString()
                 )
             }
@@ -118,10 +98,9 @@
             endTime = ""
             binding.gasValueView.setText("")
             binding.handleStateView.setSelection(0)
-            binding.alarmCodeView.setText("")
             binding.taskLocationView.setText("")
 
-            taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+            taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         }
     }
 
@@ -129,7 +108,7 @@
         taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java]
-        taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+        taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         taskViewModel.detailResult.observe(this) {
             if (it.code == 200) {
                 if (it.data.size == 0) {
diff --git a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
index 6fdd744..b5f185c 100644
--- a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
@@ -75,8 +75,7 @@
         b: String,
         c: String,
         d: String,
-        e: String,
-        f: String
+        e: String
     ) = launch({
         val response = RetrofitServiceManager.getTaskDetail(taskId)
         val responseCode = response.separateResponseCode()
diff --git a/app/src/main/res/layout/activity_task_detail.xml b/app/src/main/res/layout/activity_task_detail.xml
index b46f010..b78ee6e 100644
--- a/app/src/main/res/layout/activity_task_detail.xml
+++ b/app/src/main/res/layout/activity_task_detail.xml
@@ -94,26 +94,6 @@
             app:cardUseCompatPadding="true">
 
             <com.pengxh.kt.lite.widget.DeleteEditText
-                android:id="@+id/alarmCodeView"
-                android:layout_width="@dimen/dp_125"
-                android:layout_height="match_parent"
-                android:layout_marginHorizontal="@dimen/dp_10"
-                android:layout_marginVertical="@dimen/dp_7"
-                android:background="@null"
-                android:hint="请输入报警编号"
-                android:imeOptions="actionSearch"
-                android:singleLine="true" />
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
-            app:cardCornerRadius="@dimen/dp_7"
-            app:cardElevation="@dimen/dp_2"
-            app:cardUseCompatPadding="true">
-
-            <com.pengxh.kt.lite.widget.DeleteEditText
                 android:id="@+id/taskLocationView"
                 android:layout_width="@dimen/dp_150"
                 android:layout_height="match_parent"
@@ -130,7 +110,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="@dimen/dp_15"
             android:text="重置条件"
             android:textColor="@color/themeColor"
             android:textSize="@dimen/sp_18"

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
index d6a17ff..1986aa8 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.br.ktd.adapter.AlarmAdapter
 import com.casic.br.ktd.databinding.FragmentAlarmBinding
@@ -31,6 +32,8 @@
     private var page = 1
     private var isRefresh = false
     private var isLoadMore = false
+    private var alarmType = ""
+    private var alarmStatus = ""
     private var startTime = ""
     private var endTime = ""
 
@@ -89,6 +92,39 @@
                 }).build().show()
         }
 
+        binding.alarmTypeView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapter: AdapterView<*>?, view: View?, i: Int, l: Long) {
+                alarmType = if (i == 0) {
+                    ""
+                } else {
+                    i.toString()
+                }
+                getAlarmsByPage(true)
+            }
+
+            override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+            }
+        }
+
+        binding.alarmStatusView.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapter: AdapterView<*>?, view: View?, i: Int, l: Long
+                ) {
+                    alarmStatus = if (i == 0) {
+                        ""
+                    } else {
+                        (i - 1).toString()
+                    }
+                    getAlarmsByPage(true)
+                }
+
+                override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+                }
+            }
+
         binding.resetParamView.setOnClickListener {
             binding.selectedDateView.text = ""
 
@@ -122,7 +158,7 @@
             page++
         }
         alarmViewModel.getAlarmsByPage(
-            startTime, "", "", endTime, page
+            startTime, alarmStatus, alarmType, endTime, page
         )
     }
 
diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
index 1d1118d..b381939 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
@@ -315,7 +315,7 @@
                 }
 
                 routeView.setOnClickListener {
-                    taskViewModel.getTaskDetail(id)
+                    taskViewModel.getTaskDetail(id, "", "", "", "", "")
                 }
             }
         }
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index ba19143..613429f 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -39,7 +39,6 @@
                             endTime,
                             binding.gasValueView.text.toString(),
                             "",
-                            binding.alarmCodeView.text.toString(),
                             binding.taskLocationView.text.toString()
                         )
                     }
@@ -55,7 +54,6 @@
                     endTime,
                     textView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     binding.taskLocationView.text.toString()
                 )
             }
@@ -71,7 +69,6 @@
                         endTime,
                         binding.gasValueView.text.toString(),
                         "",
-                        binding.alarmCodeView.text.toString(),
                         binding.taskLocationView.text.toString()
                     )
                 }
@@ -82,22 +79,6 @@
             }
 
         //键盘搜索
-        binding.alarmCodeView.setOnEditorActionListener { textView, arg, keyEvent ->
-            if (arg == EditorInfo.IME_ACTION_SEARCH) {
-                taskViewModel.getTaskDetail(
-                    taskId,
-                    startTime,
-                    endTime,
-                    binding.gasValueView.text.toString(),
-                    "",
-                    textView.text.toString(),
-                    binding.taskLocationView.text.toString()
-                )
-            }
-            false
-        }
-
-        //键盘搜索
         binding.taskLocationView.setOnEditorActionListener { textView, arg, keyEvent ->
             if (arg == EditorInfo.IME_ACTION_SEARCH) {
                 taskViewModel.getTaskDetail(
@@ -106,7 +87,6 @@
                     endTime,
                     binding.gasValueView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     textView.text.toString()
                 )
             }
@@ -118,10 +98,9 @@
             endTime = ""
             binding.gasValueView.setText("")
             binding.handleStateView.setSelection(0)
-            binding.alarmCodeView.setText("")
             binding.taskLocationView.setText("")
 
-            taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+            taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         }
     }
 
@@ -129,7 +108,7 @@
         taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java]
-        taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+        taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         taskViewModel.detailResult.observe(this) {
             if (it.code == 200) {
                 if (it.data.size == 0) {
diff --git a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
index 6fdd744..b5f185c 100644
--- a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
@@ -75,8 +75,7 @@
         b: String,
         c: String,
         d: String,
-        e: String,
-        f: String
+        e: String
     ) = launch({
         val response = RetrofitServiceManager.getTaskDetail(taskId)
         val responseCode = response.separateResponseCode()
diff --git a/app/src/main/res/layout/activity_task_detail.xml b/app/src/main/res/layout/activity_task_detail.xml
index b46f010..b78ee6e 100644
--- a/app/src/main/res/layout/activity_task_detail.xml
+++ b/app/src/main/res/layout/activity_task_detail.xml
@@ -94,26 +94,6 @@
             app:cardUseCompatPadding="true">
 
             <com.pengxh.kt.lite.widget.DeleteEditText
-                android:id="@+id/alarmCodeView"
-                android:layout_width="@dimen/dp_125"
-                android:layout_height="match_parent"
-                android:layout_marginHorizontal="@dimen/dp_10"
-                android:layout_marginVertical="@dimen/dp_7"
-                android:background="@null"
-                android:hint="请输入报警编号"
-                android:imeOptions="actionSearch"
-                android:singleLine="true" />
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
-            app:cardCornerRadius="@dimen/dp_7"
-            app:cardElevation="@dimen/dp_2"
-            app:cardUseCompatPadding="true">
-
-            <com.pengxh.kt.lite.widget.DeleteEditText
                 android:id="@+id/taskLocationView"
                 android:layout_width="@dimen/dp_150"
                 android:layout_height="match_parent"
@@ -130,7 +110,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="@dimen/dp_15"
             android:text="重置条件"
             android:textColor="@color/themeColor"
             android:textSize="@dimen/sp_18"
diff --git a/app/src/main/res/layout/fragment_alarm.xml b/app/src/main/res/layout/fragment_alarm.xml
index 5b9e530..67b14ac 100644
--- a/app/src/main/res/layout/fragment_alarm.xml
+++ b/app/src/main/res/layout/fragment_alarm.xml
@@ -54,6 +54,7 @@
             app:cardUseCompatPadding="true">
 
             <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/alarmTypeView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
@@ -72,12 +73,13 @@
             app:cardUseCompatPadding="true">
 
             <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/alarmStatusView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
                 android:dropDownVerticalOffset="@dimen/dp_32"
-                android:entries="@array/alarmStatus"
+                android:entries="@array/handleStatus"
                 android:gravity="center_vertical" />
         </androidx.cardview.widget.CardView>
 

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
index d6a17ff..1986aa8 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.br.ktd.adapter.AlarmAdapter
 import com.casic.br.ktd.databinding.FragmentAlarmBinding
@@ -31,6 +32,8 @@
     private var page = 1
     private var isRefresh = false
     private var isLoadMore = false
+    private var alarmType = ""
+    private var alarmStatus = ""
     private var startTime = ""
     private var endTime = ""
 
@@ -89,6 +92,39 @@
                 }).build().show()
         }
 
+        binding.alarmTypeView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapter: AdapterView<*>?, view: View?, i: Int, l: Long) {
+                alarmType = if (i == 0) {
+                    ""
+                } else {
+                    i.toString()
+                }
+                getAlarmsByPage(true)
+            }
+
+            override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+            }
+        }
+
+        binding.alarmStatusView.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapter: AdapterView<*>?, view: View?, i: Int, l: Long
+                ) {
+                    alarmStatus = if (i == 0) {
+                        ""
+                    } else {
+                        (i - 1).toString()
+                    }
+                    getAlarmsByPage(true)
+                }
+
+                override fun onNothingSelected(adapter: AdapterView<*>?) {
+
+                }
+            }
+
         binding.resetParamView.setOnClickListener {
             binding.selectedDateView.text = ""
 
@@ -122,7 +158,7 @@
             page++
         }
         alarmViewModel.getAlarmsByPage(
-            startTime, "", "", endTime, page
+            startTime, alarmStatus, alarmType, endTime, page
         )
     }
 
diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
index 1d1118d..b381939 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt
@@ -315,7 +315,7 @@
                 }
 
                 routeView.setOnClickListener {
-                    taskViewModel.getTaskDetail(id)
+                    taskViewModel.getTaskDetail(id, "", "", "", "", "")
                 }
             }
         }
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index ba19143..613429f 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -39,7 +39,6 @@
                             endTime,
                             binding.gasValueView.text.toString(),
                             "",
-                            binding.alarmCodeView.text.toString(),
                             binding.taskLocationView.text.toString()
                         )
                     }
@@ -55,7 +54,6 @@
                     endTime,
                     textView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     binding.taskLocationView.text.toString()
                 )
             }
@@ -71,7 +69,6 @@
                         endTime,
                         binding.gasValueView.text.toString(),
                         "",
-                        binding.alarmCodeView.text.toString(),
                         binding.taskLocationView.text.toString()
                     )
                 }
@@ -82,22 +79,6 @@
             }
 
         //键盘搜索
-        binding.alarmCodeView.setOnEditorActionListener { textView, arg, keyEvent ->
-            if (arg == EditorInfo.IME_ACTION_SEARCH) {
-                taskViewModel.getTaskDetail(
-                    taskId,
-                    startTime,
-                    endTime,
-                    binding.gasValueView.text.toString(),
-                    "",
-                    textView.text.toString(),
-                    binding.taskLocationView.text.toString()
-                )
-            }
-            false
-        }
-
-        //键盘搜索
         binding.taskLocationView.setOnEditorActionListener { textView, arg, keyEvent ->
             if (arg == EditorInfo.IME_ACTION_SEARCH) {
                 taskViewModel.getTaskDetail(
@@ -106,7 +87,6 @@
                     endTime,
                     binding.gasValueView.text.toString(),
                     "",
-                    binding.alarmCodeView.text.toString(),
                     textView.text.toString()
                 )
             }
@@ -118,10 +98,9 @@
             endTime = ""
             binding.gasValueView.setText("")
             binding.handleStateView.setSelection(0)
-            binding.alarmCodeView.setText("")
             binding.taskLocationView.setText("")
 
-            taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+            taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         }
     }
 
@@ -129,7 +108,7 @@
         taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java]
-        taskViewModel.getTaskDetail(taskId, "", "", "", "", "", "")
+        taskViewModel.getTaskDetail(taskId, "", "", "", "", "")
         taskViewModel.detailResult.observe(this) {
             if (it.code == 200) {
                 if (it.data.size == 0) {
diff --git a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
index 6fdd744..b5f185c 100644
--- a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt
@@ -75,8 +75,7 @@
         b: String,
         c: String,
         d: String,
-        e: String,
-        f: String
+        e: String
     ) = launch({
         val response = RetrofitServiceManager.getTaskDetail(taskId)
         val responseCode = response.separateResponseCode()
diff --git a/app/src/main/res/layout/activity_task_detail.xml b/app/src/main/res/layout/activity_task_detail.xml
index b46f010..b78ee6e 100644
--- a/app/src/main/res/layout/activity_task_detail.xml
+++ b/app/src/main/res/layout/activity_task_detail.xml
@@ -94,26 +94,6 @@
             app:cardUseCompatPadding="true">
 
             <com.pengxh.kt.lite.widget.DeleteEditText
-                android:id="@+id/alarmCodeView"
-                android:layout_width="@dimen/dp_125"
-                android:layout_height="match_parent"
-                android:layout_marginHorizontal="@dimen/dp_10"
-                android:layout_marginVertical="@dimen/dp_7"
-                android:background="@null"
-                android:hint="请输入报警编号"
-                android:imeOptions="actionSearch"
-                android:singleLine="true" />
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
-            app:cardCornerRadius="@dimen/dp_7"
-            app:cardElevation="@dimen/dp_2"
-            app:cardUseCompatPadding="true">
-
-            <com.pengxh.kt.lite.widget.DeleteEditText
                 android:id="@+id/taskLocationView"
                 android:layout_width="@dimen/dp_150"
                 android:layout_height="match_parent"
@@ -130,7 +110,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="@dimen/dp_15"
             android:text="重置条件"
             android:textColor="@color/themeColor"
             android:textSize="@dimen/sp_18"
diff --git a/app/src/main/res/layout/fragment_alarm.xml b/app/src/main/res/layout/fragment_alarm.xml
index 5b9e530..67b14ac 100644
--- a/app/src/main/res/layout/fragment_alarm.xml
+++ b/app/src/main/res/layout/fragment_alarm.xml
@@ -54,6 +54,7 @@
             app:cardUseCompatPadding="true">
 
             <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/alarmTypeView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
@@ -72,12 +73,13 @@
             app:cardUseCompatPadding="true">
 
             <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/alarmStatusView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
                 android:dropDownVerticalOffset="@dimen/dp_32"
-                android:entries="@array/alarmStatus"
+                android:entries="@array/handleStatus"
                 android:gravity="center_vertical" />
         </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index f1c5749..9befbe7 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -6,12 +6,18 @@
         <item>第三方施工识别报警</item>
     </string-array>
 
-    <string-array name="alarmStatus">
+    <string-array name="handleStatus">
         <item>请选择处置状态</item>
         <item>正在报警</item>
         <item>未处置</item>
     </string-array>
 
+    <string-array name="alarmStatus">
+        <item>是否报警</item>
+        <item>是</item>
+        <item>否</item>
+    </string-array>
+
     <string-array name="speedArray">
         <item>速度1</item>
         <item>速度2</item>