From 04bc7fa53e76b50819a9928f652b98916018f165 Mon Sep 17 00:00:00 2001
From: Celeste <aafree2014@gmail.com>
Date: Wed, 23 Aug 2023 16:38:22 +0800
Subject: [PATCH] =?UTF-8?q?[Frontend]=20=E4=BF=AE=E6=94=B9=E6=AD=B7?=
 =?UTF-8?q?=E5=8F=B2=E7=B4=80=E9=8C=84=E7=9A=84=E6=97=A5=E6=9B=86=E6=A8=A3?=
 =?UTF-8?q?=E5=BC=8F=20|=20=E5=A0=B1=E8=A1=A8=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=96=AE=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_historyData.html      | 5 ++---
 Frontend/_reportManagement.html | 9 ++++++++-
 Frontend/index.html             | 6 ++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html
index c9e8341..a64bb72 100644
--- a/Frontend/_historyData.html
+++ b/Frontend/_historyData.html
@@ -40,7 +40,7 @@
         </div>
         <div class="col-auto">
           <div class="form-group">
-            <input class="form-control" id="his_startdate" data-val="" type="date" name="date" value="">
+            <input class="form-control flatpickr flatpickr-input selectDate" id="his_startdate" data-val="" type="date" name="date" value="">
             <input class="form-control" id="getmonth" type="month" style="display: none" />
           </div>
         </div>
@@ -75,14 +75,13 @@
 
   </div>
 </main>
-
 <script>
   var historyTable = null;
   var buildingTag = null;
   pageAct.hisBuiName = "";
   hisFirst = true;
   $(function () {
-    console.log(1);
+    flatpickr(".selectDate", {});
     let html = "";
     for (let building of pageAct.buildList) {
       html += `<label class="btn btn-secondary">
diff --git a/Frontend/_reportManagement.html b/Frontend/_reportManagement.html
index f4448e5..520a32d 100644
--- a/Frontend/_reportManagement.html
+++ b/Frontend/_reportManagement.html
@@ -171,7 +171,7 @@
             <button type="button" class="btn btn-danger ml-2" onclick="CleanAll()">全部清除</button>
             <button type="button" class="btn btn-info allbtn ml-2" onclick="LookRealTime()">查看即時資訊</button> -->
           </div>
-
+          <span class="d-flex justify-content-end">單位：kWh </span>
           <table id="report_table"
                  class="table table-bordered table-striped text-center m-0"></table>
         </div>
@@ -799,11 +799,18 @@
         title: "單價",
         data: "price",
         sWidth: "45px",
+        render: function (data) {
+          return parseInt(data) === 0 ? "" : data;
+        },
       },
       {
         title: "金額總計",
         data: "total_price",
         sWidth: "70px",
+        render: function (data) {
+          console.log(data)
+          return parseInt(data) === 0 ? "" : data;
+        },
       },
     ];
     const tableType = $("li.active [name=reportTypeRadio]").data("value");
diff --git a/Frontend/index.html b/Frontend/index.html
index 63888b7..8f2b836 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -77,6 +77,8 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
   <link rel="stylesheet"
         href="lib\bootstrap-datepicker\bootstrap-datepicker.min.css"
         type="text/css" />
+  <link rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css" />
 </head>
 <!-- BEGIN Body -->
 <!-- Possible Classes
@@ -818,6 +820,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                 + smartpanels.js (extension)
                 + src/../jquery-snippets.js (core) -->
   <!-- verdors.bundle.js 已含有 jquery Library v3.5.1-->
+  <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
   <script src="lib/vendors.bundle.js"></script>
   <!-- toast 第三方套件 若 require 此套件只能用 define 使用，先暫時 html 引用-->
   <script src="lib/notifications/toastr/toastr.min.js"></script>
@@ -852,7 +855,6 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
   <script src="js/n4js/elevatorbaja.js"></script>
   <script src="js/bajascript/require.config.js"></script>
   <script src="js/FileSaver.js"></script>
-
   <script>
     /*$('#js-page-content').smartPanel();*/
     var cookies = null;
@@ -2048,7 +2050,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                                                                                 <a href="javascript:;" id="sysMonTopBtn" class="text-center dropdown-toggle" data-toggle="dropdown" data-tabname="topFunBtn" class="text-center">
                                                                                     <i class="fal fa-tv fa-2x"></i><br>${v.subName}
                                                                                 </a>
-                                                                               <div style="transform: translateY(55px)">
+                                                                               <div style="transform: translateY(5%)">
                                                                                 <div class="dropdown-menu dropdown-menu-right sys_building_dropdown_menu" >
                                                                                 </div>
                                                                             </div>