DBNT
/
GGWEB
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
master
Hyung Geun 2022-03-02 14:59:02 +09:00
parent 72f81d95ce 0b3f52f25f
commit 7618895297
3 changed files with 95 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
View File

@ -12,16 +12,11 @@
display: inline; display: inline;
} }
</style> </style>
<%--<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>--%>
<div class="mx-lg-2"> <div class="mx-lg-2">
<h1 class="h4"><i class="bi bi-flag"></i> 현장수집 데이터</h1> <h1 class="h4 m-3"> 현장수집 데이터(${count})</h1>
<form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get"> <form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get">
<div class="row justify-content-between"> <div class="row justify-content-between bg-white mx-3 py-2">
<div class="col-auto row"> <div class="col-auto">
<ul class="nav"> <ul class="nav">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#"> <a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#">
@ -75,16 +70,16 @@
</div> </div>
</div> </div>
<div class="row m-3 p-2 bg-white">
<table class="list-table"> <table class="table table-hover text-center">
<thead > <thead>
<tr > <tr>
<th style="text-align: center">Data ID</th> <th>Data ID</th>
<th style="text-align: center">지역</th> <th>지역</th>
<th style="text-align: center">소속</th> <th>소속</th>
<th style="text-align: center">담당자</th> <th>담당자</th>
<th style="text-align: center">수집날짜</th> <th>수집날짜</th>
<th style="text-align: center">상태</th> <th>상태</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -113,13 +108,15 @@
</c:if> </c:if>
</tbody> </tbody>
</table> </table>
</div>
<div class="text-page"> <div class="text-page">
<form:hidden path="pageIndex" /></form:form> <form:hidden path="pageIndex" />
<nav aria-label="Page navigation"> <nav aria-label="Page navigation">
<ul class="pagination justify-content-center"> <ul class="pagination justify-content-center">
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" /> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
</ul> </ul>
</nav> </nav>
</div> </div>
</form:form>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
View File

@ -23,7 +23,7 @@
<script src="<c:url value='/js/jquery-ui.min.js' />"></script> <script src="<c:url value='/js/jquery-ui.min.js' />"></script>
<script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script> <script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script>
</head> </head>
<body class=""> <body class="overflow-hidden">
<div id="wrap"> <div id="wrap">
<tiles:insertAttribute name="header"/> <tiles:insertAttribute name="header"/>
<tiles:insertAttribute name="left"/> <tiles:insertAttribute name="left"/>

4
src/main/webapp/css/style.css
View File

@ -72,11 +72,12 @@ a {
.section { .section {
margin-top: 90px; margin-top: 90px;
margin-left: 200px; margin-left: 200px;
padding-bottom: 100px;
min-width: 1160px; min-width: 1160px;
min-height: 100px; min-height: 100px;
overflow: hidden; overflow: hidden;
padding-top: 20px; padding-top: 20px;
height: 100vh;
background-color: rgb(247, 247, 247);
} }
.loginWrap { .loginWrap {
@ -622,7 +623,6 @@ a {
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: #337ab7; background-color: #337ab7;
padding: 10px 5px; padding: 10px 5px;
text-align: left;
color: #fff; color: #fff;
} }