diff --git a/SolarPower/Controllers/OperationController.cs b/SolarPower/Controllers/OperationController.cs index 3450c6c..799c34a 100644 --- a/SolarPower/Controllers/OperationController.cs +++ b/SolarPower/Controllers/OperationController.cs @@ -544,6 +544,7 @@ namespace SolarPower.Controllers FixDo = post.FixDo, Status = post.Status, FinishTime = !string.IsNullOrEmpty(finishTime) ? finishTime : null, + WorkPersonId = post.WorkPersonId, WorkTime = post.WorkTime, Notice = post.Notice, Description = post.Description, @@ -562,6 +563,7 @@ namespace SolarPower.Controllers "WorkTime", "Notice", "Description", + "WorkPersonId", "UpdatedBy", }; @@ -753,7 +755,10 @@ namespace SolarPower.Controllers foreach (var file in recode.RecodeFiles) { var hyperLink = "" + file.FileName + ""; - + if(recode.HyperLinks == null) + { + recode.HyperLinks = new List(); + } recode.HyperLinks.Add(hyperLink); } } diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index 9bfbba6..462d3fc 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -97,8 +97,12 @@ @section Scripts{ } \ No newline at end of file diff --git a/SolarPower/Views/StationOverview/_OperationRecord.cshtml b/SolarPower/Views/StationOverview/_OperationRecord.cshtml index 94571ea..9243033 100644 --- a/SolarPower/Views/StationOverview/_OperationRecord.cshtml +++ b/SolarPower/Views/StationOverview/_OperationRecord.cshtml @@ -1 +1,185 @@ -

5

\ No newline at end of file +
+
+
+ + + + +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + +
電廠表單號項目類型狀態處理人員本次作業預計照片完成時間
+ + + + + + + + + + + + + + + + + +
+
+ + + \ No newline at end of file diff --git a/SolarPower/wwwroot/upload/operation_recode/17/8f6f1382-0aaa-46e6-9d50-3016de4dfe4b.png b/SolarPower/wwwroot/upload/operation_recode/17/8f6f1382-0aaa-46e6-9d50-3016de4dfe4b.png new file mode 100644 index 0000000..7024b48 Binary files /dev/null and b/SolarPower/wwwroot/upload/operation_recode/17/8f6f1382-0aaa-46e6-9d50-3016de4dfe4b.png differ