Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

SolarPower/Views/StationOverview/StationOverviewInfo.cshtml

@@ -1062,6 +1062,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>";

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">