Skip to content

H
HRM-admin
Commit 59a2a305 authored by FionaChen's avatar FionaChen
Browse files
Options

教育平台管理 完成

parent a6e5ef9a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 853 additions and 35 deletions
css/style.css
View file @ 59a2a305
...@@ -72,14 +72,14 @@ ul { ...@@ -72,14 +72,14 @@ ul {
outline: none; outline: none;
} }
.btn-wt.bt48 { .btn-wt.bt48, .btn-wt.add {
height: 48px; height: 48px;
background-color: #35a9e1; background-color: #35a9e1;
color: #fff; color: #fff;
outline: none; outline: none;
} }
.btn-wt.bt48:hover { .btn-wt.bt48:hover, .btn-wt.add:hover {
background-color: #5dbae7; background-color: #5dbae7;
outline: none; outline: none;
} }
...@@ -1045,7 +1045,7 @@ h1 { ...@@ -1045,7 +1045,7 @@ h1 {
float: left; float: left;
margin-left: 25px; margin-left: 25px;
margin-right: 20px; margin-right: 20px;
padding-top: 50px; padding-top: 0px;
} }
article.chart { article.chart {
width: 100%; width: 100%;
...@@ -1068,7 +1068,7 @@ h1 { ...@@ -1068,7 +1068,7 @@ h1 {
align-content: center; align-content: center;
-ms-flex-item-align: center; -ms-flex-item-align: center;
align-self: center; align-self: center;
margin: 30px; margin: 35px;
} }
article .article-topic label { article .article-topic label {
margin-top: 5px; margin-top: 5px;
...@@ -1117,6 +1117,10 @@ h1 { ...@@ -1117,6 +1117,10 @@ h1 {
margin-bottom: 8px; margin-bottom: 8px;
height: 48px; height: 48px;
} }
.search-group .btn-wt.add {
margin-bottom: 8px;
height: 48px;
}
.phone-show { .phone-show {
display: inline-block !important; display: inline-block !important;
} }
...@@ -1298,11 +1302,14 @@ h1 { ...@@ -1298,11 +1302,14 @@ h1 {
.modal.modal-backdrop.ItemsIcon.show { .modal.modal-backdrop.ItemsIcon.show {
opacity: 0.8; opacity: 0.8;
} }
.modal .modal-content.ItemsIcon { .modal.ItemsIcon {
background-color: rgba(0, 0, 0, 0.3); background-color: rgba(0, 0, 0, 0.3);
} }
.modal .modal-content.ItemsIcon {
background-color: rgba(0, 0, 0, 0);
}
.modal .modal-content.ItemsIcon .modal-header.ItemsIcon { .modal .modal-content.ItemsIcon .modal-header.ItemsIcon {
background-color: rgba(0, 0, 0, 0.3); background-color: rgba(0, 0, 0, 0);
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom: 0px solid #dee2e6; border-bottom: 0px solid #dee2e6;
...@@ -1326,7 +1333,7 @@ h1 { ...@@ -1326,7 +1333,7 @@ h1 {
.modal .modal-content.ItemsIcon .modal-body { .modal .modal-content.ItemsIcon .modal-body {
color: #0e435d; color: #0e435d;
padding: 48px; padding: 48px;
background-color: rgba(0, 0, 0, 0.3); background-color: rgba(0, 0, 0, 0);
} }
.modal .modal-content.ItemsIcon .modal-body.checkcont { .modal .modal-content.ItemsIcon .modal-body.checkcont {
padding: 24px 20px 30px; padding: 24px 20px 30px;
......
css/style.css.map
View file @ 59a2a305
This diff is collapsed.
css/style.scss
View file @ 59a2a305
...@@ -171,8 +171,9 @@ ul { ...@@ -171,8 +171,9 @@ ul {
} }
} }
&.bt48 { &.bt48, &.add {
height: 48px;background-color: #35a9e1; height: 48px;
background-color: #35a9e1;
color: #fff; color: #fff;
outline: none; outline: none;
// border-radius: 0px; // border-radius: 0px;
...@@ -746,7 +747,9 @@ article { ...@@ -746,7 +747,9 @@ article {
width: calc(95% - 160px); width: calc(95% - 160px);
// width:calc(82% - 230px); // width:calc(82% - 230px);
padding-bottom: 150px; padding-bottom: 150px;
.article-topic {
display: none;
}
.tab-cont { .tab-cont {
padding: 0 20px; padding: 0 20px;
} }
...@@ -999,15 +1002,161 @@ h1 { ...@@ -999,15 +1002,161 @@ h1 {
display: none; display: none;
} }
// 圖表設定
.highcharts-credits {
fill:#ffffff!important;
}
// .highcharts-root {
// width: 685px;
// height: 600px;
// }
// .highcharts-figure,
// .highcharts-data-table table {
// min-width: 320px;
// max-width: 1900px;
// margin: 1em auto;
// }
.highcharts-background {
opacity: 0;
}
.HC-area {
margin-top: 72px;
.chart-topic {
border-left: #35a9e1 8px solid;
font-size: 24px;
color: #0e435d;
display: flex;
flex-direction: column;
padding-left: 16px;
height: 96px;
margin-bottom: -50px;
margin-left: 10%;
.math {
font-size: 48px;
line-height: 40px;
}
}
.chart-cont {
display: flex;
justify-content: center;
height: 650px;
label {
font-size: 24px;
color: #fff;
}
}
.HC-list {
display: flex;
flex-direction: column;
.topic {
font-size: 24px;
line-height: 21px;
color: #0e435d;
margin-bottom: 20px;
}
.HC-cont {
display: flex;
flex-direction: row;
margin-bottom: 50px;
.cont-city {
padding-right: 35px;
}
}
.fam-order {
background-color: rgba(14, 67, 93, 0.05);
padding: 20px;
.title {
padding: 4px 8px;
border-radius: 16px;
color: #fff;
background-color: #0e435d;
}
.fam-cont {
display: flex;
justify-content: center;
}
.order-cont {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
margin-top: 20px;
img {
width: 72px;
height: 72px;
margin-bottom: 8px;
}
label {
margin-bottom: 0px;
font-size: 15px;
letter-spacing: -.05rem;
}
}
}
}
}
@media (max-width: 1366px) {
.HC-area {
.chart-topic {
margin-left: 25px;
}
}
}
@media (min-width: 1366px) {
.HC-area {
.fam-order {
width: 85%;
}
}
}
@media screen and (min-width: 768px) and (max-width: 1023px){
.fam-order {
.fam-cont {
justify-content: start!important;
}
}
}
@media (max-width: 768px) { @media (max-width: 768px) {
article { article {
width: 88%; width: 88%;
float: left; float: left;
margin-left: 25px; margin-left: 25px;
margin-right: 20px; margin-right: 20px;
padding-top: 50px; padding-top: 0px;
&.chart {
width: 100%;
padding: 0;
margin: 0;
}
.article-topic {
font-size: 24px;
display: flex;
flex-direction: row;
justify-content: center;
align-content: center;
align-self: center;
margin: 35px;
label {
margin-top: 5px;
margin-left: 16px;
}
}
.tab-cont { .tab-cont {
padding: 0px; padding: 30px 20px;
.tab-pane { .tab-pane {
padding: 0 20px; padding: 0 20px;
} }
...@@ -1051,6 +1200,11 @@ h1 { ...@@ -1051,6 +1200,11 @@ h1 {
margin-bottom: 8px; margin-bottom: 8px;
height: 48px; height: 48px;
} }
.btn-wt.add {
// width: 100%;
margin-bottom: 8px;
height: 48px;
}
} }
.phone-show { .phone-show {
...@@ -1327,14 +1481,17 @@ h1 { ...@@ -1327,14 +1481,17 @@ h1 {
&.modal-backdrop.ItemsIcon.show { &.modal-backdrop.ItemsIcon.show {
opacity: 0.8; opacity: 0.8;
} }
&.ItemsIcon {
background-color: rgba(0, 0, 0, .3);
}
// .modal-dialog { // .modal-dialog {
// } // }
.modal-content.ItemsIcon { .modal-content.ItemsIcon {
background-color: rgba(0, 0, 0, .3); background-color: rgba(0, 0, 0, 0);
.modal-header.ItemsIcon{ .modal-header.ItemsIcon{
background-color: rgba(0, 0, 0, .3); background-color: rgba(0, 0, 0, 0);
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom: 0px solid #dee2e6; border-bottom: 0px solid #dee2e6;
...@@ -1364,7 +1521,7 @@ h1 { ...@@ -1364,7 +1521,7 @@ h1 {
.modal-body { .modal-body {
color: #0e435d; color: #0e435d;
padding: 48px; padding: 48px;
background-color: rgba(0, 0, 0, .3); background-color: rgba(0, 0, 0, 0);
&.checkcont { &.checkcont {
padding: 24px 20px 30px; padding: 24px 20px 30px;
} }
...@@ -1431,9 +1588,25 @@ h1 { ...@@ -1431,9 +1588,25 @@ h1 {
} }
} }
} }
.HC-area {
margin-top:0px;
.chart-cont {
height: 450px;
}
.HC-list {
text-align: center;
}
.HC-cont {
justify-content: center;
}
}
} }
@media (max-width: 420px) {
.HC-area {
height: 400px;
}
}
......
edu-manage.html
View file @ 59a2a305
...@@ -129,17 +129,17 @@ ...@@ -129,17 +129,17 @@
雲林縣：6 雲林縣：6
</div> </div>
<div> <div>
基隆市：25<br> 嘉義縣：5<br>
臺北市：67<br> 嘉義市：14<br>
新北市：82<br> 臺南市：29<br>
桃園市：53<br> 高雄市：20<br>
新竹縣：26<br> 屏東縣：6<br>
新竹市：45<br> 宜蘭縣：9<br>
苗栗縣：18<br> 花蓮縣：8<br>
南投縣：9<br> 臺東縣：10<br>
臺中市：32<br> 澎湖縣：0<br>
彰化縣：16<br> 金門縣：0<br>
雲林縣：6 連江縣：0
</div> </div>
</div> </div>
...@@ -150,17 +150,17 @@ ...@@ -150,17 +150,17 @@
<div class="row mt-2 fam-cont"> <div class="row mt-2 fam-cont">
<div class="order-cont col-lg-4 col-md-6 col-sm-3 col-12"> <div class="order-cont col-lg-4 col-md-6 col-sm-3 col-12">
<img src="images/icon/icon-atm.jpg"> <img src="images/icon/icon-atm.svg">
<label>ATM</label> <label>ATM</label>
<label>70人</label> <label>70人</label>
</div> </div>
<div class="order-cont col-lg-4 col-md-6 col-sm-3 col-12"> <div class="order-cont col-lg-4 col-md-6 col-sm-3 col-12">
<img src="images/icon/icon-atm.jpg"> <img src="images/icon/icon-pay.svg">
<label>信用卡</label> <label>信用卡</label>
<label>70人</label> <label>70人</label>
</div> </div>
<div class="order-cont col-lg-4 col-md-6 col-sm-3 col-12"> <div class="order-cont col-lg-4 col-md-6 col-sm-3 col-12">
<img src="images/icon/icon-atm.jpg"> <img src="images/icon/icon-dredit.svg">
<label>Apple pay</label> <label>Apple pay</label>
<label>70人</label> <label>70人</label>
</div> </div>
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
<div class="phoneItem"> <div class="phoneItem">
<ul class="item-list"> <ul class="item-list">
<li> <li>
<a href="index.html" class="items active"><img src="images/icon/side-OTP.svg">統計與資訊</a> <a href="index.html" class="items"><img src="images/icon/side-OTP.svg">統計與資訊</a>
<!-- <div class="item-bg"></div> --> <!-- <div class="item-bg"></div> -->
</li> </li>
<li> <li>
...@@ -458,8 +458,8 @@ ...@@ -458,8 +458,8 @@
<script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script> <script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="http://code.highcharts.com/highcharts.js"></script> <!-- <script src="http://code.highcharts.com/highcharts.js"></script> -->
<!-- <script src="../js/highcharts.js"></script> --> <script src="js/highcharts.js"></script>
<script src="js/sortable.min.js"></script> <script src="js/sortable.min.js"></script>
......
images/icon/icon-atm.svg 0 → 100644
View file @ 59a2a305
This diff is collapsed.
images/icon/icon-dredit.svg 0 → 100644
View file @ 59a2a305
This diff is collapsed.
images/icon/icon-pay.svg 0 → 100644
View file @ 59a2a305
This diff is collapsed.
images/icon/icon-point.svg 0 → 100644
View file @ 59a2a305
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd">
<path stroke-opacity=".8" stroke="#0E435D" d="M-557.5-473.5h1487v625h-1487z"/>
<rect x="52" y="458" width="20" height="20" rx="10" transform="translate(-52 -458)" fill="#E18935"/>
</g>
</svg>
js/highcharts.js 0 → 100644
View file @ 59a2a305
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment