diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
index 01fb677..4e374ed 100644
--- a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
@@ -7,7 +7,6 @@
 import com.casic.smarttube.adapter.AlarmListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.AlarmListModel
-import com.casic.smarttube.utils.DialogHelper
 import com.casic.smarttube.vm.AlarmViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -16,8 +15,6 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
-import com.pengxh.kt.lite.vm.LoadState
-import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.activity_alarm_management.leftBackView
 import kotlinx.android.synthetic.main.activity_alarm_management.titleView
@@ -34,7 +31,6 @@
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
-    private var clickedPosition = 0
 
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
@@ -43,10 +39,6 @@
         ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this))
         leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
-        rightOptionView.setOnClickListener {
-//            navigatePageTo<SearchAlarmActivity>()
-            "尽情期待～".show(this)
-        }
     }
 
     override fun initData() {
@@ -97,23 +89,6 @@
                 weakReferenceHandler.sendEmptyMessage(2022062501)
             }
         })
-
-        alarmViewModel.loadState.observe(this, {
-            when (it) {
-                is LoadState.Loading -> {
-                    DialogHelper.showLoadingDialog(this, "处理中，请稍后")
-                }
-                is LoadState.Success -> {
-                    DialogHelper.dismissLoadingDialog()
-                    //刷新列表
-                    alarmListAdapter.notifyItemRemoved(clickedPosition)
-                    dataBeans.removeAt(clickedPosition)
-                }
-                else -> {
-                    DialogHelper.dismissLoadingDialog()
-                }
-            }
-        })
     }
 
     private fun obtainAlarmListByPage() {
@@ -145,32 +120,6 @@
                             }
                             navigatePageTo<WellDetailActivity>(wellId)
                         }
-
-                        override fun onOperationClicked(position: Int) {
-                            //标记被点击的item位置
-                            clickedPosition = position
-                            AlertControlDialog.Builder()
-                                .setContext(this@AlarmManagementActivity)
-                                .setTitle("确认操作")
-                                .setMessage("确定取消报警吗？")
-                                .setNegativeButton("取消")
-                                .setPositiveButton("确定")
-                                .setOnDialogButtonClickListener(object :
-                                    AlertControlDialog.OnDialogButtonClickListener {
-                                    override fun onConfirmClick() {
-                                        val alarmId = dataBeans[position].id
-                                        if (alarmId.toString().isBlank()) {
-                                            "操作失败，告警ID异常".show(this@AlarmManagementActivity)
-                                            return
-                                        }
-                                        alarmViewModel.obtainOperationResult(alarmId!!.toLong())
-                                    }
-
-                                    override fun onCancelClick() {
-
-                                    }
-                                }).build().show()
-                        }
                     })
                 }
             }

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
index 01fb677..4e374ed 100644
--- a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
@@ -7,7 +7,6 @@
 import com.casic.smarttube.adapter.AlarmListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.AlarmListModel
-import com.casic.smarttube.utils.DialogHelper
 import com.casic.smarttube.vm.AlarmViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -16,8 +15,6 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
-import com.pengxh.kt.lite.vm.LoadState
-import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.activity_alarm_management.leftBackView
 import kotlinx.android.synthetic.main.activity_alarm_management.titleView
@@ -34,7 +31,6 @@
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
-    private var clickedPosition = 0
 
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
@@ -43,10 +39,6 @@
         ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this))
         leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
-        rightOptionView.setOnClickListener {
-//            navigatePageTo<SearchAlarmActivity>()
-            "尽情期待～".show(this)
-        }
     }
 
     override fun initData() {
@@ -97,23 +89,6 @@
                 weakReferenceHandler.sendEmptyMessage(2022062501)
             }
         })
-
-        alarmViewModel.loadState.observe(this, {
-            when (it) {
-                is LoadState.Loading -> {
-                    DialogHelper.showLoadingDialog(this, "处理中，请稍后")
-                }
-                is LoadState.Success -> {
-                    DialogHelper.dismissLoadingDialog()
-                    //刷新列表
-                    alarmListAdapter.notifyItemRemoved(clickedPosition)
-                    dataBeans.removeAt(clickedPosition)
-                }
-                else -> {
-                    DialogHelper.dismissLoadingDialog()
-                }
-            }
-        })
     }
 
     private fun obtainAlarmListByPage() {
@@ -145,32 +120,6 @@
                             }
                             navigatePageTo<WellDetailActivity>(wellId)
                         }
-
-                        override fun onOperationClicked(position: Int) {
-                            //标记被点击的item位置
-                            clickedPosition = position
-                            AlertControlDialog.Builder()
-                                .setContext(this@AlarmManagementActivity)
-                                .setTitle("确认操作")
-                                .setMessage("确定取消报警吗？")
-                                .setNegativeButton("取消")
-                                .setPositiveButton("确定")
-                                .setOnDialogButtonClickListener(object :
-                                    AlertControlDialog.OnDialogButtonClickListener {
-                                    override fun onConfirmClick() {
-                                        val alarmId = dataBeans[position].id
-                                        if (alarmId.toString().isBlank()) {
-                                            "操作失败，告警ID异常".show(this@AlarmManagementActivity)
-                                            return
-                                        }
-                                        alarmViewModel.obtainOperationResult(alarmId!!.toLong())
-                                    }
-
-                                    override fun onCancelClick() {
-
-                                    }
-                                }).build().show()
-                        }
                     })
                 }
             }
diff --git a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
index 1988902..f4461f4 100644
--- a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
@@ -11,7 +11,6 @@
 import com.pengxh.kt.lite.extensions.launch
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.vm.BaseViewModel
-import com.pengxh.kt.lite.vm.LoadState
 
 class AlarmViewModel : BaseViewModel() {
 
@@ -49,20 +48,4 @@
     }, {
         it.printStackTrace()
     })
-
-    fun obtainOperationResult(alarmId: Long) = launch({
-        loadState.value = LoadState.Loading
-        val response = RetrofitServiceManager.obtainOperationResult(alarmId)
-        val responseCode = response.separateResponseCode()
-        if (responseCode == 200) {
-            loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
-        } else {
-            loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
-        }
-    }, {
-        loadState.value = LoadState.Fail
-        it.printStackTrace()
-    })
 }
\ No newline at end of file

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
index 01fb677..4e374ed 100644
--- a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
@@ -7,7 +7,6 @@
 import com.casic.smarttube.adapter.AlarmListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.AlarmListModel
-import com.casic.smarttube.utils.DialogHelper
 import com.casic.smarttube.vm.AlarmViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -16,8 +15,6 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
-import com.pengxh.kt.lite.vm.LoadState
-import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.activity_alarm_management.leftBackView
 import kotlinx.android.synthetic.main.activity_alarm_management.titleView
@@ -34,7 +31,6 @@
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
-    private var clickedPosition = 0
 
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
@@ -43,10 +39,6 @@
         ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this))
         leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
-        rightOptionView.setOnClickListener {
-//            navigatePageTo<SearchAlarmActivity>()
-            "尽情期待～".show(this)
-        }
     }
 
     override fun initData() {
@@ -97,23 +89,6 @@
                 weakReferenceHandler.sendEmptyMessage(2022062501)
             }
         })
-
-        alarmViewModel.loadState.observe(this, {
-            when (it) {
-                is LoadState.Loading -> {
-                    DialogHelper.showLoadingDialog(this, "处理中，请稍后")
-                }
-                is LoadState.Success -> {
-                    DialogHelper.dismissLoadingDialog()
-                    //刷新列表
-                    alarmListAdapter.notifyItemRemoved(clickedPosition)
-                    dataBeans.removeAt(clickedPosition)
-                }
-                else -> {
-                    DialogHelper.dismissLoadingDialog()
-                }
-            }
-        })
     }
 
     private fun obtainAlarmListByPage() {
@@ -145,32 +120,6 @@
                             }
                             navigatePageTo<WellDetailActivity>(wellId)
                         }
-
-                        override fun onOperationClicked(position: Int) {
-                            //标记被点击的item位置
-                            clickedPosition = position
-                            AlertControlDialog.Builder()
-                                .setContext(this@AlarmManagementActivity)
-                                .setTitle("确认操作")
-                                .setMessage("确定取消报警吗？")
-                                .setNegativeButton("取消")
-                                .setPositiveButton("确定")
-                                .setOnDialogButtonClickListener(object :
-                                    AlertControlDialog.OnDialogButtonClickListener {
-                                    override fun onConfirmClick() {
-                                        val alarmId = dataBeans[position].id
-                                        if (alarmId.toString().isBlank()) {
-                                            "操作失败，告警ID异常".show(this@AlarmManagementActivity)
-                                            return
-                                        }
-                                        alarmViewModel.obtainOperationResult(alarmId!!.toLong())
-                                    }
-
-                                    override fun onCancelClick() {
-
-                                    }
-                                }).build().show()
-                        }
                     })
                 }
             }
diff --git a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
index 1988902..f4461f4 100644
--- a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
@@ -11,7 +11,6 @@
 import com.pengxh.kt.lite.extensions.launch
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.vm.BaseViewModel
-import com.pengxh.kt.lite.vm.LoadState
 
 class AlarmViewModel : BaseViewModel() {
 
@@ -49,20 +48,4 @@
     }, {
         it.printStackTrace()
     })
-
-    fun obtainOperationResult(alarmId: Long) = launch({
-        loadState.value = LoadState.Loading
-        val response = RetrofitServiceManager.obtainOperationResult(alarmId)
-        val responseCode = response.separateResponseCode()
-        if (responseCode == 200) {
-            loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
-        } else {
-            loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
-        }
-    }, {
-        loadState.value = LoadState.Fail
-        it.printStackTrace()
-    })
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml
index 658b1f2..3cec51f 100644
--- a/app/src/main/res/layout/activity_add_device.xml
+++ b/app/src/main/res/layout/activity_add_device.xml
@@ -26,30 +26,6 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
-                    android:text="设备名称" />
-
-                <EditText
-                    android:id="@+id/deviceNameView"
-                    style="@style/RelativeTextViewStyle"
-                    android:layout_toStartOf="@id/deviceNameTempView"
-                    android:background="@null"
-                    android:hint="@string/unknown"
-                    android:maxLength="20"
-                    android:paddingVertical="@dimen/dp_5"
-                    android:singleLine="true"
-                    android:textColorHint="@color/hintTextColor" />
-
-                <ImageView
-                    android:id="@+id/deviceNameTempView"
-                    style="@style/RelativeRightImageStyle" />
-            </RelativeLayout>
-
-            <View style="@style/DividerViewStyle" />
-
-            <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                <TextView
-                    style="@style/RelativeTextViewStyle"
                     android:text="设备编号" />
 
                 <EditText
@@ -75,6 +51,30 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
+                    android:text="设备名称" />
+
+                <EditText
+                    android:id="@+id/deviceNameView"
+                    style="@style/RelativeTextViewStyle"
+                    android:layout_toStartOf="@id/deviceNameTempView"
+                    android:background="@null"
+                    android:hint="@string/unknown"
+                    android:maxLength="20"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:singleLine="true"
+                    android:textColorHint="@color/hintTextColor" />
+
+                <ImageView
+                    android:id="@+id/deviceNameTempView"
+                    style="@style/RelativeRightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/DividerViewStyle" />
+
+            <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                <TextView
+                    style="@style/RelativeTextViewStyle"
                     android:text="所属项目" />
 
                 <TextView

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
index 01fb677..4e374ed 100644
--- a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
@@ -7,7 +7,6 @@
 import com.casic.smarttube.adapter.AlarmListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.AlarmListModel
-import com.casic.smarttube.utils.DialogHelper
 import com.casic.smarttube.vm.AlarmViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -16,8 +15,6 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
-import com.pengxh.kt.lite.vm.LoadState
-import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.activity_alarm_management.leftBackView
 import kotlinx.android.synthetic.main.activity_alarm_management.titleView
@@ -34,7 +31,6 @@
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
-    private var clickedPosition = 0
 
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
@@ -43,10 +39,6 @@
         ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this))
         leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
-        rightOptionView.setOnClickListener {
-//            navigatePageTo<SearchAlarmActivity>()
-            "尽情期待～".show(this)
-        }
     }
 
     override fun initData() {
@@ -97,23 +89,6 @@
                 weakReferenceHandler.sendEmptyMessage(2022062501)
             }
         })
-
-        alarmViewModel.loadState.observe(this, {
-            when (it) {
-                is LoadState.Loading -> {
-                    DialogHelper.showLoadingDialog(this, "处理中，请稍后")
-                }
-                is LoadState.Success -> {
-                    DialogHelper.dismissLoadingDialog()
-                    //刷新列表
-                    alarmListAdapter.notifyItemRemoved(clickedPosition)
-                    dataBeans.removeAt(clickedPosition)
-                }
-                else -> {
-                    DialogHelper.dismissLoadingDialog()
-                }
-            }
-        })
     }
 
     private fun obtainAlarmListByPage() {
@@ -145,32 +120,6 @@
                             }
                             navigatePageTo<WellDetailActivity>(wellId)
                         }
-
-                        override fun onOperationClicked(position: Int) {
-                            //标记被点击的item位置
-                            clickedPosition = position
-                            AlertControlDialog.Builder()
-                                .setContext(this@AlarmManagementActivity)
-                                .setTitle("确认操作")
-                                .setMessage("确定取消报警吗？")
-                                .setNegativeButton("取消")
-                                .setPositiveButton("确定")
-                                .setOnDialogButtonClickListener(object :
-                                    AlertControlDialog.OnDialogButtonClickListener {
-                                    override fun onConfirmClick() {
-                                        val alarmId = dataBeans[position].id
-                                        if (alarmId.toString().isBlank()) {
-                                            "操作失败，告警ID异常".show(this@AlarmManagementActivity)
-                                            return
-                                        }
-                                        alarmViewModel.obtainOperationResult(alarmId!!.toLong())
-                                    }
-
-                                    override fun onCancelClick() {
-
-                                    }
-                                }).build().show()
-                        }
                     })
                 }
             }
diff --git a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
index 1988902..f4461f4 100644
--- a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
@@ -11,7 +11,6 @@
 import com.pengxh.kt.lite.extensions.launch
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.vm.BaseViewModel
-import com.pengxh.kt.lite.vm.LoadState
 
 class AlarmViewModel : BaseViewModel() {
 
@@ -49,20 +48,4 @@
     }, {
         it.printStackTrace()
     })
-
-    fun obtainOperationResult(alarmId: Long) = launch({
-        loadState.value = LoadState.Loading
-        val response = RetrofitServiceManager.obtainOperationResult(alarmId)
-        val responseCode = response.separateResponseCode()
-        if (responseCode == 200) {
-            loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
-        } else {
-            loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
-        }
-    }, {
-        loadState.value = LoadState.Fail
-        it.printStackTrace()
-    })
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml
index 658b1f2..3cec51f 100644
--- a/app/src/main/res/layout/activity_add_device.xml
+++ b/app/src/main/res/layout/activity_add_device.xml
@@ -26,30 +26,6 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
-                    android:text="设备名称" />
-
-                <EditText
-                    android:id="@+id/deviceNameView"
-                    style="@style/RelativeTextViewStyle"
-                    android:layout_toStartOf="@id/deviceNameTempView"
-                    android:background="@null"
-                    android:hint="@string/unknown"
-                    android:maxLength="20"
-                    android:paddingVertical="@dimen/dp_5"
-                    android:singleLine="true"
-                    android:textColorHint="@color/hintTextColor" />
-
-                <ImageView
-                    android:id="@+id/deviceNameTempView"
-                    style="@style/RelativeRightImageStyle" />
-            </RelativeLayout>
-
-            <View style="@style/DividerViewStyle" />
-
-            <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                <TextView
-                    style="@style/RelativeTextViewStyle"
                     android:text="设备编号" />
 
                 <EditText
@@ -75,6 +51,30 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
+                    android:text="设备名称" />
+
+                <EditText
+                    android:id="@+id/deviceNameView"
+                    style="@style/RelativeTextViewStyle"
+                    android:layout_toStartOf="@id/deviceNameTempView"
+                    android:background="@null"
+                    android:hint="@string/unknown"
+                    android:maxLength="20"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:singleLine="true"
+                    android:textColorHint="@color/hintTextColor" />
+
+                <ImageView
+                    android:id="@+id/deviceNameTempView"
+                    style="@style/RelativeRightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/DividerViewStyle" />
+
+            <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                <TextView
+                    style="@style/RelativeTextViewStyle"
                     android:text="所属项目" />
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 2a239f2..5b7215a 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -29,14 +29,6 @@
             android:text="@string/app_name"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_18" />
-
-        <ImageView
-            android:id="@+id/rightOptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_search_white" />
     </RelativeLayout>
 
     <include layout="@layout/include_empty_view" />

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
index 01fb677..4e374ed 100644
--- a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
@@ -7,7 +7,6 @@
 import com.casic.smarttube.adapter.AlarmListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.AlarmListModel
-import com.casic.smarttube.utils.DialogHelper
 import com.casic.smarttube.vm.AlarmViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -16,8 +15,6 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
-import com.pengxh.kt.lite.vm.LoadState
-import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.activity_alarm_management.leftBackView
 import kotlinx.android.synthetic.main.activity_alarm_management.titleView
@@ -34,7 +31,6 @@
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
-    private var clickedPosition = 0
 
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
@@ -43,10 +39,6 @@
         ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this))
         leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
-        rightOptionView.setOnClickListener {
-//            navigatePageTo<SearchAlarmActivity>()
-            "尽情期待～".show(this)
-        }
     }
 
     override fun initData() {
@@ -97,23 +89,6 @@
                 weakReferenceHandler.sendEmptyMessage(2022062501)
             }
         })
-
-        alarmViewModel.loadState.observe(this, {
-            when (it) {
-                is LoadState.Loading -> {
-                    DialogHelper.showLoadingDialog(this, "处理中，请稍后")
-                }
-                is LoadState.Success -> {
-                    DialogHelper.dismissLoadingDialog()
-                    //刷新列表
-                    alarmListAdapter.notifyItemRemoved(clickedPosition)
-                    dataBeans.removeAt(clickedPosition)
-                }
-                else -> {
-                    DialogHelper.dismissLoadingDialog()
-                }
-            }
-        })
     }
 
     private fun obtainAlarmListByPage() {
@@ -145,32 +120,6 @@
                             }
                             navigatePageTo<WellDetailActivity>(wellId)
                         }
-
-                        override fun onOperationClicked(position: Int) {
-                            //标记被点击的item位置
-                            clickedPosition = position
-                            AlertControlDialog.Builder()
-                                .setContext(this@AlarmManagementActivity)
-                                .setTitle("确认操作")
-                                .setMessage("确定取消报警吗？")
-                                .setNegativeButton("取消")
-                                .setPositiveButton("确定")
-                                .setOnDialogButtonClickListener(object :
-                                    AlertControlDialog.OnDialogButtonClickListener {
-                                    override fun onConfirmClick() {
-                                        val alarmId = dataBeans[position].id
-                                        if (alarmId.toString().isBlank()) {
-                                            "操作失败，告警ID异常".show(this@AlarmManagementActivity)
-                                            return
-                                        }
-                                        alarmViewModel.obtainOperationResult(alarmId!!.toLong())
-                                    }
-
-                                    override fun onCancelClick() {
-
-                                    }
-                                }).build().show()
-                        }
                     })
                 }
             }
diff --git a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
index 1988902..f4461f4 100644
--- a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
@@ -11,7 +11,6 @@
 import com.pengxh.kt.lite.extensions.launch
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.vm.BaseViewModel
-import com.pengxh.kt.lite.vm.LoadState
 
 class AlarmViewModel : BaseViewModel() {
 
@@ -49,20 +48,4 @@
     }, {
         it.printStackTrace()
     })
-
-    fun obtainOperationResult(alarmId: Long) = launch({
-        loadState.value = LoadState.Loading
-        val response = RetrofitServiceManager.obtainOperationResult(alarmId)
-        val responseCode = response.separateResponseCode()
-        if (responseCode == 200) {
-            loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
-        } else {
-            loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
-        }
-    }, {
-        loadState.value = LoadState.Fail
-        it.printStackTrace()
-    })
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml
index 658b1f2..3cec51f 100644
--- a/app/src/main/res/layout/activity_add_device.xml
+++ b/app/src/main/res/layout/activity_add_device.xml
@@ -26,30 +26,6 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
-                    android:text="设备名称" />
-
-                <EditText
-                    android:id="@+id/deviceNameView"
-                    style="@style/RelativeTextViewStyle"
-                    android:layout_toStartOf="@id/deviceNameTempView"
-                    android:background="@null"
-                    android:hint="@string/unknown"
-                    android:maxLength="20"
-                    android:paddingVertical="@dimen/dp_5"
-                    android:singleLine="true"
-                    android:textColorHint="@color/hintTextColor" />
-
-                <ImageView
-                    android:id="@+id/deviceNameTempView"
-                    style="@style/RelativeRightImageStyle" />
-            </RelativeLayout>
-
-            <View style="@style/DividerViewStyle" />
-
-            <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                <TextView
-                    style="@style/RelativeTextViewStyle"
                     android:text="设备编号" />
 
                 <EditText
@@ -75,6 +51,30 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
+                    android:text="设备名称" />
+
+                <EditText
+                    android:id="@+id/deviceNameView"
+                    style="@style/RelativeTextViewStyle"
+                    android:layout_toStartOf="@id/deviceNameTempView"
+                    android:background="@null"
+                    android:hint="@string/unknown"
+                    android:maxLength="20"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:singleLine="true"
+                    android:textColorHint="@color/hintTextColor" />
+
+                <ImageView
+                    android:id="@+id/deviceNameTempView"
+                    style="@style/RelativeRightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/DividerViewStyle" />
+
+            <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                <TextView
+                    style="@style/RelativeTextViewStyle"
                     android:text="所属项目" />
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 2a239f2..5b7215a 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -29,14 +29,6 @@
             android:text="@string/app_name"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_18" />
-
-        <ImageView
-            android:id="@+id/rightOptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_search_white" />
     </RelativeLayout>
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_device_detail.xml b/app/src/main/res/layout/activity_device_detail.xml
index 33fa3c9..c6d5dd7 100644
--- a/app/src/main/res/layout/activity_device_detail.xml
+++ b/app/src/main/res/layout/activity_device_detail.xml
@@ -52,6 +52,21 @@
 
                     <TextView
                         style="@style/RelativeTextViewStyle"
+                        android:text="设备编号" />
+
+                    <TextView
+                        android:id="@+id/deviceCodeView"
+                        style="@style/RelativeTextViewStyle"
+                        android:layout_alignParentEnd="true"
+                        android:text="@string/unknown" />
+                </RelativeLayout>
+
+                <View style="@style/DividerViewStyle" />
+
+                <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                    <TextView
+                        style="@style/RelativeTextViewStyle"
                         android:text="设备名称" />
 
                     <TextView
@@ -71,21 +86,6 @@
 
                     <TextView
                         style="@style/RelativeTextViewStyle"
-                        android:text="设备编号" />
-
-                    <TextView
-                        android:id="@+id/deviceCodeView"
-                        style="@style/RelativeTextViewStyle"
-                        android:layout_alignParentEnd="true"
-                        android:text="@string/unknown" />
-                </RelativeLayout>
-
-                <View style="@style/DividerViewStyle" />
-
-                <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                    <TextView
-                        style="@style/RelativeTextViewStyle"
                         android:text="所属项目" />
 
                     <TextView
@@ -196,7 +196,7 @@
                     android:id="@+id/collectButton"
                     style="@style/MainButtonStyle"
                     android:layout_width="@dimen/dp_80"
-                    android:layout_height="@dimen/dp_20"
+                    android:layout_height="@dimen/dp_25"
                     android:drawableStart="@drawable/ic_lighting"
                     android:gravity="center_vertical"
                     android:paddingHorizontal="0dp"

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
index 01fb677..4e374ed 100644
--- a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
@@ -7,7 +7,6 @@
 import com.casic.smarttube.adapter.AlarmListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.AlarmListModel
-import com.casic.smarttube.utils.DialogHelper
 import com.casic.smarttube.vm.AlarmViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -16,8 +15,6 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
-import com.pengxh.kt.lite.vm.LoadState
-import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.activity_alarm_management.leftBackView
 import kotlinx.android.synthetic.main.activity_alarm_management.titleView
@@ -34,7 +31,6 @@
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
-    private var clickedPosition = 0
 
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
@@ -43,10 +39,6 @@
         ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this))
         leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
-        rightOptionView.setOnClickListener {
-//            navigatePageTo<SearchAlarmActivity>()
-            "尽情期待～".show(this)
-        }
     }
 
     override fun initData() {
@@ -97,23 +89,6 @@
                 weakReferenceHandler.sendEmptyMessage(2022062501)
             }
         })
-
-        alarmViewModel.loadState.observe(this, {
-            when (it) {
-                is LoadState.Loading -> {
-                    DialogHelper.showLoadingDialog(this, "处理中，请稍后")
-                }
-                is LoadState.Success -> {
-                    DialogHelper.dismissLoadingDialog()
-                    //刷新列表
-                    alarmListAdapter.notifyItemRemoved(clickedPosition)
-                    dataBeans.removeAt(clickedPosition)
-                }
-                else -> {
-                    DialogHelper.dismissLoadingDialog()
-                }
-            }
-        })
     }
 
     private fun obtainAlarmListByPage() {
@@ -145,32 +120,6 @@
                             }
                             navigatePageTo<WellDetailActivity>(wellId)
                         }
-
-                        override fun onOperationClicked(position: Int) {
-                            //标记被点击的item位置
-                            clickedPosition = position
-                            AlertControlDialog.Builder()
-                                .setContext(this@AlarmManagementActivity)
-                                .setTitle("确认操作")
-                                .setMessage("确定取消报警吗？")
-                                .setNegativeButton("取消")
-                                .setPositiveButton("确定")
-                                .setOnDialogButtonClickListener(object :
-                                    AlertControlDialog.OnDialogButtonClickListener {
-                                    override fun onConfirmClick() {
-                                        val alarmId = dataBeans[position].id
-                                        if (alarmId.toString().isBlank()) {
-                                            "操作失败，告警ID异常".show(this@AlarmManagementActivity)
-                                            return
-                                        }
-                                        alarmViewModel.obtainOperationResult(alarmId!!.toLong())
-                                    }
-
-                                    override fun onCancelClick() {
-
-                                    }
-                                }).build().show()
-                        }
                     })
                 }
             }
diff --git a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
index 1988902..f4461f4 100644
--- a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
@@ -11,7 +11,6 @@
 import com.pengxh.kt.lite.extensions.launch
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.vm.BaseViewModel
-import com.pengxh.kt.lite.vm.LoadState
 
 class AlarmViewModel : BaseViewModel() {
 
@@ -49,20 +48,4 @@
     }, {
         it.printStackTrace()
     })
-
-    fun obtainOperationResult(alarmId: Long) = launch({
-        loadState.value = LoadState.Loading
-        val response = RetrofitServiceManager.obtainOperationResult(alarmId)
-        val responseCode = response.separateResponseCode()
-        if (responseCode == 200) {
-            loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
-        } else {
-            loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
-        }
-    }, {
-        loadState.value = LoadState.Fail
-        it.printStackTrace()
-    })
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml
index 658b1f2..3cec51f 100644
--- a/app/src/main/res/layout/activity_add_device.xml
+++ b/app/src/main/res/layout/activity_add_device.xml
@@ -26,30 +26,6 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
-                    android:text="设备名称" />
-
-                <EditText
-                    android:id="@+id/deviceNameView"
-                    style="@style/RelativeTextViewStyle"
-                    android:layout_toStartOf="@id/deviceNameTempView"
-                    android:background="@null"
-                    android:hint="@string/unknown"
-                    android:maxLength="20"
-                    android:paddingVertical="@dimen/dp_5"
-                    android:singleLine="true"
-                    android:textColorHint="@color/hintTextColor" />
-
-                <ImageView
-                    android:id="@+id/deviceNameTempView"
-                    style="@style/RelativeRightImageStyle" />
-            </RelativeLayout>
-
-            <View style="@style/DividerViewStyle" />
-
-            <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                <TextView
-                    style="@style/RelativeTextViewStyle"
                     android:text="设备编号" />
 
                 <EditText
@@ -75,6 +51,30 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
+                    android:text="设备名称" />
+
+                <EditText
+                    android:id="@+id/deviceNameView"
+                    style="@style/RelativeTextViewStyle"
+                    android:layout_toStartOf="@id/deviceNameTempView"
+                    android:background="@null"
+                    android:hint="@string/unknown"
+                    android:maxLength="20"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:singleLine="true"
+                    android:textColorHint="@color/hintTextColor" />
+
+                <ImageView
+                    android:id="@+id/deviceNameTempView"
+                    style="@style/RelativeRightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/DividerViewStyle" />
+
+            <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                <TextView
+                    style="@style/RelativeTextViewStyle"
                     android:text="所属项目" />
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 2a239f2..5b7215a 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -29,14 +29,6 @@
             android:text="@string/app_name"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_18" />
-
-        <ImageView
-            android:id="@+id/rightOptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_search_white" />
     </RelativeLayout>
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_device_detail.xml b/app/src/main/res/layout/activity_device_detail.xml
index 33fa3c9..c6d5dd7 100644
--- a/app/src/main/res/layout/activity_device_detail.xml
+++ b/app/src/main/res/layout/activity_device_detail.xml
@@ -52,6 +52,21 @@
 
                     <TextView
                         style="@style/RelativeTextViewStyle"
+                        android:text="设备编号" />
+
+                    <TextView
+                        android:id="@+id/deviceCodeView"
+                        style="@style/RelativeTextViewStyle"
+                        android:layout_alignParentEnd="true"
+                        android:text="@string/unknown" />
+                </RelativeLayout>
+
+                <View style="@style/DividerViewStyle" />
+
+                <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                    <TextView
+                        style="@style/RelativeTextViewStyle"
                         android:text="设备名称" />
 
                     <TextView
@@ -71,21 +86,6 @@
 
                     <TextView
                         style="@style/RelativeTextViewStyle"
-                        android:text="设备编号" />
-
-                    <TextView
-                        android:id="@+id/deviceCodeView"
-                        style="@style/RelativeTextViewStyle"
-                        android:layout_alignParentEnd="true"
-                        android:text="@string/unknown" />
-                </RelativeLayout>
-
-                <View style="@style/DividerViewStyle" />
-
-                <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                    <TextView
-                        style="@style/RelativeTextViewStyle"
                         android:text="所属项目" />
 
                     <TextView
@@ -196,7 +196,7 @@
                     android:id="@+id/collectButton"
                     style="@style/MainButtonStyle"
                     android:layout_width="@dimen/dp_80"
-                    android:layout_height="@dimen/dp_20"
+                    android:layout_height="@dimen/dp_25"
                     android:drawableStart="@drawable/ic_lighting"
                     android:gravity="center_vertical"
                     android:paddingHorizontal="0dp"
diff --git a/app/src/main/res/layout/item_alarm_recycleview.xml b/app/src/main/res/layout/item_alarm_recycleview.xml
index 1652a24..a8eba9d 100644
--- a/app/src/main/res/layout/item_alarm_recycleview.xml
+++ b/app/src/main/res/layout/item_alarm_recycleview.xml
@@ -71,16 +71,5 @@
             android:layout_centerVertical="true"
             android:text="2022-03-29 08:00:00"
             android:textColor="@color/subTextColor" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/operationButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:paddingVertical="@dimen/dp_3"
-            android:text="取消报警"
-            android:textColor="@color/mainThemeColor"
-            app:qmui_borderColor="@color/mainThemeColor" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 5942ee4..d9d51ae 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
index b89b5f3..ef4f399 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/AlarmListAdapter.kt
@@ -8,7 +8,6 @@
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.smarttube.R
 import com.casic.smarttube.model.AlarmListModel
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class AlarmListAdapter(
     context: Context, private val dataRows: MutableList<AlarmListModel.DataBean.RowsBean>
@@ -39,16 +38,12 @@
         holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}")
         holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}")
         holder.wellLocationView.text = String.format("井位置：${rowsBean.position}")
-        holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}")
+        holder.createTimeView.text = String.format("报警时间：${rowsBean.alarmTime}")
         //绑定事件
         if (listener != null) {
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.operationButton.setChangeAlphaWhenPress(true)
-            holder.operationButton.setOnClickListener {
-                listener!!.onOperationClicked(position)
-            }
         }
     }
 
@@ -59,15 +54,12 @@
         var devCodeView: TextView = view.findViewById(R.id.devCodeView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
-        var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
 
     private var listener: OnItemClickListener? = null
 
     interface OnItemClickListener {
         fun onClicked(position: Int)
-
-        fun onOperationClicked(position: Int)
     }
 
     fun setOnItemClickListener(onClickListener: OnItemClickListener?) {
diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index e3c059d..1cc2ed6 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -54,9 +54,6 @@
             holder.dataHistoryButton.setOnClickListener {
                 listener!!.onHistoryClicked(position)
             }
-            holder.editButton.setOnClickListener {
-                listener!!.onEditClicked(position)
-            }
             holder.wellDetailButton.setOnClickListener {
                 listener!!.onWellDetailClicked(position)
             }
@@ -88,7 +85,6 @@
         var deviceLocationView: TextView = view.findViewById(R.id.deviceLocationView)
         var installDateView: TextView = view.findViewById(R.id.installDateView)
         var dataHistoryButton: QMUIRoundButton = view.findViewById(R.id.dataHistoryButton)
-        var editButton: QMUIRoundButton = view.findViewById(R.id.editButton)
         var wellDetailButton: QMUIRoundButton = view.findViewById(R.id.wellDetailButton)
         var expandableChartView: LineChart = view.findViewById(R.id.expandableChartView)
     }
@@ -100,8 +96,6 @@
 
         fun onHistoryClicked(position: Int)
 
-        fun onEditClicked(position: Int)
-
         fun onWellDetailClicked(position: Int)
     }
 
diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index 405dca4..5b18ed5 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -3,11 +3,11 @@
 import android.os.Handler
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.R
 import com.casic.smarttube.adapter.DeviceListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.DeviceListModel
+import com.casic.smarttube.view.AlarmManagementActivity
 import com.casic.smarttube.view.DeviceDetailActivity
 import com.casic.smarttube.view.HistoryDataActivity
 import com.casic.smarttube.view.WellDetailActivity
@@ -117,10 +117,6 @@
                             requireContext().navigatePageTo<HistoryDataActivity>(dataBeans[position].devcode)
                         }
 
-                        override fun onEditClicked(position: Int) {
-
-                        }
-
                         override fun onWellDetailClicked(position: Int) {
                             requireContext().navigatePageTo<WellDetailActivity>(dataBeans[position].wellId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
index dfc905e..738cc78 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt
@@ -159,18 +159,9 @@
         @Query("beginTime") beginTime: String,
         @Query("endTime") endTime: String,
         @Query("status") status: String,
+        @Query("sort") sort: String,
+        @Query("order") order: String,
         @Query("offset") offset: Int,
         @Query("limit") limit: Int
     ): String
-
-    /**
-     * 消警
-     *
-     * @param alarmId 告警ID
-     */
-    @GET("/alarm/cancelAlarmById")
-    suspend fun obtainOperationResult(
-        @Header("token") token: String,
-        @Query("alarmId") alarmId: Long
-    ): String
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
index b5e7c41..c51557a 100644
--- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt
@@ -135,19 +135,14 @@
             beginTime,
             endTime,
             status,
+            "alarmValue",
+            "desc",
             page,
             LocaleConstant.PAGE_LIMIT
         )
     }
 
     /**
-     * 消警
-     */
-    suspend fun obtainOperationResult(alarmId: Long): String {
-        return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId)
-    }
-
-    /**
      * 上传图片
      */
     suspend fun uploadImage(image: File): String {
diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
index d691dec..910c4a9 100644
--- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt
@@ -60,24 +60,20 @@
 
         uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
 
-        val currentTimeMillis = System.currentTimeMillis()
-
-        //设置相关数据
-        deviceNameView.setText(String.format("管盯$currentTimeMillis"))
-
         val manager = QrManager.getInstance().init(QrConfigCreator.create(this))
         scannerView.setOnClickListener {
             manager.startScan(this) {
                 //TODO isNumber方法无效
                 if (it.content.isNumber()) {
                     deviceCodeView.setText(it.content)
+                    deviceNameView.setText(String.format("管盯${it.content}"))
                 } else {
                     "设备编号错误，请检查标签".show(context)
                 }
             }
         }
 
-        ownerShipTempView.setOnClickListener {
+        ownerShipView.setOnClickListener {
             "尽情期待～".show(this)
         }
 
@@ -152,7 +148,7 @@
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
 
-        addDeviceTimeView.text = currentTimeMillis.timestampToCompleteDate()
+        addDeviceTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
index 01fb677..4e374ed 100644
--- a/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AlarmManagementActivity.kt
@@ -7,7 +7,6 @@
 import com.casic.smarttube.adapter.AlarmListAdapter
 import com.casic.smarttube.extensions.showEmptyPage
 import com.casic.smarttube.model.AlarmListModel
-import com.casic.smarttube.utils.DialogHelper
 import com.casic.smarttube.vm.AlarmViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -16,8 +15,6 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
-import com.pengxh.kt.lite.vm.LoadState
-import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.activity_alarm_management.leftBackView
 import kotlinx.android.synthetic.main.activity_alarm_management.titleView
@@ -34,7 +31,6 @@
     private var pageIndex = 1
     private var isRefresh = false
     private var isLoadMore = false
-    private var clickedPosition = 0
 
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
@@ -43,10 +39,6 @@
         ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this))
         leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
-        rightOptionView.setOnClickListener {
-//            navigatePageTo<SearchAlarmActivity>()
-            "尽情期待～".show(this)
-        }
     }
 
     override fun initData() {
@@ -97,23 +89,6 @@
                 weakReferenceHandler.sendEmptyMessage(2022062501)
             }
         })
-
-        alarmViewModel.loadState.observe(this, {
-            when (it) {
-                is LoadState.Loading -> {
-                    DialogHelper.showLoadingDialog(this, "处理中，请稍后")
-                }
-                is LoadState.Success -> {
-                    DialogHelper.dismissLoadingDialog()
-                    //刷新列表
-                    alarmListAdapter.notifyItemRemoved(clickedPosition)
-                    dataBeans.removeAt(clickedPosition)
-                }
-                else -> {
-                    DialogHelper.dismissLoadingDialog()
-                }
-            }
-        })
     }
 
     private fun obtainAlarmListByPage() {
@@ -145,32 +120,6 @@
                             }
                             navigatePageTo<WellDetailActivity>(wellId)
                         }
-
-                        override fun onOperationClicked(position: Int) {
-                            //标记被点击的item位置
-                            clickedPosition = position
-                            AlertControlDialog.Builder()
-                                .setContext(this@AlarmManagementActivity)
-                                .setTitle("确认操作")
-                                .setMessage("确定取消报警吗？")
-                                .setNegativeButton("取消")
-                                .setPositiveButton("确定")
-                                .setOnDialogButtonClickListener(object :
-                                    AlertControlDialog.OnDialogButtonClickListener {
-                                    override fun onConfirmClick() {
-                                        val alarmId = dataBeans[position].id
-                                        if (alarmId.toString().isBlank()) {
-                                            "操作失败，告警ID异常".show(this@AlarmManagementActivity)
-                                            return
-                                        }
-                                        alarmViewModel.obtainOperationResult(alarmId!!.toLong())
-                                    }
-
-                                    override fun onCancelClick() {
-
-                                    }
-                                }).build().show()
-                        }
                     })
                 }
             }
diff --git a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
index 1988902..f4461f4 100644
--- a/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/smarttube/vm/AlarmViewModel.kt
@@ -11,7 +11,6 @@
 import com.pengxh.kt.lite.extensions.launch
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.vm.BaseViewModel
-import com.pengxh.kt.lite.vm.LoadState
 
 class AlarmViewModel : BaseViewModel() {
 
@@ -49,20 +48,4 @@
     }, {
         it.printStackTrace()
     })
-
-    fun obtainOperationResult(alarmId: Long) = launch({
-        loadState.value = LoadState.Loading
-        val response = RetrofitServiceManager.obtainOperationResult(alarmId)
-        val responseCode = response.separateResponseCode()
-        if (responseCode == 200) {
-            loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
-        } else {
-            loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
-        }
-    }, {
-        loadState.value = LoadState.Fail
-        it.printStackTrace()
-    })
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml
index 658b1f2..3cec51f 100644
--- a/app/src/main/res/layout/activity_add_device.xml
+++ b/app/src/main/res/layout/activity_add_device.xml
@@ -26,30 +26,6 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
-                    android:text="设备名称" />
-
-                <EditText
-                    android:id="@+id/deviceNameView"
-                    style="@style/RelativeTextViewStyle"
-                    android:layout_toStartOf="@id/deviceNameTempView"
-                    android:background="@null"
-                    android:hint="@string/unknown"
-                    android:maxLength="20"
-                    android:paddingVertical="@dimen/dp_5"
-                    android:singleLine="true"
-                    android:textColorHint="@color/hintTextColor" />
-
-                <ImageView
-                    android:id="@+id/deviceNameTempView"
-                    style="@style/RelativeRightImageStyle" />
-            </RelativeLayout>
-
-            <View style="@style/DividerViewStyle" />
-
-            <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                <TextView
-                    style="@style/RelativeTextViewStyle"
                     android:text="设备编号" />
 
                 <EditText
@@ -75,6 +51,30 @@
 
                 <TextView
                     style="@style/RelativeTextViewStyle"
+                    android:text="设备名称" />
+
+                <EditText
+                    android:id="@+id/deviceNameView"
+                    style="@style/RelativeTextViewStyle"
+                    android:layout_toStartOf="@id/deviceNameTempView"
+                    android:background="@null"
+                    android:hint="@string/unknown"
+                    android:maxLength="20"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:singleLine="true"
+                    android:textColorHint="@color/hintTextColor" />
+
+                <ImageView
+                    android:id="@+id/deviceNameTempView"
+                    style="@style/RelativeRightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/DividerViewStyle" />
+
+            <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                <TextView
+                    style="@style/RelativeTextViewStyle"
                     android:text="所属项目" />
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 2a239f2..5b7215a 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -29,14 +29,6 @@
             android:text="@string/app_name"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_18" />
-
-        <ImageView
-            android:id="@+id/rightOptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_search_white" />
     </RelativeLayout>
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_device_detail.xml b/app/src/main/res/layout/activity_device_detail.xml
index 33fa3c9..c6d5dd7 100644
--- a/app/src/main/res/layout/activity_device_detail.xml
+++ b/app/src/main/res/layout/activity_device_detail.xml
@@ -52,6 +52,21 @@
 
                     <TextView
                         style="@style/RelativeTextViewStyle"
+                        android:text="设备编号" />
+
+                    <TextView
+                        android:id="@+id/deviceCodeView"
+                        style="@style/RelativeTextViewStyle"
+                        android:layout_alignParentEnd="true"
+                        android:text="@string/unknown" />
+                </RelativeLayout>
+
+                <View style="@style/DividerViewStyle" />
+
+                <RelativeLayout style="@style/RelativeItemLayoutStyle">
+
+                    <TextView
+                        style="@style/RelativeTextViewStyle"
                         android:text="设备名称" />
 
                     <TextView
@@ -71,21 +86,6 @@
 
                     <TextView
                         style="@style/RelativeTextViewStyle"
-                        android:text="设备编号" />
-
-                    <TextView
-                        android:id="@+id/deviceCodeView"
-                        style="@style/RelativeTextViewStyle"
-                        android:layout_alignParentEnd="true"
-                        android:text="@string/unknown" />
-                </RelativeLayout>
-
-                <View style="@style/DividerViewStyle" />
-
-                <RelativeLayout style="@style/RelativeItemLayoutStyle">
-
-                    <TextView
-                        style="@style/RelativeTextViewStyle"
                         android:text="所属项目" />
 
                     <TextView
@@ -196,7 +196,7 @@
                     android:id="@+id/collectButton"
                     style="@style/MainButtonStyle"
                     android:layout_width="@dimen/dp_80"
-                    android:layout_height="@dimen/dp_20"
+                    android:layout_height="@dimen/dp_25"
                     android:drawableStart="@drawable/ic_lighting"
                     android:gravity="center_vertical"
                     android:paddingHorizontal="0dp"
diff --git a/app/src/main/res/layout/item_alarm_recycleview.xml b/app/src/main/res/layout/item_alarm_recycleview.xml
index 1652a24..a8eba9d 100644
--- a/app/src/main/res/layout/item_alarm_recycleview.xml
+++ b/app/src/main/res/layout/item_alarm_recycleview.xml
@@ -71,16 +71,5 @@
             android:layout_centerVertical="true"
             android:text="2022-03-29 08:00:00"
             android:textColor="@color/subTextColor" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/operationButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:paddingVertical="@dimen/dp_3"
-            android:text="取消报警"
-            android:textColor="@color/mainThemeColor"
-            app:qmui_borderColor="@color/mainThemeColor" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_device_recycleview.xml b/app/src/main/res/layout/item_device_recycleview.xml
index 04fc1be..9a2eff8 100644
--- a/app/src/main/res/layout/item_device_recycleview.xml
+++ b/app/src/main/res/layout/item_device_recycleview.xml
@@ -60,7 +60,7 @@
             android:id="@+id/ownerShipView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_5"
+            android:layout_marginVertical="@dimen/dp_5"
             android:text="权属单位：燃气集团总公司"
             android:textColor="@color/subTextColor"
             android:textSize="@dimen/sp_14" />
@@ -98,6 +98,7 @@
                 android:id="@+id/dataHistoryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_10"
                 android:paddingHorizontal="@dimen/dp_10"
                 android:paddingVertical="@dimen/dp_3"
                 android:text="历史数据"
@@ -106,18 +107,6 @@
                 app:qmui_borderColor="@color/mainTextColor" />
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/editButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="@dimen/dp_3"
-                android:text="编辑"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_12"
-                app:qmui_borderColor="@color/mainTextColor" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:id="@+id/wellDetailButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"