From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/views/api/apiMonitor.html | 58 +++++++++++++++++-----------------------------------------
1 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/src/main/webapp/views/api/apiMonitor.html b/src/main/webapp/views/api/apiMonitor.html
index 95d7584..eddba0e 100644
--- a/src/main/webapp/views/api/apiMonitor.html
+++ b/src/main/webapp/views/api/apiMonitor.html
@@ -1,45 +1,5 @@
<script type="text/javascript">
- google.charts.load('current', {'packages':['line']});
- google.charts.setOnLoadCallback(drawChart);
- function drawChart() {
-
- var data = new google.visualization.DataTable();
- data.addColumn('number', '�궇吏�');
- data.addColumn('number', '�솃�럹�씠吏� 蹂�議� �깘吏�');
- data.addColumn('number', '寃쎌쑀吏� �깘吏�');
- data.addColumn('number', '�씪媛� 議고쉶');
-
- data.addRows([
- [1, 37.8, 80.8, 41.8],
- [2, 30.9, 69.5, 32.4],
- [3, 25.4, 57, 25.7],
- [4, 11.7, 18.8, 10.5],
- [5, 11.9, 17.6, 10.4],
- [6, 8.8, 13.6, 7.7],
- [7, 7.6, 12.3, 9.6],
- [8, 12.3, 29.2, 10.6],
- [9, 16.9, 42.9, 14.8],
- [10, 12.8, 30.9, 11.6],
- [11, 5.3, 7.9, 4.7],
- [12, 6.6, 8.4, 5.2],
- [13, 4.8, 6.3, 3.6],
- [14, 4.2, 6.2, 3.4]
- ]);
-
- var options = {
- chart: {
- title: '�씪媛� �쑀�삎蹂� API �궗�슜 �쁽�솴',
- subtitle: '理쒓렐 15�씪'
- },
- width: 900,
- height: 500
- };
-
- var chart = new google.charts.Line(document.getElementById('linechart_material'));
-
- chart.draw(data, google.charts.Line.convertOptions(options));
- }
</script>
<div class="row">
@@ -52,7 +12,23 @@
</h6>
<div class="element-box">
- <div id="linechart_material"></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>
+
+
+ <google-chart
+ columns="vm.chartData.columns"
+ rows="vm.chartData.rows"
+ options="vm.chartData.options">
+
+ </google-chart>
</div>
</div>
</div>
--
Gitblit v1.8.0