Merge branch 'dev' into 'deploy-dev-admin'

[BO] 2차 오픈 내부테스트 메뉴 오픈 처리

See merge request korea-research/korea-research!103
This commit is contained in:
김현주 개발
2025-07-14 03:14:26 +00:00
3 changed files with 12 additions and 12 deletions

View File

@@ -62,7 +62,7 @@
<section class="table-group"> <section class="table-group">
<div class="table-tit-group"> <div class="table-tit-group">
<h3 class="_selectedGroupNo">현황</h3> <h3 class="_selectedGroupNo">현황</h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small" onclick="getDailyRecordsList()"> <button type="button" class="btn small" onclick="getDailyRecordsList()">
<span class="btn-txt">등록 현황 목록</span> <span class="btn-txt">등록 현황 목록</span>
@@ -83,7 +83,7 @@
<section class="table-group"> <section class="table-group">
<div class="table-tit-group"> <div class="table-tit-group">
<h3>수입 <strong>(<span id="incomeCount">0</span>건)</strong></h3> <h3>수입 <strong>(<span id="incomeCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small"> <button type="button" class="btn small">
<span class="btn-txt"> <span class="btn-txt">
@@ -130,7 +130,7 @@
<section class="table-group"> <section class="table-group">
<div class="table-tit-group"> <div class="table-tit-group">
<h3>임업노동 투입 내역 <strong>(<span id="workCount">0</span>건)</strong></h3> <h3>임업노동 투입 내역 <strong>(<span id="workCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small"> <button type="button" class="btn small">
<span class="btn-txt"> <span class="btn-txt">
@@ -189,7 +189,7 @@
<section class="table-group"> <section class="table-group">
<div class="table-tit-group"> <div class="table-tit-group">
<h3>지출 <strong>(<span id="expenseCount">0</span>건)</strong></h3> <h3>지출 <strong>(<span id="expenseCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small"> <button type="button" class="btn small">
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span> <span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
@@ -238,7 +238,7 @@
<section class="table-group"> <section class="table-group">
<div class="table-tit-group"> <div class="table-tit-group">
<h3>동력사용시간 <strong>(<span id="powerCount">0</span>건)</strong></h3> <h3>동력사용시간 <strong>(<span id="powerCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small"> <button type="button" class="btn small">
<span class="btn-txt"> <span class="btn-txt">
@@ -279,7 +279,7 @@
<section class="table-group"> <section class="table-group">
<div class="table-tit-group"> <div class="table-tit-group">
<h3>자가임업 생산물 중 자가소비량 <strong>(<span id="forestryCount">0</span>건)</strong></h3> <h3>자가임업 생산물 중 자가소비량 <strong>(<span id="forestryCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small"> <button type="button" class="btn small">
<span class="btn-txt"> <span class="btn-txt">
@@ -322,7 +322,7 @@
<section class="table-group"> <section class="table-group">
<div class="table-tit-group"> <div class="table-tit-group">
<h3>자가농업 생산물 중 자가소비량 <strong>(<span id="farmingCount">0</span>건)</strong></h3> <h3>자가농업 생산물 중 자가소비량 <strong>(<span id="farmingCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small"> <button type="button" class="btn small">
<span class="btn-txt"> <span class="btn-txt">

View File

@@ -112,7 +112,7 @@
</tbody> </tbody>
</table> </table>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn" th:if="${userRole == 'ROLE_ADMIN'}" onclick="showResearcherModal();"> <button type="button" class="btn" th:if="${userRole == 'ROLE_ADMIN'}" onclick="showResearcherModal();">
<span class="btn-txt">조사원 매핑</span> <span class="btn-txt">조사원 매핑</span>
@@ -128,9 +128,9 @@
<div class="component-tab" data-active="none"> <div class="component-tab" data-active="none">
<div class="tab-head"> <div class="tab-head">
<button type="button" class="tab-label select-tab" data-tab-type="daily-record" data-tab-value="tab1">일계부 등록 현황</button> <button type="button" class="tab-label select-tab" data-tab-type="daily-record" data-tab-value="tab1">일계부 등록 현황</button>
<button type="button" class="tab-label select-tab" data-tab-type="forest-product" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">임산물 현황</button> <button type="button" class="tab-label select-tab" data-tab-type="forest-product" data-tab-value="tab2">임산물 현황</button>
<button type="button" class="tab-label select-tab" data-tab-type="bank-auto-transfer" data-tab-value="tab3" th:unless="${activeProfile != 'local'}">은행자동이체 내역</button> <button type="button" class="tab-label select-tab" data-tab-type="bank-auto-transfer" data-tab-value="tab3">은행자동이체 내역</button>
<button type="button" class="tab-label select-tab" data-tab-type="household-visit" data-tab-value="tab4" th:unless="${activeProfile != 'local'}">임가방문정보</button> <button type="button" class="tab-label select-tab" data-tab-type="household-visit" data-tab-value="tab4">임가방문정보</button>
<div class="component-select select-date"> <div class="component-select select-date">
<select class="select-list" name="recordMonth" required onchange="onRecordMonthChange();"> <select class="select-list" name="recordMonth" required onchange="onRecordMonthChange();">

View File

@@ -40,7 +40,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group">
<div class="btns-row align-right"> <div class="btns-row align-right">
<a th:href="@{'/settings/admins/update/' + ${researcherDto.id}}"> <a th:href="@{'/settings/admins/update/' + ${researcherDto.id}}">
<button type="button" class="btn"> <button type="button" class="btn">