From 6587fd584cb672bbb8a4539cdc1c5714efb8b48f Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 17:54:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/api/apiMonitor.html | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/api/apiMonitor.html b/src/main/webapp/views/api/apiMonitor.html
index eddba0e..8dca8b6 100644
--- a/src/main/webapp/views/api/apiMonitor.html
+++ b/src/main/webapp/views/api/apiMonitor.html
@@ -12,23 +12,48 @@
</h6>
<div class="element-box">
- <select class="form-control form-control-sm rounded width-30 d-inline-block mb-10" ng-model="vm.search.searchPeriod" ng-change="fn.changeSearchPeriod()">
- <option value="LAST_SEVEN_DAYS" translate="common.last7Days">理쒓렐 7�씪</option>
- <option value="THIS_WEEK" translate="common.thisWeek">�씠踰� 二�</option>
- <option value="LAST_WEEK" translate="common.lastWeek">吏��궃 二�</option>
- <option value="THIS_MONTH" translate="common.thisMonth">�씠踰� �떖</option>
- <option value="LAST_MONTH" translate="common.lastMonth">吏��궃 �떖(1�씪~留먯씪)</option>
- <option value="LAST_THIRTY_DAYS" translate="common.last30Days">理쒓렐 30�씪</option>
- <option value="CUSTOM_INPUT" translate="common.directInput">吏곸젒�엯�젰</option>
- </select>
+ <div>
+ <select class="form-control form-control-sm rounded width-30 d-inline-block mb-10" ng-model="vm.search.searchPeriod" ng-change="fn.changeSearchPeriod()">
+ <option value="LAST_SEVEN_DAYS" translate="common.last7Days">理쒓렐 7�씪</option>
+ <option value="THIS_WEEK" translate="common.thisWeek">�씠踰� 二�</option>
+ <option value="LAST_WEEK" translate="common.lastWeek">吏��궃 二�</option>
+ <option value="THIS_MONTH" translate="common.thisMonth">�씠踰� �떖</option>
+ <option value="LAST_MONTH" translate="common.lastMonth">吏��궃 �떖(1�씪~留먯씪)</option>
+ <option value="LAST_THIRTY_DAYS" translate="common.last30Days">理쒓렐 30�씪</option>
+ <option value="CUSTOM_INPUT" translate="common.directInput">吏곸젒�엯�젰</option>
+ </select>
+ <input type="text"
+ ng-show="vm.search.searchPeriod == 'CUSTOM_INPUT'"
+ class="form-control form-control-sm rounded col-md-4 d-inline-block input-readonly"
+ ng-model="vm.search.startEndDateRange"
+ modal-form-auto-scroll
+ parent-el="'#createdWidget'"
+ range-type="date"
+ onfocus="this.blur()"
+ style="height: 32px !important; padding: 0.25rem 0.5rem; font-size: 0.8rem; line-height: 1.5;"
+ date-range-picker>
+ <div class="row">
+ <div class="col-xs-12">
+ <div id="createdWidget" class="bootstrap-datepicker"></div>
+ </div>
+ </div>
- <google-chart
- columns="vm.chartData.columns"
- rows="vm.chartData.rows"
- options="vm.chartData.options">
+ <div class="no-cont1"
+ ng-if="vm.chartData.columns.length < 1"
+ translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
- </google-chart>
+ </div>
+ <div ng-if="vm.chartData.columns.length > 0">
+ <google-chart
+ columns="vm.chartData.columns"
+ rows="vm.chartData.rows"
+ options="vm.chartData.options">
+
+ </google-chart>
+ </div>
</div>
</div>
</div>
--
Gitblit v1.8.0