From c3d213efbdc10a716c3290ce6bbb9cdb06bff85f Mon Sep 17 00:00:00 2001
From: b110212000 <b110212000@gmail.com>
Date: Thu, 24 Jun 2021 10:35:23 +0800
Subject: [PATCH] excel

---
 SolarPower/Views/Operation/Index.cshtml | 56 +++++++++++++++----------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/SolarPower/Views/Operation/Index.cshtml b/SolarPower/Views/Operation/Index.cshtml
index a3fe4b2..13a9265 100644
--- a/SolarPower/Views/Operation/Index.cshtml
+++ b/SolarPower/Views/Operation/Index.cshtml
@@ -42,7 +42,7 @@
                             <div class="frame-wrap" id="citytest" style="display:none">
                                 <button type="button" class="btn btn-outline-success waves-effect waves-themed">
                                     新北市
-                                    <span class="badge bg-success-700 ml-2">4</span>
+                                    <span class="badge bg-success-700 ml-2" id="acount">4</span>
                                 </button>
                                 @*<button type="button" class="btn btn-outline-success waves-effect waves-themed">
                                     台北市
@@ -130,7 +130,7 @@
                             <tbody>
                             </tbody>
                         </table>
-                        <table id="NoView">
+                        <table id="NoView" style="display:none">
                             <thead class="thead-themed">
                                 <tr>
                                     <th>計劃單號</th>
@@ -387,8 +387,8 @@
                     $('#citytest').find('button').attr('id', 'cityID' + val.cityId).clone().appendTo($('#city'));
                     var name = 'cityID' + val.cityId;
                     document.getElementById(name).innerHTML = val.city;
-/*                    $('#cityID1').text = val.city;*/
-                    $('#cityID' + val.cityId).find('span').attr('id', 'cityspan' + val.cityId);
+                    /*                    $('#cityID1').text = val.city;*/
+                    $('#cityID' + val.cityId).find('#acount').text(val.amount);
                     document.getElementById('cityspan' + String(val.cityId)).innerHTML = val.amount;
                 });
 
@@ -555,30 +555,40 @@
                     toast_error(rel.msg);
                     return;
                 }
+                $('#NoViewbody').empty();
                 for (var i = 0; i < rel.data.data.length; i++)
                 {
-                    $('#NoViewbody').append("<tr>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].planId + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].typeName + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].powerStationName + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].schedule + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].workDay + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].startTimeString + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].emailTypeName + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].createdPerson + "</td>");
-                    $('#NoViewbody').append("<td>" + rel.data.data[i].createTimeString + "</td>");
-                    $('#NoViewbody').append("</tr>");
+                    
+
+                    var name = "<td>" + String(rel.data.data[i].planId) + "</td>" + "<td>" + rel.data.data[i].typeName + "</td>" + "<td>" + rel.data.data[i].powerStationName + "</td>"
+                        + "<td>" + rel.data.data[i].schedule + "</td>" + "<td>" + rel.data.data[i].workDay + "</td>" + "<td>" + rel.data.data[i].startTimeString + "</td>" +
+                        "<td>" + rel.data.data[i].emailTypeName + "</td>" + "<td>" + rel.data.data[i].createdPerson + "</td>" + "<td>" + rel.data.data[i].createTimeString + "</td>";
+                    $('#NoViewbody').append("<tr>" + name + "</tr>");
+
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].planId + "</td>");
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].typeName + "</td>");
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].powerStationName + "</td>");
+
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].schedule + "</td>");
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].workDay + "</td>");
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].startTimeString + "</td>");
+
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].emailTypeName + "</td>");
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].createdPerson + "</td>");
+                    //$('#NoViewbody').append("<td>" + rel.data.data[i].createTimeString + "</td>");
                 }
+
+                $("#NoView").table2excel({
+                    // 匯出的Excel文件的名稱
+                    name: "Excel Document Name",
+                    // Excel檔案的名稱
+                    filename: "test",
+                    //檔案字尾名
+                    fileext: ".xls",
+                });
             }, 'json');
 
-            $("#NoView").table2excel({
-                // 匯出的Excel文件的名稱
-                name: "Excel Document Name",
-                // Excel檔案的名稱
-                filename: "test",
-                //檔案字尾名
-                fileext: ".xls",
-            });
+            
         }
     </script>