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

Merge branch 'master' of http://192.168.0.157:3000/DBNT/GGWEB

master
Hyung Geun 2022-02-23 10:49:05 +09:00
parent 14dc09cc39 ca84211e1d
commit 7756416a51
16 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/mca/cmmn/web/AdminController.java
View File

@ -75,6 +75,10 @@ public class AdminController {
int statusCnt = useRequestService.selectUseRequeststatusCnt();
model.addAttribute("statusCnt", statusCnt);
// 회원가입 승인대기 수
int standByCount = userService.selectUserStandByCount();
model.addAttribute("standByCount", standByCount);
return "admin/dashBoard";
} catch (Exception e) {

34
src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
View File

@ -6,11 +6,33 @@
<script src="../../../js/admin/dashBoard.js"></script>
<section class="section">
<div class="row">
<div class="col-lg-3">
<a href="/admin/request?status=99">지도사용 요청 승인대기<span class="badge"><c:out value="${statusCnt}" /></span></a>
<div class="container">
<div class="row">
<div class="col-lg-3">
<div class="card">
<div class="card-body row">
<div class="col-auto">
<img src="../../../images/icon/icon_004.png" width="60" height="60" alt="">
</div>
<div class="col-auto">
<a href="/admin/request?status=99" class="text-black-50">지도사용 요청 승인대기</a>
<h3><c:out value="${statusCnt}" /></h3>
</div>
</div>
</div>
</div>
</section>
<div class="col-lg-3">
<div class="card">
<div class="card-body row">
<div class="col-auto">
<img src="../../../images/icon/icon_21.png" width="60" height="60" alt="">
</div>
<div class="col-auto">
<a href="/admin/userInfo?auth=99" class="text-black-50">회원가입 승인대기</a>
<h3><c:out value="${standByCount}" /></h3>
</div>
</div>
</div>
</div>
</div>
</div>

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

@ -13,7 +13,6 @@
}
</style>
<section class="section">
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>
@ -82,4 +81,3 @@
</nav>
</div>
</div>
</section>

4
src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
View File

@ -7,7 +7,6 @@
<script src="../../../js/admin/fieldView.js"></script>
<section class="section">
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>
@ -113,5 +112,4 @@
<input class="btn btn-primary" type="button" value="반영" onclick="fieldReflect();" />
</p>
</div>
</div>
</section>
</div>

2
src/main/webapp/WEB-INF/jsp/admin/history.jsp
View File

@ -6,7 +6,6 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<script src="../../../js/admin/history.js"></script>
<section class="section">
<div class="section_title">
<!-- <p>지도사용 이력</p> -->
</div>
@ -64,4 +63,3 @@
</nav>
</div>
</div>
</section>

2
src/main/webapp/WEB-INF/jsp/admin/request.jsp
View File

@ -6,7 +6,6 @@
<script src="../../../js/admin/request.js"></script>
<section class="section">
<div class="section_content">
<form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
<input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />" />
@ -85,4 +84,3 @@
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>
</section>

2
src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
View File

@ -8,7 +8,6 @@
<script src="../../../js/admin/requestView.js"></script>
<section class="section">
<form:form commandName="useRequestVO" name="frm" method="POST" action="/admin/updateReqConfirm" id="updateFrm">
<input type="hidden" name="idx" value="<c:out value='${useRequestVO.idx}' />" />
<input type="hidden" name="admin_id" value="<c:out value='${loginUserVO.userid}' />" />
@ -174,6 +173,5 @@
</c:choose>
</div>
</form:form>
</section>

2
src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
View File

@ -14,7 +14,6 @@
}
</style>
<section class="section">
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>
@ -109,4 +108,3 @@
<input type="hidden" id="auth" name="auth" />
</form:form>
</div>
</section>

2
src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
View File

@ -10,7 +10,6 @@
<section class="section">
<div class="section_content">
<form:form commandName="userVO" name="updateForm" id="updateForm" action="/admin/userUpdate" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
@ -93,5 +92,4 @@
</div>
</form:form>
</div>
</section>

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

@ -26,7 +26,7 @@
<sec:authorize access="hasRole('ROLE_ADMIN')">
<header class="header">
<div class="header_title">
<a href="/admin/request">모바일센터 관리시스템</a>
<a href="/admin/dashBoard">모바일센터 관리시스템</a>
</div>
<div class="header_info">
<a href="<c:url value="/logout"/>">

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

@ -25,8 +25,10 @@
<body class="">
<div id="wrap">
<tiles:insertAttribute name="header"/>
<tiles:insertAttribute name="left"/>
<tiles:insertAttribute name="center"/>
<tiles:insertAttribute name="left"/>
<section class="section">
<tiles:insertAttribute name="center"/>
</section>
</div>
</body>
</html>

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

@ -22,7 +22,6 @@
<div class="header_title"><a href="/">모바일센터 관리시스템</a></div>
<div class="header_menu"></div>
</header>
<section class="section">
<div class="loginWrap">
<div class="loginBox">
<form method="POST" action="/j_spring_security_check">
@ -51,7 +50,6 @@
</form>
</div>
</div>
</section>
</body>
<script type="text/javascript">
$(document).ready(function(){

3
src/main/webapp/WEB-INF/jsp/map/request.jsp
View File

@ -17,8 +17,6 @@
<link href="<c:out value="/css/style.css" />" rel="stylesheet">
</head>
<body>
<%@ include file="../include/header.jsp"%>
<section class="section">
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>
@ -72,7 +70,6 @@
<div class="section_btn">
<!-- <p><input class="btn" type="button" value="관리" onclick="location.href='fieldDetail.html'" /></p> -->
</div>
</section>
</body>
<script type="text/javascript">
var start = "${b_start}";

3
src/main/webapp/WEB-INF/jsp/map/requestView.jsp
View File

@ -21,8 +21,6 @@
<link href="<c:out value="/css/style.css" />" rel="stylesheet">
</head>
<body>
<%@ include file="../include/header.jsp"%>
<section class="section">
<form:form commandName="useRequestVO" name="frm" method="POST" action="/map/updateReq" id="updateFrm">
<input type="hidden" name="idx" value="${useRequestVO.idx}" />
<div class="section_title">
@ -259,7 +257,6 @@
</c:choose>
</div>
</form:form>
</section>
<script type="text/javascript">
var areaAddCount = ${selectArea.size()};

3
src/main/webapp/WEB-INF/jsp/map/requestWrite.jsp
View File

@ -21,8 +21,6 @@
</head>
<body>
<%@ include file="../include/header.jsp"%>
<section class="section">
<form:form commandName="useRequestVO" name="frm" method="POST" action="/map/insertReq" id="insertFrm">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
<div class="section_title">
@ -117,7 +115,6 @@
</div>
</div>
</form:form>
</section>
<script type="text/javascript">
var areaAddCount = 0;

3
src/main/webapp/WEB-INF/jsp/map/userInfo.jsp
View File

@ -19,8 +19,6 @@
<link href="<c:out value="/css/style.css" />" rel="stylesheet">
</head>
<body>
<%@ include file="../include/header.jsp"%>
<section class="section">
<form:form commandName="userVO" name="updateForm" action="/map/userUpdate" id="updateForm" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
<input type="hidden" name="userid" value="${userVO.userid}" />
@ -75,7 +73,6 @@
</div>
</div>
</form:form>
</section>
<script>
$(function(){
$("#changePw").click(function(){