diff --git a/Parking_spaces/Views/Engineering/Engineering_Index.cshtml b/Parking_spaces/Views/Engineering/Engineering_Index.cshtml index 25b40e0..389e19f 100644 --- a/Parking_spaces/Views/Engineering/Engineering_Index.cshtml +++ b/Parking_spaces/Views/Engineering/Engineering_Index.cshtml @@ -99,10 +99,6 @@
即時影像
- -
-
diff --git a/Parking_spaces/Views/Engineering/Yuntech_in_car.cshtml b/Parking_spaces/Views/Engineering/Yuntech_in_car.cshtml index 6f32ae5..87bbb13 100644 --- a/Parking_spaces/Views/Engineering/Yuntech_in_car.cshtml +++ b/Parking_spaces/Views/Engineering/Yuntech_in_car.cshtml @@ -38,11 +38,28 @@ - - +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
@@ -84,12 +101,53 @@ @@ -222,7 +333,7 @@ console.log(Model) All_Model = Model - set_data(Model) + set_data_license_plate_and_date(Model) } }); @@ -250,7 +361,7 @@ success: function (Model) { console.log(Model) All_Model = Model - set_data(Model) + set_data_license_plate_and_date(Model) } }); diff --git a/Parking_spaces/Views/Manager/Manager_Violation.cshtml b/Parking_spaces/Views/Manager/Manager_Violation.cshtml index f459a72..2cff8cd 100644 --- a/Parking_spaces/Views/Manager/Manager_Violation.cshtml +++ b/Parking_spaces/Views/Manager/Manager_Violation.cshtml @@ -313,177 +313,48 @@ var token_ckeck //= document.getElementById("token_ckeck_id").value var position //職位 function get_violation_data_1() { + day = 30 violation_car_list = [] //console.log("start") //token_check = document.getElementById("token_check_id").value //console.log(token_check) $.ajax({ type: "GET", - url: "http://140.125.20.183:7700/api/Parking_spaces_violation_total_table", + url: "http://140.125.20.183:7700/api/Violation_car_table/get_day_violation-" + day, data: {}, contentType: "application/json", headers: { 'Authorization': token }, success: function (Model) { - get_violation_data_2(Model) - + //get_violation_data_2(Model) + console.log(Model) + set_violation_data_1(Model) } }); } - function get_violation_data_2(Model) { - if (Model.length > 0) { - for (var i = 0; i < Model.length; i++) { - var name = Model[i].parking_spaces_violation_name - ////console.log(name) - $.ajax({ - type: "GET", - url: "http://140.125.20.183:7700/api/Violation_car_table/violation_location_name-" + name, - data: {}, - contentType: "application/json", - headers: { - 'Authorization': token - }, - success: function (Model) { - set_violation_data_1(Model) - } - }); - } - } - set_violation_data_3() - } diff --git a/Parking_spaces/Views/Manager/Map_RTSP.cshtml b/Parking_spaces/Views/Manager/Map_RTSP.cshtml index 9f6a94d..75d4dc3 100644 --- a/Parking_spaces/Views/Manager/Map_RTSP.cshtml +++ b/Parking_spaces/Views/Manager/Map_RTSP.cshtml @@ -34,7 +34,20 @@

即時影像

- + +
+ +
+

+ + +
+
+
+ + + +
@@ -47,4 +60,496 @@ function Yuntech_RTSP() { window.open("http://140.125.50.178:7006/", "_blank"); } - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Parking_spaces/Views/Manager/Yuntech_in_car.cshtml b/Parking_spaces/Views/Manager/Yuntech_in_car.cshtml index 2207ca6..d45efcf 100644 --- a/Parking_spaces/Views/Manager/Yuntech_in_car.cshtml +++ b/Parking_spaces/Views/Manager/Yuntech_in_car.cshtml @@ -41,6 +41,22 @@ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
@@ -84,13 +100,17 @@ +