diff options
Diffstat (limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html')
| -rw-r--r-- | usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html index 44ad2843..711ab964 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html @@ -49,6 +49,10 @@ .nodatainner { padding: 10px; } + #performanceChart { + width: 100%; + height: 300px; + } </style> <div class="templatemo-content-wrapper"> <div class="templatemo-content"> @@ -59,24 +63,35 @@ <div class="col-md-6"> <p class="input-group" style="float:left"> <label style="float:left;width:80px;line-height:100px">startTime:</label> - <div style="float:left;width:100px;padding-top:33px"> + <div ng-show="dayshow" style="float:left;width:100px;padding-top:33px"> <input type="text" class="form-control" readonly ng-change="startTimeChanged()" uib-datepicker-popup ng-click="open1()" ng-model="startTime" is-open="popup1.opened" datepicker-options ng-required="true" close-text="Close" /> </div> - <div style="display:block;float:left" uib-timepicker ng-model="startTime" ng-change="startTimeChanged()" hour-step minute-step - show-meridian></div> + <!-- <div ng-show="!dayshow" style="float:left;width:140px;padding-top:33px"> + <input style="padding-right:0px" type="month" class="form-control" readonly ng-change="startTimeChanged()" + uib-datepicker-popup ng-click="open1()" ng-model="startTime" is-open="popup1.opened" + datepicker-options ng-required="true" close-text="Close"/> + </div> --> + <div ng-show='hourshow' style="display:block;float:left" uib-timepicker ng-model="startTime" + ng-change="startTimeChanged()" hour-step minute-step='timestep' show-meridian></div> </p> </div> <div class="col-md-6" style="float:left"> <p class="input-group" style="float:left"> <label style="float:left;width:80px;line-height:100px">endTime:</label> - <div style="float:left;width:100px;padding-top:33px;"> - <input type="text" class="form-control" readonly ng-change="endTimeChanged()" ng-click="open2()" uib-datepicker-popup ng-model="endTime" + <div ng-show="dayshow" style="float:left;width:100px;padding-top:33px;"> + <input type="text" class="form-control" readonly ng-change="endTimeChanged()" + ng-click="open2()" uib-datepicker-popup ng-model="endTime" is-open="popup2.opened" datepicker-options ng-required="true" close-text="Close" /> </div> - <div style="display:block;float:left" uib-timepicker ng-model="endTime" ng-change="endTimeChanged()" hour-step minute-step - show-meridian></div> + <!-- <div ng-show="!dayshow" style="float:left;width:140px;padding-top:33px;"> + <input style="padding-right:0px" type="month" class="form-control" readonly ng-change="endTimeChanged()" + ng-click="open2()" uib-datepicker-popup ng-model="endTime" is-open="popup2.opened" + datepicker-options ng-required="true" close-text="Close"/> + </div> --> + <div ng-show='hourshow' style="display:block;float:left" uib-timepicker ng-model="endTime" + ng-change="endTimeChanged()" hour-step minute-step='0' show-meridian></div> </p> </div> <div class="col-md-6" style="width:100%;padding-bottom:20px;"> @@ -103,7 +118,7 @@ <label style="float:left;width:120px;line-height:30px;">Display Interval:</label> <div style="float:left;width:100px;"> <select class="form-control" ng-change="showModeIdChanged()" ng-model="showModeId" ng-options="sm for sm in showModeIds"> - <option value="">-- auto --</option> + <!-- <option value="">-- auto --</option> --> </select> </div> </div> @@ -113,11 +128,14 @@ </p> </div> <div class="col-md-12 col-sm-12"> - <div class="panel panel-success" ng-show="chartShow"> + <div class="panel panel-success"> + <!-- ng-show="chartShow" --> <div ng-show="ndaShow" style="text-align: center"> <h2>No Data Available</h2> </div> - <nvd3 ng-show="hdaShow" options="options" data="data" api="api"></nvd3> + <!-- <nvd3 ng-show="hdaShow" options="options" data="data" api="api"></nvd3> --> + <div id="performanceChart"></div> + <!-- ng-show="hdaShow" --> </div> </div> |