diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 8eb69f9..b45b9e3 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 5f5860c..12db369 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -1431,8 +1431,8 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "93" endingLineNumber = "93" - landmarkName = "selectCellBlock" - landmarkType = "24"> + landmarkName = "VehicleMonitoringListController" + landmarkType = "3"> @@ -2462,7 +2462,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "222" endingLineNumber = "222" - landmarkName = "dd_mapView(_:viewFor:)" + landmarkName = "addAction()" landmarkType = "7"> @@ -2574,7 +2574,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "391" endingLineNumber = "391" - landmarkName = "reloadData(index:)" + landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2590,7 +2590,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "394" endingLineNumber = "394" - landmarkName = "reloadData(index:)" + landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -3773,7 +3773,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "238" endingLineNumber = "238" - landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" + landmarkName = "addAction()" landmarkType = "7"> @@ -4857,7 +4857,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "696" endingLineNumber = "696" - landmarkName = "addSubviews()" + landmarkName = "init(titles:)" landmarkType = "7"> @@ -4873,7 +4873,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "282" endingLineNumber = "282" - landmarkName = "listContainerView(_:initListFor:)" + landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -4889,7 +4889,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "478" endingLineNumber = "478" - landmarkName = "selectVehicle(vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)" + landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4905,7 +4905,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "323" endingLineNumber = "323" - landmarkName = "listContainerView(_:initListFor:)" + landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -4921,7 +4921,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "310" endingLineNumber = "310" - landmarkName = "listContainerView(_:initListFor:)" + landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -5033,7 +5033,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "761" endingLineNumber = "761" - landmarkName = "viewSafeAreaInsetsDidChange()" + landmarkName = "init?(coder:)" landmarkType = "7"> @@ -5112,9 +5112,7 @@ startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "1148" - endingLineNumber = "1148" - landmarkName = "init(taskModels:)" - landmarkType = "7"> + endingLineNumber = "1148"> + endingLineNumber = "1160"> + endingLineNumber = "1162"> + endingLineNumber = "988"> + endingLineNumber = "1290"> + endingLineNumber = "1151"> + endingLineNumber = "1164"> + endingLineNumber = "993"> + endingLineNumber = "1163"> @@ -5432,7 +5414,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "561" endingLineNumber = "561" - landmarkName = "showListDetail(vehicleModel:)" + landmarkName = "reloadData(index:)" landmarkType = "7"> diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift index 0ff0d58..afff6c5 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift @@ -30,7 +30,7 @@ extension VehicleMonitoringListController : UITableViewDelegate,UITableViewDataS /// 排班 if isPaiban == true { cell?.dateLabel.isHidden = false - cell?.dateLabel.text = "\("2023-12-12 00:00:00")\n~\n\("2023-12-12 00:00:00")" + cell?.dateLabel.text = (model.rosterStartTime?.components(separatedBy: " ").last ?? "") + "~" + (model.rosterEndTime?.components(separatedBy: " ").last ?? "") }else if isAlarm == true { cell?.dateLabel.isHidden = true }else{