diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index 66f7e3d..2a6d344 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -22,7 +22,7 @@
 import com.casic.qd.smartwell.utils.LoadState
 import com.casic.qd.smartwell.vm.AlarmListViewModel
 import com.casic.qd.smartwell.vm.CancelAlarmViewModel
-import com.casic.qd.smartwell.widgets.CancelAlarmDialog
+import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import java.lang.ref.WeakReference
@@ -161,32 +161,20 @@
                             }
 
                             override fun onOperationClicked(position: Int) {
-                                val wellDetail = activity.dataBeans[position]
-                                CancelAlarmDialog.Builder()
+                                AlertControlDialog.Builder()
                                     .setContext(activity)
-                                    .setTitle("取消告警")
-                                    .setHintMessage("请输入详细的告警取消原因")
+                                    .setTitle("确认操作")
+                                    .setMessage("确定取消报警吗？")
                                     .setNegativeButton("取消")
                                     .setPositiveButton("确定")
                                     .setOnDialogButtonClickListener(object :
-                                        CancelAlarmDialog.OnDialogButtonClickListener {
-                                        override fun onConfirmClick(
-                                            spinnerValue: String, inputValue: String
-                                        ) {
-                                            /**
-                                             * http://111.198.10.15:20104/alarm/cancelAlarm?id=&jobStatus=3&handleMessage=2fsdf
-                                             * POST
-                                             * */
-                                            val alarmId = wellDetail.id
+                                        AlertControlDialog.OnDialogButtonClickListener {
+                                        override fun onConfirmClick() {
+                                            val alarmId = activity.dataBeans[position].id
                                             if (alarmId.toString().isBlank()) {
                                                 "操作失败，告警ID异常".show()
                                                 return
                                             }
-                                            val jobStatus = when (spinnerValue) {
-                                                "已处理" -> "3"
-                                                "无需处理" -> "4"
-                                                else -> ""
-                                            }
                                             activity.cancelAlarmViewModel.obtainOperationResult(
                                                 alarmId!!
                                             )

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index 66f7e3d..2a6d344 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -22,7 +22,7 @@
 import com.casic.qd.smartwell.utils.LoadState
 import com.casic.qd.smartwell.vm.AlarmListViewModel
 import com.casic.qd.smartwell.vm.CancelAlarmViewModel
-import com.casic.qd.smartwell.widgets.CancelAlarmDialog
+import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_alarm_management.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import java.lang.ref.WeakReference
@@ -161,32 +161,20 @@
                             }
 
                             override fun onOperationClicked(position: Int) {
-                                val wellDetail = activity.dataBeans[position]
-                                CancelAlarmDialog.Builder()
+                                AlertControlDialog.Builder()
                                     .setContext(activity)
-                                    .setTitle("取消告警")
-                                    .setHintMessage("请输入详细的告警取消原因")
+                                    .setTitle("确认操作")
+                                    .setMessage("确定取消报警吗？")
                                     .setNegativeButton("取消")
                                     .setPositiveButton("确定")
                                     .setOnDialogButtonClickListener(object :
-                                        CancelAlarmDialog.OnDialogButtonClickListener {
-                                        override fun onConfirmClick(
-                                            spinnerValue: String, inputValue: String
-                                        ) {
-                                            /**
-                                             * http://111.198.10.15:20104/alarm/cancelAlarm?id=&jobStatus=3&handleMessage=2fsdf
-                                             * POST
-                                             * */
-                                            val alarmId = wellDetail.id
+                                        AlertControlDialog.OnDialogButtonClickListener {
+                                        override fun onConfirmClick() {
+                                            val alarmId = activity.dataBeans[position].id
                                             if (alarmId.toString().isBlank()) {
                                                 "操作失败，告警ID异常".show()
                                                 return
                                             }
-                                            val jobStatus = when (spinnerValue) {
-                                                "已处理" -> "3"
-                                                "无需处理" -> "4"
-                                                else -> ""
-                                            }
                                             activity.cancelAlarmViewModel.obtainOperationResult(
                                                 alarmId!!
                                             )
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt
index 4bb3e5f..9be9a64 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt
@@ -21,8 +21,6 @@
 
     private val kTag = "ExpandedActivity"
     private lateinit var waterViewModel: WaterStatisticsViewModel
-    private val xAxisDate: MutableList<String> = ArrayList()
-    private val entryModels: MutableList<LineChartEntryModel> = ArrayList()
     private var startDate = ""
 
     override fun initLayoutView(): Int = R.layout.activity_expanded
@@ -96,6 +94,9 @@
 
         waterViewModel.areaDataModel.observe(this, {
             if (it.code == 200) {
+                val xAxisDate: MutableList<String> = ArrayList()
+                val entryModels: MutableList<LineChartEntryModel> = ArrayList()
+
                 val dataModel = it.data!!
                 dataModel.forEach { dateModel ->
                     val split = dateModel.date.toString().split("-")