From 62430d66781234816d4eee66600380b915c04089 Mon Sep 17 00:00:00 2001
From: shentao <shentao@chinamobile.com>
Date: Tue, 5 Dec 2017 16:07:51 +0800
Subject: Fix alarm and performance display bugs

Change-Id: I12b07d4252336de7e4a4c64ea578ef625873e432
Issue-ID: USECASEUI-62
Signed-off-by: shentao <shentao@chinamobile.com>
---
 .../fusion/scripts/view-models/performance.html    | 120 ++++++++++++++-------
 1 file changed, 83 insertions(+), 37 deletions(-)

(limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html')

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html
index 83f4385e..9187a838 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html
@@ -17,47 +17,93 @@
     <div class="templatemo-content">
         <h3>Performance</h3>
         <div>
-            <ul class="list">
-                <li>Source Id <input type="text" ng-model="seek1"/></li>
-                <li>Source Name <input type="text" ng-model="seek2"/></li>
-                <li>Priority <input type="text" ng-model="seek3"/></li>
-                <button ng-click="getSearch()">search</button>
-            </ul>
-            <ul class="list" ng-show='menuState.show'>
-                <li> <p class="input-group" style="float:left">
-						<div style="float:left;line-height:100px;padding-right:4px;">StartTime</div><div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly ng-click="open1()" uib-datepicker-popup ng-model="seek4" is-open="popup1.opened" datepicker-options ng-required="true" close-text="Close" /></div>
-						<div style="display:block;float:left;" uib-timepicker ng-model="seek4" hour-step minute-step show-meridian></div>
-					</p></li>
-                <li><p class="input-group" style="float:left">
-					<div style="float:left;line-height:100px;padding-right:4px;">End Time</div><div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly ng-click="open2()" uib-datepicker-popup ng-model="seek5" is-open="popup2.opened" datepicker-options ng-required="true" close-text="Close" /></div>
-                    <div style="display:block;float:left" uib-timepicker ng-model="seek5" hour-step minute-step show-meridian></div>
-					</p></li>
-            </ul>
-            <div class="row">
-                <div class="col-md-5" style="border-top:1px dotted #ddd">
-                </div>
-                <div class="col-md-2" style="border:1px dotted #ddd;border-top:none;text-align:center"
-                     ng-click="toggleMenu()">
-                    <span class="caret"></span>
-                </div>
-                <div class="col-md-5" style="border-top:1px dotted #ddd">
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-11">
-                    <div class="table-responsive">
-                        <h4 class="margin-bottom-15">Query Result</h4>
+            <div class="table-container" ng-controller="pipeCtrl as mc">
+                <ul class="list" style="padding-left:0;">
+                    <li>Source Id <input type="text" ng-model="seek1"/></li>
+                    <li>Source Name <input type="text" ng-model="seek2"/></li>
+                    <li>Priority <input type="text" ng-model="seek3"/></li>
+                    <button class="btn btn-primary" ng-click="mc.callServer(tableState)">search</button>
+                </ul>
+                <ul class="list" style="padding-left:0;" ng-show='menuState.show'>
+                    <li> <p class="input-group" style="float:left">
+                        <div style="float:left;line-height:100px;padding-right:4px;">StartTime</div><div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly ng-click="open1()" uib-datepicker-popup ng-model="seek4" is-open="popup1.opened" datepicker-options ng-required="true" close-text="Close" /></div>
+                        <div style="display:block;float:left;" uib-timepicker ng-model="seek4" hour-step minute-step show-meridian></div>
+                        </p></li>
+                    <li><p class="input-group" style="float:left">
+                        <div style="float:left;line-height:100px;padding-right:4px;">End Time</div><div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly ng-click="open2()" uib-datepicker-popup ng-model="seek5" is-open="popup2.opened" datepicker-options ng-required="true" close-text="Close" /></div>
+                        <div style="display:block;float:left" uib-timepicker ng-model="seek5" hour-step minute-step show-meridian></div>
+                        </p></li>
+                </ul>
+                <div class="row">
+                    <div class="col-md-5" style="border-top:1px dotted #ddd">
+                    </div>
+                    <div class="col-md-2" style="border:1px dotted #ddd;border-top:none;text-align:center"
+                         ng-click="toggleMenu()">
+                        <span class="caret"></span>
+                    </div>
+                    <div class="col-md-5" style="border-top:1px dotted #ddd">
                     </div>
                 </div>
-                <div class="col-md-1">
-                  <!--  <button ng-click="generateCsv()" class="btn btn-primary">CSV</button>-->
-                    <button ng-click="toChart()" class="btn btn-primary">Chart</button>
+                <div class="row">
+                    <div class="col-md-11">
+                        <div class="table-responsive">
+                            <h4 class="margin-bottom-15">Query Result</h4>
+                        </div>
+                    </div>
+                    <div class="col-md-1">
+                        <!--  <button ng-click="generateCsv()" class="btn btn-primary">CSV</button>-->
+                        <button ng-click="toChart()" class="btn btn-primary">Chart</button>
+                    </div>
                 </div>
+
+                <label for="items" style="float:left;width:100px;line-height:30px;">items by page</label>
+                <div style="float:left;width:130px;">
+				<input class="input-sm form-control" name="items" id="items" type="number" ng-model="itemsByPage" />
+				</div>
+                <table class="table" st-pipe="mc.callServer" st-table="mc.displayed">
+                    <thead>
+                    <tr>
+                        <th >Id</th>
+                        <th >Event Id</th>
+                        <th >Event Name</th>
+                        <th >Source Id</th>
+                        <th >Source Name</th>
+                        <th >Reporting Entity Id</th>
+                        <th >Reporting Entity Name</th>
+                        <th >Priority</th>
+                        <th >Start Time</th>
+                        <th >Option</th>
+                    </tr>
+                    </thead>
+                    <tbody ng-show="!mc.isLoading">
+                    <tr ng-repeat="row in mc.displayed">
+                        <td>{{row.performanceHeader.id}}</td>
+                        <td>{{row.performanceHeader.eventId}}</td>
+                        <td>{{row.performanceHeader.eventName}}</td>
+                        <td>{{row.performanceHeader.sourceId}}</td>
+                        <td>{{row.performanceHeader.sourceName}}</td>
+                        <td>{{row.performanceHeader.reportingEntityId}}</td>
+                        <td>{{row.performanceHeader.reportingEntityName}}</td>
+                        <td>{{row.performanceHeader.priority}}</td>
+                        <td>{{row.performanceHeader.createTime}}</td>
+                        <td><button ng-click="jump(row.performanceHeader.sourceId)" class="btn btn-primary" >Details</button></td>
+                    </tr>
+                    </tbody>
+                    <tbody ng-show="mc.isLoading">
+                    <tr>
+                        <td colspan="4" class="text-center"><div class="loading-indicator"></div>
+                        </td>
+                    </tr>
+                    </tbody>
+                    <tfoot>
+                    <tr>
+                        <td class="text-center" st-pagination="" st-items-by-page="itemsByPage" st-template="app/uui/fusion/scripts/view-models/pagination.html" colspan="9">
+                        </td>
+                    </tr>
+                    </tfoot>
+                </table>
             </div>
-            <div ui-grid="gridOptions" style="width: 100%;margin-top:10px; text-align: center;" ui-grid-edit
-                 ui-grid-pagination
-                 ui-grid-selection ui-grid-resize-columns ui-grid-auto-resize>
-            </div>
+
         </div>
     </div>
 </div>
-- 
cgit 1.2.3-korg