Fix monitor display bug

Change-Id: I9260b9f13f0c4cb066b180465bfc2d074e7ded89
Issue-ID: USECASEUI-62
Signed-off-by: shentao <shentao@chinamobile.com>

4 files changed, 65 insertions, 57 deletions

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html
index 55b8bce5..9f06bf4e 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html
@@ -92,14 +92,8 @@
                                 </select>
                             </div>
                         </div>
-                        <div style="float:left">
-                            <button style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">submit
-                            </button>
-                        </div>
-                        </p>
-                    </div>
-                    <div style="float:left;padding-left:15px;">
-                        <label style="float:left;width:50px;line-height:30px;">mode:</label>
+						<div style="float:left;padding-right:30px;">
+                        <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">
@@ -107,6 +101,13 @@
                             </select>
                         </div>
                     </div>
+                        <div style="float:left">
+                            <button style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">submit
+                            </button>
+                        </div>
+                        </p>
+                    </div>
+                    
 
                     <div class="col-md-6 col-sm-12" style="width:100%">
                         <div class="panel panel-success" ng-show="chartShow">
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html
index 1f0611ed..81928862 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html
@@ -80,41 +80,38 @@
             </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>
+        
         <div>
             <table class="table" st-pipe="amc.callServer" st-table="amc.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>Status</th>
+                    <th width="5%">Id</th>
+                <!--    <th>Event Id</th> -->
+                    <th width="25%">Event Name</th>
+                <!--    <th>Source Id</th> -->
+                    <th width="25%">Source Name</th>
+                <!--    <th>Reporting Entity Id</th> -->
+                <!--    <th>Reporting Entity Name</th> -->
+                    <th width="10%">Priority</th>
+                    <th width="15%">Start Time</th>
+                    <th width="10%">Status</th>
                     <th>Option</th>
                 </tr>
                 </thead>
                 <tbody ng-show="!amc.isLoading">
                 <tr ng-repeat="row in amc.displayed">
                     <td>{{row.alarmsHeader.id}}</td>
-                    <td>{{row.alarmsHeader.eventId}}</td>
+                <!--    <td>{{row.alarmsHeader.eventId}}</td> -->
                     <td>{{row.alarmsHeader.eventName}}</td>
-                    <td>{{row.alarmsHeader.sourceId}}</td>
+                <!--    <td>{{row.alarmsHeader.sourceId}}</td> -->
                     <td>{{row.alarmsHeader.sourceName}}</td>
-                    <td>{{row.alarmsHeader.reportingEntityId}}</td>
-                    <td>{{row.alarmsHeader.reportingEntityName}}</td>
+                <!--    <td>{{row.alarmsHeader.reportingEntityId}}</td> -->
+                <!--    <td>{{row.alarmsHeader.reportingEntityName}}</td> -->
                     <td>{{row.alarmsHeader.priority}}</td>
                     <td>{{row.alarmsHeader.createTime}}</td>
                     <td>{{row.alarmsHeader.status == 1?"Active":"Closed"}}</td>
                     <td>
-                        <button ng-click="jump(row.alarmsHeader.sourceId)" class="btn btn-primary">Details</button>
+                        <button ng-click="jump(row.alarmsHeader.sourceId)" class="btn btn-primary">Detail</button>
                     </td>
                 </tr>
                 </tbody>
@@ -127,8 +124,14 @@
                 </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 class="text-center" style="padding-top:30px" colspan="4">
+						<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="itemsByPagea" />
+						</div>
+					</td>
+                    <td class="text-center" st-pagination="" st-items-by-page="itemsByPagea"
+                        st-template="app/uui/fusion/scripts/view-models/pagination.html" colspan="3">
                     </td>
                 </tr>
                 </tfoot>
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 67acab0f..5b720ba5 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
@@ -70,7 +70,7 @@
 							<div class="col-md-6" style="width:100%;padding-bottom:20px;">
 								<p>
 									<div style="float:left;padding-right:30px;">
-										<label style="float:left;width:80px;line-height:30px;">*sourceId:</label>
+										<label style="float:left;width:80px;line-height:30px;"><span style="float:left;color:red;">*</span>sourceId:</label>
 										<div style="float:left;width:130px;">
 										<select class="form-control" ng-change="sourceIdChanged()" ng-model="sourceId" ng-options="s for s in sourceIds" >
 											<option value="">--- chose ---</option>
@@ -78,7 +78,7 @@
 										</div>
 									</div>
 									<div style="float:left;padding-right:30px" ng-show="namesPIsShow">
-										<label style="float:left;width:50px;line-height:30px;">*name:</label>
+										<label style="float:left;width:50px;line-height:30px;"><span style="float:left;color:red;">*</span>name:</label>
 										<div style="float:left;width:130px;">
 										<select class="form-control" ng-change="namePChanged()" ng-model="nameP" ng-options="np for np in namePs" >
 											<option value="">--- chose ---</option>
@@ -93,13 +93,8 @@
 										</select>
 										</div>
 									</div>-->
-									<div style="float:left">
-										<button ng-disabled="goIsShow" style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">submit</button>
-									</div>
-								</p>
-							</div>
-                            <div style="float:left;padding-left:15px;">
-                                <label style="float:left;width:90px;line-height:30px;">show mode:</label>
+									<div style="float:left;padding-right:30px">
+                                <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">
@@ -107,6 +102,12 @@
                                     </select>
                                 </div>
                             </div>
+									<div style="float:left">
+										<button ng-disabled="goIsShow" style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">submit</button>
+									</div>
+								</p>
+							</div>
+                            
 
 							<div class="col-md-12 col-sm-12" >
 								<div class="panel panel-success" ng-show="chartShow" >
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 9187a838..5b6747b7 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
@@ -56,37 +56,34 @@
                     </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 width="10%" >Id</th>
+                    <!--    <th >Event Id</th> -->
+                        <th width="25%">Event Name</th>
+                    <!--    <th >Source Id</th> -->
+                        <th width="25%">Source Name</th>
+                    <!--    <th >Reporting Entity Id</th> -->
+                    <!--    <th >Reporting Entity Name</th> -->
+                        <th width="10%">Priority</th>
+                        <th width="20%">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.eventId}}</td> -->
                         <td>{{row.performanceHeader.eventName}}</td>
-                        <td>{{row.performanceHeader.sourceId}}</td>
+                    <!--    <td>{{row.performanceHeader.sourceId}}</td> -->
                         <td>{{row.performanceHeader.sourceName}}</td>
-                        <td>{{row.performanceHeader.reportingEntityId}}</td>
-                        <td>{{row.performanceHeader.reportingEntityName}}</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>
+                        <td><button ng-click="jump(row.performanceHeader.sourceId)" class="btn btn-primary" >Detail</button></td>
                     </tr>
                     </tbody>
                     <tbody ng-show="mc.isLoading">
@@ -97,7 +94,13 @@
                     </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 class="text-center" style="padding-top:30px" colspan="3">
+						<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>
+						</td>
+                        <td class="text-center" st-pagination="" st-items-by-page="itemsByPage" st-template="app/uui/fusion/scripts/view-models/pagination.html" colspan="3">
                         </td>
                     </tr>
                     </tfoot>