hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://dev.azure.com/MjmTechDev/solarPower/_git/solarPower

Browse Source
This commit is contained in:
cesar liu 2022-07-04 15:23:52 +08:00
commit dda7805c75
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SolarPower/Views/ElectricitySoldRecord/Index.cshtml
View File

@ -153,6 +153,7 @@
</div> </div>
<div class="pr-3" id="quickSearchOption"> <div class="pr-3" id="quickSearchOption">
<button type="button" class="btn btn-primary waves-effect waves-themed ml-1" onclick="Searchform()" id="daybtn">查詢</button> <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>
<div class="pr-3"> <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> <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> </tr>
</thead> </thead>
<tbody id="totbody"> <tbody id="totbody">
</tbody> </tbody>
</table> </table>
</div> </div>
@ -551,7 +553,7 @@
"data": "function" "data": "function"
}], }],
"language": { "language": {
"emptyTable": "查無資料", "emptyTable": "目前無資料",
"processing": "處理中...", "processing": "處理中...",
"loadingRecords": "載入中...", "loadingRecords": "載入中...",
"lengthMenu": "顯示 _MENU_ 項結果", "lengthMenu": "顯示 _MENU_ 項結果",
@ -595,7 +597,7 @@
if (data == null || data.length == 0) { if (data == null || data.length == 0) {
this.data = []; this.data = [];
} }
$("#wait").hide();
return data; return data;
} }
}, },
@ -606,6 +608,7 @@
} }
function Searchform() { function Searchform() {
$("#wait").show();
/* console.log(selecterd_powerstationId);*/ /* console.log(selecterd_powerstationId);*/
if (searchType == 0 || searchType == 1) { if (searchType == 0 || searchType == 1) {
timerange = $('#DateGettext').val(); timerange = $('#DateGettext').val();
@ -613,6 +616,10 @@
else { else {
timerange = $('#DateGet').val(); timerange = $('#DateGet').val();
} }
var table = $('#RecordTable').DataTable();
table.clear().draw();
RecordTable.ajax.reload(); RecordTable.ajax.reload();
} }

11
SolarPower/Views/StationReport/Index.cshtml
View File

@ -292,7 +292,11 @@
<div>
<form id="report" name="report" method="post">
<input type="hidden" id="post" name="post"/>
</form>
</div>
</main> </main>
</div> </div>
</div> </div>
@ -1244,7 +1248,10 @@
if (send_data.FormType != null && send_data.PowerStation.length != 0 && send_data.FormType != 2) { if (send_data.FormType != null && send_data.PowerStation.length != 0 && send_data.FormType != 2) {
$.post("/StationReport/CheckExcel", send_data, function (rel) { $.post("/StationReport/CheckExcel", send_data, function (rel) {
if (rel.code == "0000") { 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; return;
} }
else else