From 0348d28998a322b6e6bf5d1aa89dc7f28b087e4b Mon Sep 17 00:00:00 2001
From: b110212000 <b110212000@gmail.com>
Date: Mon, 19 Jul 2021 11:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E8=A9=9E=E4=BF=AE=E6=AD=A3(=E5=BE=A9?=
 =?UTF-8?q?=E6=AD=B8=E6=99=82=E9=96=93)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Views/StationOverview/StationOverviewInfo.cshtml | 1 +
 SolarPower/Views/StationOverview/_Exception.cshtml          | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
index b32f00b..c533d4b 100644
--- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
+++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
@@ -1083,6 +1083,7 @@
                         "<td>" + value.powerStationName + "</td>" +
                         "<td>" + value.id + "</td>" +
                         "<td>" + value.dev_time + "</td>" +
+                        "<td>" + value.normalTime + "</td>" +
                         "<td>" + value.alarmClassName + "</td>" +
                         "<td>" + value.errDevice + "</td>" +
                         "<td>" + value.errMsg + "</td>";
diff --git a/SolarPower/Views/StationOverview/_Exception.cshtml b/SolarPower/Views/StationOverview/_Exception.cshtml
index e132273..4a5bf05 100644
--- a/SolarPower/Views/StationOverview/_Exception.cshtml
+++ b/SolarPower/Views/StationOverview/_Exception.cshtml
@@ -28,7 +28,7 @@
                     <th>電站名稱</th>
                     <th>異常ID</th>
                     <th>發生時間</th>
-                    <th>恢復時間</th>
+                    <th>復歸時間</th>
                     <th>異常類別</th>
                     <th>設備編號</th>
                     <th>異常訊息</th>
@@ -44,9 +44,10 @@
                     <th>電站名稱</th>
                     <th>異常ID</th>
                     <th>發生時間</th>
+                    <th>復歸時間</th>
                     <th>異常類別</th>
                     <th>設備編號</th>
-                    <th>異常原因</th>
+                    <th>異常訊息</th>
                 </tr>
             </thead>
             <tbody id="NOSEEBODY">