diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
index 0c8b31e..59b6a3e 100644
Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index f57b525..710bc3c 100644
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -142,8 +142,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "487"
-            endingLineNumber = "487"
+            startingLineNumber = "524"
+            endingLineNumber = "524"
             landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1294,8 +1294,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "771"
-            endingLineNumber = "771"
+            startingLineNumber = "818"
+            endingLineNumber = "818"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1518,8 +1518,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "236"
-            endingLineNumber = "236"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1630,8 +1630,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "272"
-            endingLineNumber = "272"
+            startingLineNumber = "297"
+            endingLineNumber = "297"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1646,8 +1646,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "248"
-            endingLineNumber = "248"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1662,8 +1662,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "460"
-            endingLineNumber = "460"
+            startingLineNumber = "497"
+            endingLineNumber = "497"
             landmarkName = "reloadData(index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1678,8 +1678,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "457"
-            endingLineNumber = "457"
+            startingLineNumber = "494"
+            endingLineNumber = "494"
             landmarkName = "reloadData(index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1694,8 +1694,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "461"
-            endingLineNumber = "461"
+            startingLineNumber = "498"
+            endingLineNumber = "498"
             landmarkName = "reloadData(index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2478,8 +2478,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "288"
-            endingLineNumber = "288"
+            startingLineNumber = "325"
+            endingLineNumber = "325"
             landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3102,8 +3102,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "818"
-            endingLineNumber = "818"
+            startingLineNumber = "865"
+            endingLineNumber = "865"
             landmarkName = "addSubviews()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3118,8 +3118,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "341"
-            endingLineNumber = "341"
+            startingLineNumber = "378"
+            endingLineNumber = "378"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3134,8 +3134,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "522"
-            endingLineNumber = "522"
+            startingLineNumber = "559"
+            endingLineNumber = "559"
             landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3150,8 +3150,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "392"
-            endingLineNumber = "392"
+            startingLineNumber = "429"
+            endingLineNumber = "429"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3166,8 +3166,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "369"
-            endingLineNumber = "369"
+            startingLineNumber = "406"
+            endingLineNumber = "406"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3182,8 +3182,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "398"
-            endingLineNumber = "398"
+            startingLineNumber = "435"
+            endingLineNumber = "435"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3198,8 +3198,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "406"
-            endingLineNumber = "406"
+            startingLineNumber = "443"
+            endingLineNumber = "443"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3214,8 +3214,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "883"
-            endingLineNumber = "883"
+            startingLineNumber = "930"
+            endingLineNumber = "930"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3294,8 +3294,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1277"
-            endingLineNumber = "1277"
+            startingLineNumber = "1340"
+            endingLineNumber = "1340"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3310,8 +3310,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1289"
-            endingLineNumber = "1289"
+            startingLineNumber = "1352"
+            endingLineNumber = "1352"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3326,8 +3326,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1291"
-            endingLineNumber = "1291"
+            startingLineNumber = "1354"
+            endingLineNumber = "1354"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3374,28 +3374,12 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1118"
-            endingLineNumber = "1118"
+            startingLineNumber = "1169"
+            endingLineNumber = "1169"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A236B19B-432D-4E54-A029-53C6A01B9087"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1425"
-            endingLineNumber = "1425"
-            landmarkName = "updateData(taskModel:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -3422,8 +3406,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1280"
-            endingLineNumber = "1280"
+            startingLineNumber = "1343"
+            endingLineNumber = "1343"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3438,8 +3422,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1293"
-            endingLineNumber = "1293"
+            startingLineNumber = "1356"
+            endingLineNumber = "1356"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3454,8 +3438,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1123"
-            endingLineNumber = "1123"
+            startingLineNumber = "1182"
+            endingLineNumber = "1182"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3470,8 +3454,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1292"
-            endingLineNumber = "1292"
+            startingLineNumber = "1355"
+            endingLineNumber = "1355"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3486,8 +3470,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "399"
-            endingLineNumber = "399"
+            startingLineNumber = "436"
+            endingLineNumber = "436"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3502,8 +3486,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "643"
-            endingLineNumber = "643"
+            startingLineNumber = "682"
+            endingLineNumber = "682"
             landmarkName = "showListDetail(vehicleModel:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3518,8 +3502,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "150"
-            endingLineNumber = "150"
+            startingLineNumber = "153"
+            endingLineNumber = "153"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3534,8 +3518,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "202"
-            endingLineNumber = "202"
+            startingLineNumber = "206"
+            endingLineNumber = "206"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3550,8 +3534,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "863"
-            endingLineNumber = "863"
+            startingLineNumber = "910"
+            endingLineNumber = "910"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3566,8 +3550,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "869"
-            endingLineNumber = "869"
+            startingLineNumber = "916"
+            endingLineNumber = "916"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3582,8 +3566,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "875"
-            endingLineNumber = "875"
+            startingLineNumber = "922"
+            endingLineNumber = "922"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3662,8 +3646,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1431"
-            endingLineNumber = "1431"
+            startingLineNumber = "1494"
+            endingLineNumber = "1494"
             landmarkName = "listView()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3694,8 +3678,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "371"
-            endingLineNumber = "371"
+            startingLineNumber = "408"
+            endingLineNumber = "408"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3710,8 +3694,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "388"
-            endingLineNumber = "388"
+            startingLineNumber = "425"
+            endingLineNumber = "425"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3742,8 +3726,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "897"
-            endingLineNumber = "897"
+            startingLineNumber = "944"
+            endingLineNumber = "944"
             landmarkName = "viewDidAppear(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3952,8 +3936,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1281"
             endingLineNumber = "1281"
-            landmarkName = "unknown"
-            landmarkType = "0">
+            landmarkName = "RescuePendingDispatchController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -4078,8 +4062,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "221"
-            endingLineNumber = "221"
+            startingLineNumber = "222"
+            endingLineNumber = "222"
             landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4094,8 +4078,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "226"
-            endingLineNumber = "226"
+            startingLineNumber = "227"
+            endingLineNumber = "227"
             landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4110,8 +4094,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "230"
-            endingLineNumber = "230"
+            startingLineNumber = "231"
+            endingLineNumber = "231"
             landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4126,8 +4110,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "507"
-            endingLineNumber = "507"
+            startingLineNumber = "544"
+            endingLineNumber = "544"
             landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4142,8 +4126,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "497"
-            endingLineNumber = "497"
+            startingLineNumber = "534"
+            endingLineNumber = "534"
             landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4206,8 +4190,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "259"
-            endingLineNumber = "259"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
             landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4238,8 +4222,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "310"
-            endingLineNumber = "310"
+            startingLineNumber = "335"
+            endingLineNumber = "335"
             landmarkName = "modifyMapAnchor()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4254,8 +4238,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "414"
-            endingLineNumber = "414"
+            startingLineNumber = "439"
+            endingLineNumber = "439"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4270,8 +4254,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "435"
-            endingLineNumber = "435"
+            startingLineNumber = "460"
+            endingLineNumber = "460"
             landmarkName = "tableView(_:didSelectRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4286,8 +4270,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "662"
-            endingLineNumber = "662"
+            startingLineNumber = "699"
+            endingLineNumber = "699"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4350,8 +4334,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "635"
-            endingLineNumber = "635"
+            startingLineNumber = "674"
+            endingLineNumber = "674"
             landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4366,8 +4350,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "557"
-            endingLineNumber = "557"
+            startingLineNumber = "594"
+            endingLineNumber = "594"
             landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4788,5 +4772,117 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "42C69576-6BAF-4E94-9845-ADDEF6A85C4E"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "215"
+            endingLineNumber = "215"
+            landmarkName = "addAction()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "258E3FE3-3876-4343-8D7E-490FB7883D03"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "307"
+            endingLineNumber = "307"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F0803935-DB41-4D36-92A5-70F8B268AF66"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "309"
+            endingLineNumber = "309"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "63B85F8C-0BC7-40B1-8190-A04F32FCF509"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "313"
+            endingLineNumber = "313"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "90014847-24AB-4BB5-A182-CED60C2446FF"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "303"
+            endingLineNumber = "303"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "704FCEA3-3711-4C0B-B726-0E2E669BC458"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "293"
+            endingLineNumber = "293"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "216D199F-7FAC-4A6A-B9DB-ED7A383438EC"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "462"
+            endingLineNumber = "462"
+            landmarkName = "tableView(_:didSelectRowAt:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/Contents.json b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/Contents.json
new file mode 100644
index 0000000..441522c
--- /dev/null
+++ b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "vehichleMonitoring_start_16.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "vehichleMonitoring_start_16@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "vehichleMonitoring_start_16@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16.png
new file mode 100644
index 0000000..4383642
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16@2x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16@2x.png
new file mode 100644
index 0000000..75bc66a
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16@2x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16@3x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16@3x.png
new file mode 100644
index 0000000..11d9e16
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_16.imageset/vehichleMonitoring_start_16@3x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/Contents.json b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/Contents.json
new file mode 100644
index 0000000..792070a
--- /dev/null
+++ b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "vehichleMonitoring_start_32.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "vehichleMonitoring_start_32@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "vehichleMonitoring_start_32@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32.png
new file mode 100644
index 0000000..5a02eaa
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32@2x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32@2x.png
new file mode 100644
index 0000000..5949634
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32@2x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32@3x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32@3x.png
new file mode 100644
index 0000000..a599778
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_start_32.imageset/vehichleMonitoring_start_32@3x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/Contents.json b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/Contents.json
new file mode 100644
index 0000000..f71461f
--- /dev/null
+++ b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "vehichleMonitoring_task_vertical_line.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "vehichleMonitoring_task_vertical_line@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "vehichleMonitoring_task_vertical_line@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line.png
new file mode 100644
index 0000000..491c3eb
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line@2x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line@2x.png
new file mode 100644
index 0000000..7e0c547
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line@2x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line@3x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line@3x.png
new file mode 100644
index 0000000..082dae0
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_task_vertical_line.imageset/vehichleMonitoring_task_vertical_line@3x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/Contents.json b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/Contents.json
new file mode 100644
index 0000000..4a168b7
--- /dev/null
+++ b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "vehichleMonitoring_terminal_16.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "vehichleMonitoring_terminal_16@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "vehichleMonitoring_terminal_16@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16.png
new file mode 100644
index 0000000..584c75c
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16@2x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16@2x.png
new file mode 100644
index 0000000..aa449dc
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16@2x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16@3x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16@3x.png
new file mode 100644
index 0000000..348ca53
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_16.imageset/vehichleMonitoring_terminal_16@3x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/Contents.json b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/Contents.json
new file mode 100644
index 0000000..3775ee4
--- /dev/null
+++ b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "vehichleMonitoring_terminal_32.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "vehichleMonitoring_terminal_32@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "vehichleMonitoring_terminal_32@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32.png
new file mode 100644
index 0000000..81230a5
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32@2x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32@2x.png
new file mode 100644
index 0000000..5c7954c
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32@2x.png differ
diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32@3x.png b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32@3x.png
new file mode 100644
index 0000000..eda84eb
Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/vehichleMonitoring_terminal_32.imageset/vehichleMonitoring_terminal_32@3x.png differ
diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
index a229e76..ae4a810 100644
--- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
+++ b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
@@ -216,6 +216,7 @@ extension DispatchOrderController {
             annotationView.middleImageView.isHidden = true
             annotationView.bigImageView.image = bigImage
             annotationView.bigStateLabel.text = vehicleModel.vehicleTypeStr
+            annotationView.titleLabel.backgroundColor = .hex("FFFFFF")
         }else{
             annotationView.bigImageView.isHidden = true
             annotationView.bigStateLabel.isHidden = true
@@ -233,6 +234,7 @@ extension DispatchOrderController {
                 annotationView.middleImageView.image = middleImage
                 annotationView.middleStateLabel.text = vehicleModel.vehicleTypeStr
             }
+            annotationView.titleLabel.backgroundColor = .clear
         }
         
         annotationView.titleLabel.text = vehicleModel.vehicleName
@@ -295,6 +297,29 @@ extension DispatchOrderController {
         dispatchOrderView.dispatchPannelView.tableView.reloadData()
     }
     
+    func showIncidentLocation(incidentCoordi: CLLocationCoordinate2D,destCoordi: CLLocationCoordinate2D?) {
+        let incidentCoordiAnnotation = MAPointAnnotation()
+        incidentCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_start_32")
+        incidentCoordiAnnotation.coordinate = incidentCoordi
+        incidentCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+        dispatchOrderView.maMapView.maMapView.addAnnotation(incidentCoordiAnnotation)
+        if let destCoordi {
+            let destCoordiAnnotation = MAPointAnnotation()
+            destCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_terminal_32")
+            destCoordiAnnotation.coordinate = destCoordi
+            destCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+            dispatchOrderView.maMapView.maMapView.addAnnotation(destCoordiAnnotation)
+        }
+    }
+    
+    func hideIncidentLocation() {
+        let annotations = dispatchOrderView.maMapView.maMapView.annotations.filter { item in
+            let annotation = item as? MAPointAnnotation
+            return annotation?.annotationClass == VehicleMonitoringIncidentLocationAnnotationView.self
+        }
+        dispatchOrderView.maMapView.maMapView.removeAnnotations(annotations)
+    }
+    
     func resetSelectedOfDataModel() {
         // 去掉其他tableview的选中
         for index in 0..<resultArr.count {
@@ -477,6 +502,18 @@ extension DispatchOrderController : DDMAMapViewDelegate {
                 annotationView!.annotation = pointAnnotation
                 return annotationView!
             }
+            
+            if pointAnnotation.annotationClass == VehicleMonitoringIncidentLocationAnnotationView.self {
+                let incidentPointReuseIndentifier = "VehicleMonitoringIncidentLocationAnnotationView"
+                var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: incidentPointReuseIndentifier) as? VehicleMonitoringIncidentLocationAnnotationView
+                if annotationView == nil {
+                    annotationView = VehicleMonitoringIncidentLocationAnnotationView.init(annotation: pointAnnotation, reuseIdentifier: incidentPointReuseIndentifier)
+                }
+                annotationView!.annotation = pointAnnotation
+                annotationView!.image = pointAnnotation.dd_image
+                annotationView!.zIndex = Int.max
+                return annotationView!
+            }
         }
 
         return MAAnnotationView.init(annotation: annotation, reuseIdentifier: "cell")
diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
index e1e814a..cb65578 100644
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
+++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
@@ -97,6 +97,9 @@ extension VehicleMonitoringController {
                     self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.reloadData()
                 }
                 
+                /// 从详情页返回
+                self?.vehicleMonitoringListDetailView.backButton.sendActions(for: .touchUpInside)
+
                 /// 重置地图锚点
                 self?.modifyMapAnchor()
             })
@@ -183,6 +186,7 @@ extension VehicleMonitoringController {
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
                 self?.hideListDetail()
+                self?.hideIncidentLocation()
             })
             .disposed(by: disposeBag)
         
@@ -202,6 +206,27 @@ extension VehicleMonitoringController {
             })
             .disposed(by: disposeBag)
         
+        vehicleMonitoringListDetailView.showIncidentLocationHandler = {[weak self] incidentCoordi,destCoordi in
+            let incidentCoordiAnnotation = MAPointAnnotation()
+            incidentCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_start_32")
+            incidentCoordiAnnotation.coordinate = incidentCoordi
+//            incidentCoordiAnnotation.tag = -1
+            incidentCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+            self?.vehicleMonitoringView.maMapView.maMapView.addAnnotation(incidentCoordiAnnotation)
+            if let destCoordi {
+                let destCoordiAnnotation = MAPointAnnotation()
+                destCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_terminal_32")
+                destCoordiAnnotation.coordinate = destCoordi
+//                destCoordiAnnotation.tag = -2
+                destCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+                self?.vehicleMonitoringView.maMapView.maMapView.addAnnotation(destCoordiAnnotation)
+            }
+        }
+        
+        vehicleMonitoringListDetailView.showOrderDetailHandler = { taskModel in
+            WEBTOOL.open(name: .workOrderDetail, appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(taskModel.userOrderId)&orderCode=\(taskModel.orderCode)&taskOrderId=\(taskModel.taskOrderId)")
+        }
+        
         vehicleConfigView.cancelGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
@@ -278,6 +303,18 @@ extension VehicleMonitoringController : DDMAMapViewDelegate {
                 annotationView!.annotation = pointAnnotation
                 return annotationView!
             }
+            
+            if pointAnnotation.annotationClass == VehicleMonitoringIncidentLocationAnnotationView.self {
+                let incidentPointReuseIndentifier = "VehicleMonitoringIncidentLocationAnnotationView"
+                var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: incidentPointReuseIndentifier) as? VehicleMonitoringIncidentLocationAnnotationView
+                if annotationView == nil {
+                    annotationView = VehicleMonitoringIncidentLocationAnnotationView.init(annotation: pointAnnotation, reuseIdentifier: incidentPointReuseIndentifier)
+                }
+                annotationView!.annotation = pointAnnotation
+                annotationView!.image = pointAnnotation.dd_image
+                annotationView!.zIndex = Int.max
+                return annotationView!
+            }
         }
 
         return MAAnnotationView.init(annotation: annotation, reuseIdentifier: "cell")
@@ -609,6 +646,7 @@ extension VehicleMonitoringController {
             if let workingCount = vehicleModel.workingCount {
                 annotationView.bigWorkingCountlabel.text = String(workingCount)
             }
+            annotationView.titleLabel.backgroundColor = .hex("FFFFFF")
         }else{
             annotationView.bigImageView.isHidden = true
             annotationView.bigStateLabel.isHidden = true
@@ -630,6 +668,7 @@ extension VehicleMonitoringController {
                     annotationView.middleWorkingCountlabel.text = String(workingCount)
                 }
             }
+            annotationView.titleLabel.backgroundColor = .clear
         }
         
         annotationView.titleLabel.text = vehicleModel.vehicleName
@@ -695,6 +734,14 @@ extension VehicleMonitoringController {
         isListDetailShowed = false
     }
     
+    func hideIncidentLocation() {
+        let annotations = vehicleMonitoringView.maMapView.maMapView.annotations.filter { item in
+            let annotation = item as? MAPointAnnotation
+            return annotation?.annotationClass == VehicleMonitoringIncidentLocationAnnotationView.self
+        }
+        vehicleMonitoringView.maMapView.maMapView.removeAnnotations(annotations)
+    }
+    
     func showMapCenter(with vehicleModel: VehicleMonitorListDataModel.ItemModel) {
         /// 将镜头设置为选中的item,需要修改锚点
         if let lat = vehicleModel.lat,let lon = vehicleModel.lon {
@@ -985,6 +1032,10 @@ open class VehicleMonitoringPannelView : DDView {
     }
 }
 
+open class VehicleMonitoringIncidentLocationAnnotationView : MAAnnotationView {
+    
+}
+
 open class VehicleMonitoringPointAnnotation : MAAnnotationView {
     public let clearView : DDView
     public var disposeBag : DisposeBag
@@ -1116,11 +1167,21 @@ class VehicleMonitoringListDetailView : DDView, JXCategoryListContainerViewDeleg
     func listContainerView(_ listContainerView: JXCategoryListContainerView!, initListFor index: Int) -> JXCategoryListContentViewDelegate! {
         let view = VMLDContainerView()
         view.updateData(taskModel: taskModels[index])
+        view.orderNumButton.rx.tap
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] _ in
+                if let taskModel = self?.taskModels[index] {
+                    self?.showOrderDetailHandler?(taskModel)
+                }
+            })
+            .disposed(by: disposeBag)
         return view
     }
     
     func categoryView(_ categoryView: JXCategoryBaseView!, didSelectedItemAt index: Int) {
         pageNumLabel.text = "\(index + 1)/\(taskModels.count)"
+        let taskModel = taskModels[index]
+        showIncidentLocationHandler?(CLLocationCoordinate2D(latitude: taskModel.vehiclePointLatitude, longitude: taskModel.vehiclePointLongitude),(taskModel.destinationLatitude != nil && taskModel.destinationLongitude != nil) ? CLLocationCoordinate2D(latitude: taskModel.destinationLatitude!, longitude: taskModel.destinationLongitude!) : nil)
     }
     
     public var taskModels : [VehicleMonitorListDataModel.TaskModel]
@@ -1140,6 +1201,8 @@ class VehicleMonitoringListDetailView : DDView, JXCategoryListContainerViewDeleg
     public let nextButton : DDButton
     public var emptyLabel : DDLabel
     public let disposeBag = DisposeBag()
+    public var showIncidentLocationHandler : ((CLLocationCoordinate2D,CLLocationCoordinate2D?) -> Void)?
+    public var showOrderDetailHandler : ((VehicleMonitorListDataModel.TaskModel) -> Void)?
     
     public init(taskModels: [VehicleMonitorListDataModel.TaskModel]) {
         self.taskModels = taskModels
@@ -1326,90 +1389,92 @@ class VehicleMonitoringListDetailView : DDView, JXCategoryListContainerViewDeleg
 }
 
 class VMLDContainerView : DDView , JXCategoryListContentViewDelegate {
-    var orderNumLabel : DDLabel
+    var orderNumButton : UIButton
     var titleLabel : DDLabel
     var stateLabel : DDLabel
     var line : DDView
-    var incidentTitleLabel : DDLabel
+    var incidentIcon : UIImageView
     var incidentLabel : DDLabel
-    var destTitleLabel : DDLabel
+    var destIcon : UIImageView
     var destLabel : DDLabel
     override init(frame: CGRect) {
-        orderNumLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000").alpha(0.7))
+        orderNumButton = UIButton()
+        orderNumButton.setTitleColor(.hex("0E76F4"), for: .normal)
+        orderNumButton.titleLabel?.font = .regularFont(auto(12))
         titleLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000").alpha(0.7))
         stateLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("09B820"))
         line = DDView()
-        incidentTitleLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000").alpha(0.7))
+        incidentIcon = UIImageView(image: UIImage(named: "vehichleMonitoring_start_16"))
         incidentLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000").alpha(0.7))
-        destTitleLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000").alpha(0.7))
+        destIcon = UIImageView(image: UIImage(named: "vehichleMonitoring_terminal_16"))
         destLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000").alpha(0.7))
         super.init(frame: frame)
         
-        addSubview(orderNumLabel)
+        addSubview(orderNumButton)
         addSubview(titleLabel)
         stateLabel.numberOfLines = 0
         addSubview(stateLabel)
         line.backgroundColor = .hex("F1F2F5")
         addSubview(line)
-        addSubview(incidentTitleLabel)
+        addSubview(incidentIcon)
         incidentLabel.numberOfLines = 0
-        incidentLabel.textAlignment = .right
+        incidentLabel.textAlignment = .left
         addSubview(incidentLabel)
-        addSubview(destTitleLabel)
+        addSubview(destIcon)
         destLabel.numberOfLines = 0
-        destLabel.textAlignment = .right
+        destLabel.textAlignment = .left
         addSubview(destLabel)
         
-        orderNumLabel.snp.makeConstraints { make in
+        orderNumButton.snp.makeConstraints { make in
             make.left.equalTo(auto(20))
             make.top.equalTo(auto(15))
         }
         
         titleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
         titleLabel.snp.makeConstraints { make in
-            make.left.equalTo(orderNumLabel.snp.right).offset(auto(5))
-            make.centerY.equalTo(orderNumLabel)
+            make.left.equalTo(orderNumButton.snp.right).offset(auto(5))
+            make.centerY.equalTo(orderNumButton)
         }
         
         stateLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         stateLabel.snp.makeConstraints { make in
             make.right.equalTo(-auto(20))
-            make.centerY.equalTo(orderNumLabel)
+            make.centerY.equalTo(orderNumButton)
             make.left.greaterThanOrEqualTo(titleLabel.snp.right).offset(auto(5))
         }
         
         line.snp.makeConstraints { make in
-            make.top.equalTo(orderNumLabel.snp.bottom).offset(auto(15))
+            make.top.equalTo(orderNumButton.snp.bottom).offset(auto(15))
             make.height.equalTo(1)
             make.left.right.equalToSuperview().inset(auto(20))
         }
         
-        incidentTitleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
-        incidentTitleLabel.snp.makeConstraints { make in
-            make.left.equalTo(orderNumLabel)
+        incidentIcon.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
+        incidentIcon.snp.makeConstraints { make in
+            make.left.equalTo(orderNumButton)
             make.top.equalTo(line.snp.bottom).offset(auto(15))
         }
         
         incidentLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         incidentLabel.snp.makeConstraints { make in
-            make.left.equalTo(incidentTitleLabel.snp.right).offset(auto(20))
-            make.top.equalTo(incidentTitleLabel)
+            make.left.equalTo(incidentIcon.snp.right).offset(auto(20))
+            make.top.equalTo(incidentIcon)
             make.right.equalTo(-auto(20))
-            make.bottom.greaterThanOrEqualTo(incidentTitleLabel)
+            make.bottom.greaterThanOrEqualTo(incidentIcon)
         }
         
-        destTitleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
-        destTitleLabel.snp.makeConstraints { make in
-            make.left.equalTo(orderNumLabel)
-            make.top.equalTo(incidentLabel.snp.bottom).offset(auto(20))
+        destIcon.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
+        destIcon.snp.makeConstraints { make in
+            make.left.equalTo(orderNumButton)
+            make.top.equalTo(incidentLabel.snp.bottom).offset(auto(15))
         }
         
         destLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         destLabel.snp.makeConstraints { make in
-            make.left.equalTo(destTitleLabel.snp.right).offset(auto(20))
-            make.top.equalTo(destTitleLabel)
+            make.left.equalTo(destIcon.snp.right).offset(auto(20))
+            make.top.equalTo(destIcon)
             make.right.equalTo(-auto(20))
-            make.bottom.greaterThanOrEqualTo(destTitleLabel)
+            make.bottom.greaterThanOrEqualTo(destIcon)
         }
     }
     
@@ -1418,11 +1483,9 @@ class VMLDContainerView : DDView , JXCategoryListContentViewDelegate {
     }
     
     func updateData(taskModel: VehicleMonitorListDataModel.TaskModel) {
-        orderNumLabel.text = taskModel.orderCode
+        orderNumButton.setTitle(taskModel.orderCode, for: .normal)
         titleLabel.text = taskModel.serviceName
         stateLabel.text = taskModel.taskStatusString
-        incidentTitleLabel.text = "事发地："
-        destTitleLabel.text = "目的地："
         incidentLabel.text = taskModel.vehiclePointAddress
         destLabel.text = taskModel.destinationAddress
     }
diff --git a/fastlane/report.xml b/fastlane/report.xml
index 9af65f1..8baa222 100644
--- a/fastlane/report.xml
+++ b/fastlane/report.xml
@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000186">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000181">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: gym" time="89.811522">
+      <testcase classname="fastlane.lanes" name="1: gym" time="94.357014">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: pgyer" time="20.817803">
+      <testcase classname="fastlane.lanes" name="2: pgyer" time="17.446821">
         
       </testcase>