diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index e34bbb8..85ea0ed 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -23,6 +23,7 @@
     const val USER_ID = "USER_ID"
     const val USER_COMPANY_ID = "USER_COMPANY_ID"
     const val OBJECT_ID = "OBJECT_ID"
+    const val TASK_ID = "TASK_ID"
     const val SERVER_IP = "SERVER_IP"
     const val SERVER_PORT = "SERVER_PORT"
     const val APP_AUTHORITY = "com.casic.detector.fileprovider"

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index e34bbb8..85ea0ed 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -23,6 +23,7 @@
     const val USER_ID = "USER_ID"
     const val USER_COMPANY_ID = "USER_COMPANY_ID"
     const val OBJECT_ID = "OBJECT_ID"
+    const val TASK_ID = "TASK_ID"
     const val SERVER_IP = "SERVER_IP"
     const val SERVER_PORT = "SERVER_PORT"
     const val APP_AUTHORITY = "com.casic.detector.fileprovider"
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 0dc3d5d..8516e0c 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -425,6 +425,7 @@
                     .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener {
                         override fun onActionItemClick(position: Int) {
                             val taskBean = task[position]
+                            SaveKeyValues.putValue(LocaleConstant.TASK_ID, taskBean.taskId)
                             AlertControlDialog.Builder()
                                 .setContext(context)
                                 .setTitle("提示")
@@ -570,14 +571,14 @@
         }
     }
 
-    //TODO 事件上报
     private fun uploadEvent() {
+        val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
+        if (taskId.isBlank()) {
+            "请点击[巡检]并选择执行工单！".show(this)
+            return
+        }
         if (latitude != 0.0 && longitude != 0.0) {
-            if (true) {
-                navigatePageTo<UploadEventActivity>()
-            } else {
-                "请点击[巡检]并选择执行工单！".show(this)
-            }
+            navigatePageTo<UploadEventActivity>()
         } else {
             "定位中，请稍后再试...".show(this)
         }

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index e34bbb8..85ea0ed 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -23,6 +23,7 @@
     const val USER_ID = "USER_ID"
     const val USER_COMPANY_ID = "USER_COMPANY_ID"
     const val OBJECT_ID = "OBJECT_ID"
+    const val TASK_ID = "TASK_ID"
     const val SERVER_IP = "SERVER_IP"
     const val SERVER_PORT = "SERVER_PORT"
     const val APP_AUTHORITY = "com.casic.detector.fileprovider"
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 0dc3d5d..8516e0c 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -425,6 +425,7 @@
                     .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener {
                         override fun onActionItemClick(position: Int) {
                             val taskBean = task[position]
+                            SaveKeyValues.putValue(LocaleConstant.TASK_ID, taskBean.taskId)
                             AlertControlDialog.Builder()
                                 .setContext(context)
                                 .setTitle("提示")
@@ -570,14 +571,14 @@
         }
     }
 
-    //TODO 事件上报
     private fun uploadEvent() {
+        val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
+        if (taskId.isBlank()) {
+            "请点击[巡检]并选择执行工单！".show(this)
+            return
+        }
         if (latitude != 0.0 && longitude != 0.0) {
-            if (true) {
-                navigatePageTo<UploadEventActivity>()
-            } else {
-                "请点击[巡检]并选择执行工单！".show(this)
-            }
+            navigatePageTo<UploadEventActivity>()
         } else {
             "定位中，请稍后再试...".show(this)
         }
diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
index cf8d46b..b9de0ff 100644
--- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
@@ -51,6 +51,8 @@
         params.height = ((getScreenHeight() * 0.7).toInt())
         window.attributes = params
 
+        val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
+
         val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") as String
         userNameView.text = userName
 
@@ -95,6 +97,7 @@
                 LoadState.Loading -> LoadingDialogHub.show(this, "事件上报中，请稍后...")
                 LoadState.Success -> {
                     LoadingDialogHub.dismiss()
+                    "事件上报成功！".show(this)
                     finish()
                 }
                 else -> LoadingDialogHub.dismiss()
@@ -113,7 +116,7 @@
             eventModel.latitude = lngView.text.toString().toDouble()
             eventModel.longitude = latView.text.toString().toDouble()
 
-            taskViewModel.uploadEvent("", eventModel.toJson(), realPaths)
+            taskViewModel.uploadEvent(taskId, eventModel.toJson(), realPaths)
         }
     }
 

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index e34bbb8..85ea0ed 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -23,6 +23,7 @@
     const val USER_ID = "USER_ID"
     const val USER_COMPANY_ID = "USER_COMPANY_ID"
     const val OBJECT_ID = "OBJECT_ID"
+    const val TASK_ID = "TASK_ID"
     const val SERVER_IP = "SERVER_IP"
     const val SERVER_PORT = "SERVER_PORT"
     const val APP_AUTHORITY = "com.casic.detector.fileprovider"
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 0dc3d5d..8516e0c 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -425,6 +425,7 @@
                     .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener {
                         override fun onActionItemClick(position: Int) {
                             val taskBean = task[position]
+                            SaveKeyValues.putValue(LocaleConstant.TASK_ID, taskBean.taskId)
                             AlertControlDialog.Builder()
                                 .setContext(context)
                                 .setTitle("提示")
@@ -570,14 +571,14 @@
         }
     }
 
-    //TODO 事件上报
     private fun uploadEvent() {
+        val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
+        if (taskId.isBlank()) {
+            "请点击[巡检]并选择执行工单！".show(this)
+            return
+        }
         if (latitude != 0.0 && longitude != 0.0) {
-            if (true) {
-                navigatePageTo<UploadEventActivity>()
-            } else {
-                "请点击[巡检]并选择执行工单！".show(this)
-            }
+            navigatePageTo<UploadEventActivity>()
         } else {
             "定位中，请稍后再试...".show(this)
         }
diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
index cf8d46b..b9de0ff 100644
--- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
@@ -51,6 +51,8 @@
         params.height = ((getScreenHeight() * 0.7).toInt())
         window.attributes = params
 
+        val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
+
         val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") as String
         userNameView.text = userName
 
@@ -95,6 +97,7 @@
                 LoadState.Loading -> LoadingDialogHub.show(this, "事件上报中，请稍后...")
                 LoadState.Success -> {
                     LoadingDialogHub.dismiss()
+                    "事件上报成功！".show(this)
                     finish()
                 }
                 else -> LoadingDialogHub.dismiss()
@@ -113,7 +116,7 @@
             eventModel.latitude = lngView.text.toString().toDouble()
             eventModel.longitude = latView.text.toString().toDouble()
 
-            taskViewModel.uploadEvent("", eventModel.toJson(), realPaths)
+            taskViewModel.uploadEvent(taskId, eventModel.toJson(), realPaths)
         }
     }
 
diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
index b0b56c5..0ff8bf4 100644
--- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
@@ -10,10 +10,12 @@
 import com.casic.detector.model.TaskModel
 import com.casic.detector.retrofit.RetrofitServiceManager
 import com.casic.detector.utils.DataBaseManager
+import com.casic.detector.utils.LocaleConstant
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.pengxh.kt.lite.extensions.launch
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.vm.BaseViewModel
 import com.pengxh.kt.lite.vm.LoadState
 
@@ -142,6 +144,7 @@
                 "工单${taskId}已提交！".show(BaseApplication.get())
                 //删除本地数据库
                 DataBaseManager.get.deleteTaskById(taskId)
+                SaveKeyValues.putValue(LocaleConstant.TASK_ID, "")
             }
         } else {
             loadState.value = LoadState.Fail