退版合併測試

SolarPower/Views/AnalysisInverter/Index.cshtml

@@ -4,8 +4,16 @@
     ViewData["Title"] = "逆變器交叉分析";
 }
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="container-fluid">

SolarPower/Views/AnalysisStationCombine/Index.cshtml

@@ -6,8 +6,16 @@
 @using SolarPower.Models.Role
 @model RoleLayerEnum
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="container-fluid">

SolarPower/Views/AnalysisStationInfo/Index.cshtml

@@ -4,8 +4,16 @@
     ViewData["Title"] = "電站交叉分析";
 }
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="container-fluid">

SolarPower/Views/Company/Index.cshtml

@@ -19,8 +19,16 @@
 </div>
 <!-- Your main content goes below here: -->
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="row">

SolarPower/Views/ElectricitySoldRecord/Index.cshtml

@@ -6,8 +6,16 @@
 @using SolarPower.Models.Role
 @model RoleLayerEnum
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="container-fluid">

SolarPower/Views/ExceptionRecord/Index.cshtml

@@ -12,8 +12,16 @@
     <li class="position-absolute pos-top pos-right d-none d-sm-block"><span class="js-get-date"></span></li>
 </ol>
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="row">

SolarPower/Views/Login/Index.cshtml

@@ -26,8 +26,19 @@
     <link href="~/lib/icheck-bootstrap/icheck-bootstrap.min.css" rel="stylesheet" />
     <!-- Theme style -->
 
+    <link rel="stylesheet" href="~/css/loading.css" />
 </head>
 <body>
+    <div class="loadEffect" id="loading" style="top: 50%;">
+        <span></span>
+        <span></span>
+        <span></span>
+        <span></span>
+        <span></span>
+        <span></span>
+        <span></span>
+        <span></span>
+    </div>
 
     <div class="blankpage-form-field">
         <div class="page-logo m-0 w-100 align-items-center justify-content-center rounded border-bottom-left-radius-0 border-bottom-right-radius-0 px-4">
@@ -41,31 +52,31 @@
             {
                 <p class="alert alert-danger">@ViewBag.ErrMsg</p>
             }
-            <form id="login-form" asp-action="Index" method="post">
+        <form id="login-form" asp-action="Index" method="post">
-                <div class="form-group">
+            <div class="form-group">
-                    <label class="form-label" for="username">帳號</label>
+                <label class="form-label" for="username">帳號</label>
-                    <input asp-for="Account" type="text" id="account" class="form-control" placeholder="Account">
+                <input asp-for="Account" type="text" id="account" class="form-control" placeholder="Account">
-                    <span asp-validation-for="Account" class="text-danger"></span>
+                <span asp-validation-for="Account" class="text-danger"></span>
-                    <span class="help-block">
+                <span class="help-block">
-                        您的帳號
+                    您的帳號
-                    </span>
+                </span>
+            </div>
+            <div class="form-group">
+                <label class="form-label" for="password">密碼</label>
+                <input asp-for="Password" type="password" id="password" class="form-control" placeholder="Password" autocomplete="off">
+                <span asp-validation-for="Password" class="text-danger"></span>
+                <span class="help-block">
+                    您的密碼
+                </span>
+            </div>
+            <div class="form-group text-left">
+                <div class="custom-control custom-checkbox">
+                    <input type="checkbox" class="custom-control-input" id="rememberme">
+                    <label class="custom-control-label" for="rememberme"> 記住我</label>
                 </div>
-                <div class="form-group">
+            </div>
-                    <label class="form-label" for="password">密碼</label>
+            <button type="submit" class="btn btn-default float-right" id="login">登入</button>
-                    <input asp-for="Password" type="password" id="password" class="form-control" placeholder="Password" autocomplete="off">
+        </form>
-                    <span asp-validation-for="Password" class="text-danger"></span>
-                    <span class="help-block">
-                        您的密碼
-                    </span>
-                </div>
-                <div class="form-group text-left">
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="rememberme">
-                        <label class="custom-control-label" for="rememberme"> 記住我</label>
-                    </div>
-                </div>
-                <button type="submit" class="btn btn-default float-right" id="login">登入</button>
-            </form>
         </div>
         <div class="blankpage-footer text-center">
             <a asp-controller="Login" asp-action="ForgotPassword"><strong>忘記密碼</strong></a>
@@ -76,11 +87,6 @@
         <source src="~/media/video/cc.webm" type="video/webm">
         <source src="~/media/video/cc.mp4" type="video/mp4">
     </video>
-
-    <div class="d-flex justify-content-center text-secondary" style="transform: translateY(1150%);">
-        <div class="spinner-border" role="status" id="loading" style="display: none"></div>
-    </div>
-
     @*
 
         <div class="login-box">

SolarPower/Views/MapOverview/Index.cshtml

@@ -11,8 +11,16 @@
 
 <!-- Your main content goes below here: -->
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative; ">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 @*<div class="row mb-5">*@

SolarPower/Views/NoticeSchedule/Index.cshtml

@@ -6,8 +6,16 @@
 @using SolarPower.Models.Role
 @model RoleLayerEnum
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="container-fluid">

SolarPower/Views/Operation/Index.cshtml

@@ -6,8 +6,16 @@
 @using SolarPower.Models.Role
 @model RoleLayerEnum
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <ol class="breadcrumb page-breadcrumb">

SolarPower/Views/Operation/OperationRecord.cshtml

@@ -17,8 +17,16 @@
     </h1>
 </div>
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <!-- Your main content goes below here: -->

SolarPower/Views/PowerGeneration/Index.cshtml

@@ -6,8 +6,16 @@
 @using SolarPower.Models.Role
 @model RoleLayerEnum
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="container-fluid">

SolarPower/Views/PowerStation/Index.cshtml

@@ -6,8 +6,16 @@
 @using SolarPower.Models.Role
 @model RoleLayerEnum
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <ol class="breadcrumb page-breadcrumb">

SolarPower/Views/PowerStation/PowerStationEdit.cshtml

@@ -16,8 +16,16 @@
 
 <!-- Your main content goes below here: -->
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="row">

SolarPower/Views/SensorType/Index.cshtml

@@ -19,8 +19,16 @@
 </div>
 <!-- Your main content goes below here: -->
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="row">

SolarPower/Views/StationOverview/Index.cshtml

@@ -12,8 +12,16 @@
 
 <!-- Your main content goes below here: -->
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="row">

SolarPower/Views/StationOverview/StationOverviewInfo.cshtml

@@ -13,8 +13,16 @@
         <li class="position-absolute pos-top pos-right d-none d-sm-block"><span class="js-get-date"></span></li>
     </ol>*@
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="row">
@@ -225,10 +233,8 @@
             var today_format = today.toISOString().slice(0, 10).replace(/-/g, "/");
             //var dateLimit_format = dateLimit.toISOString().slice(0, 10).replace(/-/g, "/");
             //datepicker.data('daterangepicker').setStartDate(dateLimit_format);
-            if (datepicker.length != 0) {
+            datepicker.data('daterangepicker').setStartDate(today_format);
-                datepicker.data('daterangepicker').setStartDate(today_format);
+            datepicker.data('daterangepicker').setEndDate(today_format);
-                datepicker.data('daterangepicker').setEndDate(today_format);
-            }
             //$('#date-range-history').val(dateLimit_format + ' - ' + today_format);
             $('#date-range-history').val(today_format + ' ~ ' + today_format);
             //alert(" date-range-history = "+$('#date-range-history').val());
@@ -872,7 +878,7 @@
                 locale: { format: 'YYYY/MM/DD' },
                 opens: 'left'
             }, function (start, end, label) {
-            @* console.log("A new date selection was made: " + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));*@
+                @* console.log("A new date selection was made: " + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));*@
             });
 
             $('#date-range-exception').on('apply.daterangepicker', function (ev, picker) {
@@ -1719,6 +1725,7 @@
 
             datepicker.data('daterangepicker').setStartDate(dateLimit_format);
             datepicker.data('daterangepicker').setEndDate(today_format);
+
             $('#date-range-record').val(dateLimit_format + ' - ' + today_format);
             $('#date-range-record').trigger('change');
         }
@@ -2692,7 +2699,7 @@
                                 nowDisplayIrrDay = val.irrDayHour.toFixed(2);
                             }
                             else {
-                                nowDisplayIrrDay = val.irrDay.toFixed(2);
+                                nowDisplayIrrDay = val.irradiance.toFixed(2);
                             }
                            // console.log(val);
                             diffSOLARHOURALL = val.solarhour;

SolarPower/Views/User/Index.cshtml

@@ -11,8 +11,16 @@
     <li class="position-absolute pos-top pos-right d-none d-sm-block"><span class="js-get-date"></span></li>
 </ol>
 
-<div class="d-flex justify-content-center text-secondary" style="top: 10%; transform: translateY(50%); z-index: 100; position: relative;">
+<link rel="stylesheet" href="~/css/loading.css" />
-    <div class="spinner-border" role="status" style="width: 3rem; height: 3rem; display:none;" id="loading"></div>
+<div class="loadEffect" id="loading" style="top: 10%;">
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
+    <span></span>
 </div>
 
 <div class="row">

SolarPower/wwwroot/css/loading.css

@@ -0,0 +1,86 @@
+.loadEffect {
+    z-index: 9999;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    margin: 0 auto;
+    margin-top: 100px;
+    display: none;
+}
+
+.loadEffect span {
+    display: inline-block;
+    width: 13px;
+    height: 13px;
+    border-radius: 50%;
+    background: black;
+    position: absolute;
+    -webkit-animation: load 1.04s ease infinite;
+}
+
+@-webkit-keyframes load {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0.2;
+    }
+}
+
+.loadEffect span:nth-child(1) {
+    left: 0;
+    top: 50%;
+    margin-top: -8px;
+    -webkit-animation-delay: 0.13s;
+}
+
+.loadEffect span:nth-child(2) {
+    left: 14px;
+    top: 14px;
+    -webkit-animation-delay: 0.26s;
+}
+
+.loadEffect span:nth-child(3) {
+    left: 50%;
+    top: 0;
+    margin-left: -8px;
+    -webkit-animation-delay: 0.39s;
+}
+
+.loadEffect span:nth-child(4) {
+    top: 14px;
+    right: 14px;
+    -webkit-animation-delay: 0.52s;
+}
+
+.loadEffect span:nth-child(5) {
+    right: 0;
+    top: 50%;
+    margin-top: -8px;
+    -webkit-animation-delay: 0.65s;
+}
+
+.loadEffect span:nth-child(6) {
+    right: 14px;
+    bottom: 14px;
+    -webkit-animation-delay: 0.78s;
+}
+
+.loadEffect span:nth-child(7) {
+    bottom: 0;
+    left: 50%;
+    margin-left: -8px;
+    -webkit-animation-delay: 0.91s;
+}
+
+.loadEffect span:nth-child(8) {
+    bottom: 14px;
+    left: 14px;
+    -webkit-animation-delay: 1.04s;
+}
+
+
+

solarApp/fmArchive.cs

@@ -111,7 +111,7 @@ namespace solarApp
             }
 
             //臨時的 累計日照
-            if (DateTime.Now.Minute == 20 && (DateTime.Now.Second >= 0 && DateTime.Now.Second <= 10) && autoTask == false)
+            if (DateTime.Now.Minute == 30 && (DateTime.Now.Second >= 0 && DateTime.Now.Second <= 10) && autoTask == false)
             {
                 //MessageBox.Show("ok");
                 autoTask = true;