Skip to content

H
HRM-admin
Commit 92fcba47 authored by FionaChen's avatar FionaChen
Browse files
Options

更新夏拉式選單、 

新增備註文字
parent 64d7832d
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 25 deletions
HRMS-manage.html
View file @ 92fcba47
...@@ -93,16 +93,27 @@ ...@@ -93,16 +93,27 @@
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<!-- 各公司出勤 start --> <!-- 各公司出勤 start -->
<div class="tab-pane fade show active" id="adminMeb" role="tabpanel" aria-labelledby="adminMeb-tab"> <div class="tab-pane fade show active" id="adminMeb" role="tabpanel" aria-labelledby="adminMeb-tab">
<div class="search-group"> <!-- 手機版 -->
<button type="button" class="btn-wt mr-2 phone-show" data-toggle="modal" <div class="search-group phone-show phone-row">
<button type="button" class="btn-wt mr-2" data-toggle="modal"
data-target="#addAdminCount"><img src="images/icon/icon-export.svg">匯出 Excel</button> data-target="#addAdminCount"><img src="images/icon/icon-export.svg">匯出 Excel</button>
<button type="button" class="btn-wt blue phone-show mb-0" data-toggle="modal" <button type="button" class="btn-wt blue mb-0" data-toggle="modal"
data-target="#addCompanyCount"><img src="images/icon/icon-add.svg">新增公司</button> data-target="#addCompanyCount"><img src="images/icon/icon-add.svg">新增公司</button>
</div>
<div class="search-group phone-show w-100">
<hr class="line"> <hr class="line">
</div> </div>
<div class="search-group"> <div class="search-group">
<input type="text" class="input" placeholder="請輸入關鍵字"> <input type="text" class="input" placeholder="請輸入關鍵字">
<div class="dropdown-group"> <div class="form-group row">
<select name="select" class="custom-select blue">
<option class="itmes">全部</option>
<option class="itmes" value="簽約公司" seleted>簽約公司</option>
<option class="itmes" value="公司名稱">公司名稱</option>
</select>
</div>
<!-- <div class="dropdown-group">
<div class="dropdown dropdown-status"> <div class="dropdown dropdown-status">
<button type="button" class="btn dropdown-toggle" type="button" id="dropdownMenuCompany" <button type="button" class="btn dropdown-toggle" type="button" id="dropdownMenuCompany"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">全部</button> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">全部</button>
...@@ -112,7 +123,7 @@ ...@@ -112,7 +123,7 @@
<a class="dropdown-item" href="#">公司名稱</a> <a class="dropdown-item" href="#">公司名稱</a>
</div> </div>
</div> </div>
</div> </div> -->
<button type="button" class="btn-wt blue mr-auto"><img src="images/icon/icon-search.svg">搜尋</button> <button type="button" class="btn-wt blue mr-auto"><img src="images/icon/icon-search.svg">搜尋</button>
<button type="button" class="btn-wt mr-2 NB-show" data-toggle="modal" <button type="button" class="btn-wt mr-2 NB-show" data-toggle="modal"
data-target="#addAdminCount"><img src="images/icon/icon-export.svg">匯出 Excel</button> data-target="#addAdminCount"><img src="images/icon/icon-export.svg">匯出 Excel</button>
...@@ -120,18 +131,22 @@ ...@@ -120,18 +131,22 @@
data-target="#addCompanyCount"><img src="images/icon/icon-add.svg">新增公司</button> data-target="#addCompanyCount"><img src="images/icon/icon-add.svg">新增公司</button>
<hr class="line phone-show"> <hr class="line phone-show">
<div class="phone-show text-center"> <div class="phone-show text-center">
<button type="button" class="btn-wt blue2" data-toggle="modal" <button type="button" class="btn-wt blue2 mb-1 mr-1 ml-1" data-toggle="modal"
data-target="#StopCompanyCount"><img src="images/icon/icon-stop.svg">停用</button> data-target="#StopCompanyCount"><img src="images/icon/icon-stop.svg">停用</button>
<button type="button" class="btn-wt blue2" data-toggle="modal" <button type="button" class="btn-wt blue2 mr-1 ml-1" data-toggle="modal"
data-target="#StartCompanyCount"><img src="images/icon/icon-play.svg">啟用</button> data-target="#StartCompanyCount"><img src="images/icon/icon-play.svg">啟用</button>
</div> </div>
</div>
<div class="sign-list phone-show"> <div class="search-group phone-show">
<div class="sign-list">
<label class="mr-5"><img src="images/icon/icon-alert.svg">員工人數超過上限</label> <label class="mr-5"><img src="images/icon/icon-alert.svg">員工人數超過上限</label>
<label><img src="images/icon/icon-point.svg" class="mr-1">試用公司</label> <label><img src="images/icon/icon-point.svg" class="mr-1">試用公司</label>
</div> </div>
</div> </div>
<table class="table table-bordered table-striped table-hrm phone table-rwd"> <table class="table table-bordered table-striped table-hrm phone table-rwd">
<!-- <table class="table table-striped table-borderless table-student table-rwd bulletinBoardListTBL"> --> <!-- <table class="table table-striped table-borderless table-student table-rwd bulletinBoardListTBL"> -->
...@@ -407,7 +422,9 @@ ...@@ -407,7 +422,9 @@
</div> </div>
</div> </div>
<div class="pagination mt-2"> <div class="d-flex justify-content-between">
<div class="small pl-0 col-sm-6 col-12 d-flex align-items-end">備註：「導入中」不會給該公司SA帳密，要到交付日期當天再給。</div>
<div class="pagination mt-2 pr-0 col-sm-6 col-12">
<a class="pren all"></a> <a class="pren all"></a>
<a class="pren"></a> <a class="pren"></a>
<a class="page-number active" href="#">1</a> <a class="page-number active" href="#">1</a>
...@@ -416,6 +433,10 @@ ...@@ -416,6 +433,10 @@
<a class="next all active" href="#"></a> <a class="next all active" href="#"></a>
</div> </div>
</div>
</div> </div>
...@@ -450,7 +471,12 @@ ...@@ -450,7 +471,12 @@
</div> </div>
<div class="search-group phone-show mb-n3">
<div class="sign-list">
<label class="mr-5"><img src="images/icon/icon-alert.svg">員工人數超過上限</label>
<label><img src="images/icon/icon-point.svg" class="mr-1">試用公司</label>
</div>
</div>
<table class="table table-bordered table-striped table-hrm table-rwd"> <table class="table table-bordered table-striped table-hrm table-rwd">
<!-- <table class="table table-striped table-borderless table-student table-rwd bulletinBoardListTBL"> --> <!-- <table class="table table-striped table-borderless table-student table-rwd bulletinBoardListTBL"> -->
...@@ -550,7 +576,7 @@ ...@@ -550,7 +576,7 @@
</table> </table>
<div class="search-group d-flex align-items-center justify-content-end"> <div class="search-group d-flex align-items-center justify-content-end NB-show">
<label class="mr-5"><img src="images/icon/icon-alert.svg">員工人數超過上限</label> <label class="mr-5"><img src="images/icon/icon-alert.svg">員工人數超過上限</label>
<label><img src="images/icon/icon-point.svg" class="mr-1">試用公司</label> <label><img src="images/icon/icon-point.svg" class="mr-1">試用公司</label>
</div> </div>
......
css/style.css
View file @ 92fcba47
...@@ -43,6 +43,7 @@ ul { ...@@ -43,6 +43,7 @@ ul {
background-color: #fff; background-color: #fff;
outline: none; outline: none;
cursor: pointer; cursor: pointer;
height: 48px;
} }
.btn-wt img { .btn-wt img {
...@@ -295,7 +296,7 @@ ul { ...@@ -295,7 +296,7 @@ ul {
font-size: 16px; font-size: 16px;
line-height: 32px; line-height: 32px;
color: #35a9e1; color: #35a9e1;
width: 72px; width: 100px;
background: #fff url(../images/icon/icon_selectBG.gif) no-repeat right; background: #fff url(../images/icon/icon_selectBG.gif) no-repeat right;
margin-right: 14px; margin-right: 14px;
} }
......
edu-manage.html
View file @ 92fcba47
...@@ -190,7 +190,14 @@ ...@@ -190,7 +190,14 @@
<div class="search-group"> <div class="search-group">
<input type="text" class="input" placeholder="請輸入關鍵字"> <input type="text" class="input" placeholder="請輸入關鍵字">
<div class="dropdown-group"> <div class="form-group row">
<select name="select" class="custom-select blue">
<option class="itmes">全部</option>
<option class="itmes" value="學校名稱" seleted>學校名稱</option>
<option class="itmes" value="所屬縣市">所屬縣市</option>
</select>
</div>
<!-- <div class="dropdown-group">
<div class="dropdown dropdown-status"> <div class="dropdown dropdown-status">
<button type="button" class="btn dropdown-toggle" type="button" id="dropdownMenuButton" <button type="button" class="btn dropdown-toggle" type="button" id="dropdownMenuButton"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">全部</button> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">全部</button>
...@@ -200,7 +207,7 @@ ...@@ -200,7 +207,7 @@
<a class="dropdown-item" href="#">所屬縣市</a> <a class="dropdown-item" href="#">所屬縣市</a>
</div> </div>
</div> </div>
</div> </div> -->
<button type="button" class="btn-wt blue"><img src="images/icon/icon-search.svg">搜尋</button> <button type="button" class="btn-wt blue"><img src="images/icon/icon-search.svg">搜尋</button>
......
index.html
View file @ 92fcba47
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
<input type="text" class="input" placeholder="請輸入關鍵字"> <input type="text" class="input" placeholder="請輸入關鍵字">
<div class="form-group row"> <div class="form-group row">
<select name="select" class="custom-select blue"> <select name="select" class="custom-select blue">
<option class="itmes" seleted>全部</option> <option class="itmes">全部</option>
<option class="itmes" value="帳號">帳號</option> <option class="itmes" value="帳號" seleted>帳號</option>
<option class="itmes" value="姓名">姓名</option> <option class="itmes" value="姓名">姓名</option>
</select> </select>
</div> </div>
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
<button type="button" class="btn-wt blue mr-auto"><img src="images/icon/icon-search.svg">搜尋</button> <button type="button" class="btn-wt blue mr-auto"><img src="images/icon/icon-search.svg">搜尋</button>
<button type="button" class="btn-wt blue NB-show" data-toggle="modal" <button type="button" class="btn-wt blue NB-show" data-toggle="modal"
data-target="#addAdminCount"><img src="images/icon/icon-add.svg">新增帳號</button> data-target="#addAdminCount"><img src="images/icon/icon-add.svg">新增帳號</button>
</div> </div>
......
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