|
|
@@ -384,8 +384,6 @@ class tools {
|
|
|
|
|
|
//数据转换前端需要的显示的格式
|
|
|
$rules["shipment_transport_mode"] = utils::converModeToDisplay($rules["shipment_transport_mode"]);
|
|
|
- $rules["daily_time_zone"] = utils::comvertutcinfo($rules["daily_time_zone"]);
|
|
|
- $rules["weekly_time_zone"] = utils::comvertutcinfo($rules["weekly_time_zone"]);
|
|
|
|
|
|
$monitoring_data[$rules_type] = $rules;
|
|
|
common::echo_json_encode(200,$monitoring_data);
|
|
|
@@ -747,6 +745,9 @@ class tools {
|
|
|
$rules["weekly_time"] = $rules["_weekly_time"];
|
|
|
$rules["weekly_week"] = common::getWeek($rules["weekly_week"]);
|
|
|
|
|
|
+ $rules["daily_time_zone"] = utils::comvertutcinfo($rules["daily_time_zone"]);
|
|
|
+ $rules["weekly_time_zone"] = utils::comvertutcinfo($rules["weekly_time_zone"]);
|
|
|
+
|
|
|
//字符串转数字
|
|
|
$rules["ocean_atd_sub_etd"] = common::convertoint($rules["ocean_atd_sub_etd"]);
|
|
|
$rules["ocean_ata_sub_eta"] = common::convertoint($rules["ocean_ata_sub_eta"]);
|
|
|
@@ -1601,7 +1602,8 @@ class tools {
|
|
|
"title"=>$title,
|
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
|
"no"=>!empty($mInfo["h_bol"]) ? $mInfo["h_bol"] : $mInfo["m_bol"],
|
|
|
- "tag"=>$mInfo["delay_name"],
|
|
|
+ //第一个字母大写
|
|
|
+ "tag"=>ucfirst($mInfo["delay_name"]),
|
|
|
"location"=>$outsideLocation,
|
|
|
"timezone"=>$mInfo["delay_timezone"],
|
|
|
"time"=>$est_date,
|
|
|
@@ -1670,7 +1672,7 @@ class tools {
|
|
|
"title"=>$title,
|
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
|
"no"=>!empty($mInfo["h_bol"]) ? $mInfo["h_bol"] : $mInfo["m_bol"],
|
|
|
- "tag"=>$mInfo["date_change_name"],
|
|
|
+ "tag"=>ucfirst($mInfo["date_change_name"]),
|
|
|
"location"=>"",
|
|
|
"timezone"=>$mInfo["date_change_timezone"],
|
|
|
"time"=>$original_date,
|
