Fix alarm list page bug

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

7 files changed, 298 insertions, 251 deletions

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html
index f0c91660..a50a399d 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html
@@ -15,13 +15,9 @@
 -->
 <div class="templatemo-content" ng-controller="alarmDetailsController">
     <h1>VNF Alarm Details</h1>
-
-    
-        
-        <button style="position:relative;left:75%;" ng-click="back()" class="btn btn-primary">back</button>
-    
+    <button style="position:relative;left:75%;" ng-click="back()" class="btn btn-primary">back</button>
     <div>
-		<span>Header Information</span>
+        <span>Header Information</span>
         <table width="80%" border="1" cellspacing="50%" cellpadding="10">
             <tr>
                 <th style="background-color:lightblue;">Event Name</th>
@@ -95,6 +91,6 @@
             </tbody>
         </table>
     </div>
-    <br />
-    <br />
+    <br/>
+    <br/>
 </div>
\ No newline at end of file
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 81928862..3e45f23f 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
@@ -21,50 +21,54 @@
         <div class="row margin-bottom-10">
             <div class="col-md-4">
                 <ul class="nav nav-pills">
-                    <li style="background-color: #ddd" ng-repeat="O in open"
-                        ng-click="selectOpen(O.id)"
-                        ng-class="{active:activeOpen(O.id)}">
+                    <li style="background-color: #ddd" ng-repeat="O in open" ng-click="selectOpen(O.id,amc.callServer)" ng-class="{active:activeOpen(O.id)}">
                         <a href="">
                             {{O.name}}
                             <span class="badge">{{O.count}}</span>
                         </a>
                     </li>
-                    <input type="hidden" ng-model="selectedOpen"/>
+                    <input type="hidden" ng-model="selectedOpen" />
                 </ul>
             </div>
         </div>
         <ul class="list" style="padding-left:0;">
-            <li>Source Id <input ng-model="condition1" type="text"/></li>
-            <li>Source Name <input ng-model="condition2" type="text"/></li>
-            <li>Priority <input ng-model="condition3" type="text"/></li>
+            <li>Source Id
+                <input ng-model="condition1" type="text" />
+            </li>
+            <li>Source Name
+                <input ng-model="condition2" type="text" />
+            </li>
+            <li>Priority
+                <input ng-model="condition3" type="text" />
+            </li>
             <button class="btn btn-primary" ng-click="amc.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;">Start Time</div>
-                <div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly
-                                                                ng-click="open1()" uib-datepicker-popup
-                                                                ng-model="condition4" is-open="popup1.opened"
-                                                                datepicker-options ng-required="true"
-                                                                close-text="Close"/></div>
-                <div style="display:block;float:left" uib-timepicker ng-model="condition4" 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" ng-click="open2()"
-                                                                readonly uib-datepicker-popup ng-model="condition5"
-                                                                is-open="popup2.opened" datepicker-options
-                                                                ng-required="true" close-text="Close"/></div>
-                <div style="display:block;float:left" uib-timepicker ng-model="condition5" 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;">Start Time</div>
+                    <div style="float:left;padding-top:33px">
+                        <input type="text" class="form-control" readonly ng-click="open1()" uib-datepicker-popup ng-model="condition4" is-open="popup1.opened"
+                            datepicker-options ng-required="true" close-text="Close" />
+                    </div>
+                    <div style="display:block;float:left" uib-timepicker ng-model="condition4" 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" ng-click="open2()" readonly uib-datepicker-popup ng-model="condition5" is-open="popup2.opened"
+                            datepicker-options ng-required="true" close-text="Close" />
+                    </div>
+                    <div style="display:block;float:left" uib-timepicker ng-model="condition5" 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()">
+            <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">
@@ -75,69 +79,58 @@
                 <h4 class="margin-bottom-15">Query Result</h4>
             </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>
 
-        
+
         <div>
             <table class="table" st-pipe="amc.callServer" st-table="amc.displayed">
                 <thead>
-                <tr>
-                    <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>
+                    <tr>
+                        <th width="5%">Id</th>
+                        <th width="25%">Event Name</th>
+                        <th width="25%">Source 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.eventName}}</td>
-                <!--    <td>{{row.alarmsHeader.sourceId}}</td> -->
-                    <td>{{row.alarmsHeader.sourceName}}</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">Detail</button>
-                    </td>
-                </tr>
+                    <tr ng-repeat="row in amc.displayed track by $index">
+                        <td>{{tableState.pagination.start+$index+1}}</td>
+                        <td>{{row.alarmsHeader.eventName}}</td>
+                        <td>{{row.alarmsHeader.sourceName}}</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">Detail</button>
+                        </td>
+                    </tr>
                 </tbody>
                 <tbody ng-show="amc.isLoading">
-                <tr>
-                    <td colspan="4" class="text-center">
-                        <div class="loading-indicator"></div>
-                    </td>
-                </tr>
+                    <tr>
+                        <td colspan="4" class="text-center">
+                            <div class="loading-indicator"></div>
+                        </td>
+                    </tr>
                 </tbody>
                 <tfoot>
-                <tr>
-					<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>
+                    <tr>
+                        <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>
             </table>
         </div>
     </div>
-
-</div>
-
+</div>
\ No newline at end of file
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/device-topological.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/device-topological.html
new file mode 100644
index 00000000..a7a40967
--- /dev/null
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/device-topological.html
@@ -0,0 +1,20 @@
+<!--
+    Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<div class="templatemo-content-wrapper" ng-controller="devicetopologicalCtrl">
+  <div class="templatemo-content">
+    <canvas width="1080" height="550" id="canvas"></canvas>
+  </div>
+</div>
\ No newline at end of file
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 5b720ba5..44ad2843 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
@@ -14,117 +14,119 @@
     limitations under the License.
 -->
 <style>
-        body {
-            overflow-y:scroll;
-        }
-        text {
-            font: 12px sans-serif;
-        }
-        svg {
-            display: block;
-        }
-        #chart svg {
-            height: 200px;
-            width:  400px;
-            min-width: 100px;
-            min-height: 100px;
-        }
-        tr.z-row-over > td.z-row-inner, tr.z-row-over > .z-cell { background-color: rgb(255, 255, 255); }
-        .nodatadiv {
-            display: table-cell;
-            width: 600px;
-            height:300px;
-            text-align:center;
-            vertical-align: middle;
-        }
-        .nodatainner {
-            padding: 10px;
-        }
-    </style>
-        <!--/.navbar-collapse -->
-        <div class="templatemo-content-wrapper">
-            <div class="templatemo-content">
-                <h1>Performance Chart</h1>
-				   <div class="row" style="min-height: 500px" ng-controller="pertabCtrl">
-                    <div class="col-md-12 col-sm-12">
-                        <div class="row">
-                            <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">
-                                    <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>
-                                </p>
+    body {
+        overflow-y: scroll;
+    }
+
+    text {
+        font: 12px sans-serif;
+    }
+
+    svg {
+        display: block;
+    }
+
+    #chart svg {
+        height: 200px;
+        width: 400px;
+        min-width: 100px;
+        min-height: 100px;
+    }
+
+    tr.z-row-over>td.z-row-inner,
+    tr.z-row-over>.z-cell {
+        background-color: rgb(255, 255, 255);
+    }
+
+    .nodatadiv {
+        display: table-cell;
+        width: 600px;
+        height: 300px;
+        text-align: center;
+        vertical-align: middle;
+    }
+
+    .nodatainner {
+        padding: 10px;
+    }
+</style>
+<div class="templatemo-content-wrapper">
+    <div class="templatemo-content">
+        <h1>Performance Chart</h1>
+        <div class="row" style="min-height: 500px" ng-controller="pertabCtrl">
+            <div class="col-md-12 col-sm-12">
+                <div class="row">
+                    <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">
+                                <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>
+                        </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" 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>
-                                </p>
+                    <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"
+                                    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>
+                        </p>
+                    </div>
+                    <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;">
+                                    <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>
+                                    </select>
+                                </div>
+                            </div>
+                            <div style="float:left;padding-right:30px" ng-show="namesPIsShow">
+                                <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>
+                                    </select>
+                                </div>
                             </div>
-							<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;"><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>
-										</select>
-										</div>
-									</div>
-									<div style="float:left;padding-right:30px" ng-show="namesPIsShow">
-										<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>
-										</select>
-										</div>
-									</div>
-									<!--<div style="float:left;padding-right:30px" ng-show="namesCIsShow" style="float:left">
-										<label style="float:left;width:50px;line-height:30px;">name:</label>
-										<div style="float:left;width:130px;">
-										<select class="form-control" ng-model="nameC" ng-change="nameCChanged()" ng-options="nc for nc in nameCs" >
-											<option value="">-&#45;&#45; chose -&#45;&#45;</option>
-										</select>
-										</div>
-									</div>-->
-									<div style="float:left;padding-right:30px">
+                            <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">
+                                    <select class="form-control" ng-change="showModeIdChanged()" ng-model="showModeId" ng-options="sm for sm in showModeIds">
                                         <option value="">-- auto --</option>
                                     </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" >
-									<!--<div class="panel-heading">Chart
-										<button ng-click="generateCsv('cpu');" class="btn btn-primary" style="float: right;margin-top:-7px;display: none ">CSV</button>
-									</div>-->
-									<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>
-                                </div>
-
+                            <div style="float:left">
+                                <button ng-disabled="goIsShow" style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">submit</button>
                             </div>
-						</div>
+                        </p>
+                    </div>
+                    <div class="col-md-12 col-sm-12">
+                        <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>
+                        </div>
+
                     </div>
-                    <br />
-                    <br />
-                    <br />
-                    <br />
                 </div>
             </div>
-        </div>
\ No newline at end of file
+            <br />
+            <br />
+            <br />
+            <br />
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html
index 6ed800aa..3e1ac230 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html
@@ -15,13 +15,9 @@
 -->
 <div class="templatemo-content" ng-controller="performanceDetailsController">
     <h1>VNF Performance Data Details</h1>
-
-    
-        
-        <button style="position:relative;left:75%;"  ng-click="back()" class="btn btn-primary">back</button>
-    
+    <button style="position:relative;left:75%;" ng-click="back()" class="btn btn-primary">back</button>
     <div>
-		<span>Header Information</span>
+        <span>Header Information</span>
         <table width="80%" border="1" cellspacing="50%" cellpadding="10">
             <tr>
                 <th style="background-color:lightblue;">Event Name</th>
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 5b6747b7..94d52e56 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
@@ -19,26 +19,43 @@
         <div>
             <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>
+                    <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>
+                    <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()">
+                    <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">
@@ -51,66 +68,56 @@
                         </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>
 
-                
+
                 <table class="table" st-pipe="mc.callServer" st-table="mc.displayed">
                     <thead>
-                    <tr>
-                        <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>
+                        <tr>
+                            <th width="10%">Id</th>
+                            <th width="25%">Event Name</th>
+                            <th width="25%">Source 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.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" >Detail</button></td>
-                    </tr>
+                        <tr ng-repeat="row in mc.displayed track by $index">
+                            <td>{{tableState.pagination.start+$index+1}}</td>
+                            <td>{{row.performanceHeader.eventName}}</td>
+                            <td>{{row.performanceHeader.sourceName}}</td>
+                            <td>{{row.performanceHeader.priority}}</td>
+                            <td>{{row.performanceHeader.createTime}}</td>
+                            <td>
+                                <button ng-click="jump(row.performanceHeader.sourceId)" class="btn btn-primary">Detail</button>
+                            </td>
+                        </tr>
                     </tbody>
                     <tbody ng-show="mc.isLoading">
-                    <tr>
-                        <td colspan="4" class="text-center"><div class="loading-indicator"></div>
-                        </td>
-                    </tr>
+                        <tr>
+                            <td colspan="4" class="text-center">
+                                <div class="loading-indicator"></div>
+                            </td>
+                        </tr>
                     </tbody>
                     <tfoot>
-                    <tr>
-						<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>
+                        <tr>
+                            <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>
                 </table>
             </div>
-
         </div>
     </div>
-</div>
-
-
-
-
+</div>
\ No newline at end of file
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/topology.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/topology.html
new file mode 100644
index 00000000..a7f2b0bb
--- /dev/null
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/topology.html
@@ -0,0 +1,33 @@
+<!--
+    Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<style>
+  .content-panel {
+    height: 500px;
+  }
+
+  #tree-container {
+    height: 100%;
+  }
+</style>
+<div class="templatemo-content-wrapper" ng-controller="topologyCtrl">
+  <div class="templatemo-content">
+    <select ng-model="selectedName" ng-change="selectedNameChanged(selectedName)" ng-options="item.ServiceName for item in serviceType"></select>
+    <div class="content-panel">
+      <div id="tree-container">
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file