Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/main.html

@@ -437,7 +437,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_DELI_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">입고</div>
-											<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
+											<select id="MAIN_CHART_DELI_CHART" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -450,7 +450,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_ORDERS_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">수주내역</div>
-											<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType"	>
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -463,7 +463,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_RELEASE_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">출고</div>
-											<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -476,7 +476,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_PODR">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">구매발주</div>
-											<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -489,7 +489,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_REQ_UP">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">매출순위</div>
-											<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>

src/main/webapp/mobile/app/main.html

@@ -349,7 +349,7 @@
 	<aside id="ITP_ASIDE"></aside>
 	<section>
 		<div id="ITP_POP_NOTICE" class="popup2 mobile-pop-close" style="display: none;">
-			<div class="pop" style="height:340px;">
+			<div class="pop" style="height:350px;">
 				<div class="header">
 					<div class="header_left">
 						<label>공지내용</label>

src/main/webapp/mobile/css/style.css

@@ -211,7 +211,7 @@ body.eee {height: 700px; background: #eee;}
 #ITP_LOGIN .login_popup .itp_del_btn.reg_no {width:50px; right:123px; top:4px;}
 #ITP_LOGIN .login_popup .itp_del_btn.reg_no button {width:45px; border:none; background:transparent;}
 #ITP_LOGIN .login_popup .itp_del_btn {position:absolute; top:12px; right:66px; background:transparent;}
-#ITP_LOGIN .login_popup .itp_del_btn button {width:25px; border:none; padding:0;}
+#ITP_LOGIN .login_popup .itp_del_btn button {width:25px; border:none; padding:0; background:transparent;}
 #ITP_LOGIN .login_popup .itp_del_btn button img{width:18px;}
 #ITP_LOGIN .login_popup .num_area .brand_list select {padding-left: 10px; width: 70%; height: 45px; font-size: 0.8rem; border:2px solid #ddd; border-radius:10px; background: url(../img/downarrow.png)no-repeat 95% 50%/20px auto; -webkit-appearance:none; appearance:none;}
 #ITP_LOGIN .login_popup .num_area .brand_list select option {text-align: left; width: 70%; height: 50px; border: 1px solid #000; font-size: 20px;}