diff --git a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml
index 5d341a2..28e49e5 100644
--- a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml
+++ b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml
@@ -153,6 +153,7 @@
                                     </div>
                                     <div class="pr-3" id="quickSearchOption">
                                         <button type="button" class="btn btn-primary waves-effect waves-themed ml-1" onclick="Searchform()" id="daybtn">查詢</button>
+                                        <div id="wait" style="display:none"><img src="/img/loading.gif"></div>
                                     </div>
                                     <div class="pr-3">
                                         <button type="button" class="btn btn-primary waves-effect waves-themed" onclick="AddRecord()"><span class="fal fa-plus mr-1"></span> 新增</button>
@@ -184,6 +185,7 @@
                                 </tr>
                             </thead>
                             <tbody id="totbody">
+                                
                             </tbody>
                         </table>
                     </div>
@@ -551,7 +553,7 @@
                     "data": "function"
                 }],
                 "language": {
-                    "emptyTable": "查無資料",
+                    "emptyTable": "目前無資料",
                     "processing": "處理中...",
                     "loadingRecords": "載入中...",
                     "lengthMenu": "顯示 _MENU_ 項結果",
@@ -595,7 +597,7 @@
                         if (data == null || data.length == 0) {
                             this.data = [];
                         }
-
+                        $("#wait").hide();
                         return data;
                     }
                 },
@@ -606,6 +608,7 @@
         }
 
         function Searchform() {
+            $("#wait").show();
 /*            console.log(selecterd_powerstationId);*/
             if (searchType == 0 || searchType == 1) {
                 timerange = $('#DateGettext').val();
@@ -613,6 +616,10 @@
             else {
                 timerange = $('#DateGet').val();
             }
+            var table = $('#RecordTable').DataTable();
+
+            table.clear().draw();
+
             RecordTable.ajax.reload();
         }
 
diff --git a/SolarPower/Views/StationReport/Index.cshtml b/SolarPower/Views/StationReport/Index.cshtml
index 25458c6..0dcabd3 100644
--- a/SolarPower/Views/StationReport/Index.cshtml
+++ b/SolarPower/Views/StationReport/Index.cshtml
@@ -292,7 +292,11 @@
 
 
 
-
+        <div>
+            <form id="report" name="report" method="post">
+                <input type="hidden" id="post" name="post"/>
+            </form>
+        </div>
         </main>
     </div>
 </div>
@@ -1244,7 +1248,10 @@
             if (send_data.FormType != null && send_data.PowerStation.length != 0 && send_data.FormType != 2) {
                 $.post("/StationReport/CheckExcel", send_data, function (rel) {
                     if (rel.code == "0000") {
-                        window.location = "/StationReport/ExportExcel?post=" + JSON.stringify(send_data);
+                        //window.location = "/StationReport/ExportExcel?post=" + JSON.stringify(send_data);
+                        $("#post").val(JSON.stringify(send_data));
+                        document.report.action = "StationReport/ExportExcel";
+                        document.report.submit();
                         return;
                     }
                     else