Fix Monitor bug

Change-Id: I7608578aa57feee97e0265b71ca97e285e2f89e0
Issue-Id: USECASEUI-50
Signed-off-by: shentao <shentao@chinamobile.com>

4 files changed, 134 insertions, 136 deletions

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 9fc1e38c..dc18c380 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
@@ -14,84 +14,71 @@
     limitations under the License.
 -->
 <div class="templatemo-content" ng-controller="alarmGridCtrl">
-    <h1>Alarm</h1>	  
- <!--<div class="btn-group" style="margin-top:10px;margin-bottom:10px;">-->
-        <!--<label class="btn btn-primary" ng-model="radioModel" uib-btn-radio="'open'" uncheckable>OPEN</label>-->
-        <!--<label class="btn btn-primary" ng-model="radioModel" uib-btn-radio="'close'" uncheckable>CLOSE</label>-->
-    <!--</div>-->
-
+    <h1>Alarm</h1>
     <div class="row margin-bottom-20">
-
     </div>
     <div class="row margin-bottom-10">
-        <div class="col-md-5">
+        <div class="col-md-8">
             <ul class="nav nav-pills">
-                <li ng-repeat="s in status"
+                <li style="background-color: #ddd"
+                    ng-repeat="s in status"
                     ng-click="selectStatus(s.id)"
-                    ng-class="{active:activeStatus(s.id)}" >
+                    ng-class="{active:activeStatus(s.id)}">
                     <a href="">
                         {{s.name}}
                         <span class="badge">{{s.count}}</span>
                     </a>
                 </li>
-                <input type="hidden" ng-model="selectedStatus" />
+                <input type="hidden" ng-model="selectedStatus"/>
             </ul>
         </div>
-
         <div class="col-md-4">
             <ul class="nav nav-pills">
-                <li ng-repeat="o in open"
-                    ng-click="selectOpen(s.id)"
-                    ng-class="{active:activeOpen(o.id)}" >
+                <li style="background-color: #ddd" ng-repeat="O in open"
+                    ng-click="selectOpen(O.id)"
+                    ng-class="{active:activeOpen(O.id)}">
                     <a href="">
-                        {{o.name}}
-                        <span class="badge">{{o.count}}</span>
+                        {{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 class="col-md-3">
-            <button ng-click="trashcan()" class="glyphicon glyphicon-trash btn btn-primary"></button>
-            <button ng-click="" class=" btn btn-primary">remove</button>
-            <button ng-click="" class="btn btn-primary">CSV</button>
-        </div>
     </div>
-	<ul id="list">
-  <li>cpu <input type="text" /></li>
-  <li>state <input type="text" /></li>
-  <li>memory<input type="text" /></li>
-  <button>search</button>
-</ul>
-<ul id="list" ng-show='menuState.show'>
-  <li>disk <input type="text"/></li>
-   <li>Network <input type="text"/></li>
-</ul>
- <div class="row">
-        <div class="col-md-5" style="border-top:1px dotted #ddd">       
+    <ul class="list">
+        <li>cpu <input ng-model="condition1" type="text"/></li>
+        <li>state <input ng-model="condition2" type="text"/></li>
+        <li>memory <input ng-model="condition3" type="text"/></li>
+        <button ng-click="alarmSearch()">search</button>
+    </ul>
+    <ul class="list" ng-show='menuState.show'>
+        <li>disk <input ng-model="condition4" type="text"/></li>
+        <li>Network <input ng-model="condition5" type="text"/></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>
+            <span class="caret"></span>
         </div>
-        <div class="col-md-5" style="border-top:1px dotted #ddd">       
+        <div class="col-md-5" style="border-top:1px dotted #ddd" >
         </div>
     </div>
     <div class="row">
-        <div class="col-md-4">
+        <div class="col-md-11">
             <h4 class="margin-bottom-15">Another Table of Existing Users</h4>
         </div>
-        <div class="col-md-5">
-        </div>
+        <div class="col-md-1">
 
+            <button ng-click="generateCsv()" class="btn btn-primary">CSV</button>
+        </div>
     </div>
     <div>
-        <div ui-grid="gridOptions" style="width: 100%; min-height: 320px; text-align: center;" ui-grid-edit
+        <div ui-grid="gridOptions" style="width: 100%;text-align: center;" ui-grid-edit
              ui-grid-pagination
              ui-grid-selection ui-grid-resize-columns ui-grid-auto-resize>
         </div>
-
-
     </div>
-	
 </div>
 
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html
index 390b2015..cba16b59 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html
@@ -13,7 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<div ng-controller="cmCtrl">
+<div id="lm" ng-controller="cmCtrl">
     <div id="main-wrapper">
         <div id="navbar" role="navigation">
             <div class="navbar-header">
@@ -39,6 +39,6 @@
             </div>
         </div>
     </div>
-
+    <input type="hidden"  ng-model="currentTab" />
     <div ng-include="currentTab"></div>
 </div>
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 6dc12726..70112e0a 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
@@ -41,138 +41,152 @@
             padding: 10px;
         }
     </style>
-
         <!--/.navbar-collapse -->
-
         <div class="templatemo-content-wrapper">
             <div class="templatemo-content">
                 <h1>Performance Details</h1>
 				   <div class="row" style="min-height: 500px" ng-controller="pertabCtrl">
-                    <div class="col-md-12 col-sm-12" ng-controller="pertabCtrl">
+                    <div class="col-md-12 col-sm-12">
                         <uib-tabset active="active" >
-                            <!--<uib-tab index="$index + 1" ng-repeat="tab in tabes" heading="{{tab.title}}" disable="tab.disabled">-->
-                                <uib-tab heading="one hour">
+                                <uib-tab heading="one hour" ng-click="oneHour()" >
                                 <div class="templatemo-charts">
-                                    <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                    <div class="row" style="margin-top: 10px">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">CPU</div>
+                                                <div class="panel-heading">CPU
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button>
+                                                </div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Memory</div>
+                                                <div class="panel-heading">Memory
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart"> <svg></svg> </div>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Disk</div>
+                                                <div class="panel-heading">Disk
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
-                                            <div class="panel panel-primary">
-                                                <div class="panel-heading">Network</div>
+                                        <div class="col-md-6 col-sm-12">
+                                            <div class="panel panel-success">
+                                                <div class="panel-heading">Network
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart"> <svg></svg> </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </uib-tab>
-                            <uib-tab heading="one day">
+                            <uib-tab heading="one day" ng-click="oneDay()">
                                 <div class="templatemo-charts">
-                                    <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                    <div class="row" style="margin-top: 10px">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">CPU</div>
+                                                <div class="panel-heading">CPU
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart1"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Memory</div>
+                                                <div class="panel-heading">Memory
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart1"> <svg></svg> </div>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Disk</div>
+                                                <div class="panel-heading">Disk
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart1"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
-                                            <div class="panel panel-primary">
-                                                <div class="panel-heading">Network</div>
+                                        <div class="col-md-6 col-sm-12">
+                                            <div class="panel panel-success">
+                                                <div class="panel-heading">Network
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart1"> <svg></svg> </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </uib-tab>
-                            <uib-tab heading="one month">
+                            <uib-tab heading="one month" ng-click="oneMonth()">
                                 <div class="templatemo-charts">
-                                    <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                    <div class="row" style="margin-top: 10px">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">CPU</div>
+                                                <div class="panel-heading">CPU
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart2"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Memory</div>
+                                                <div class="panel-heading">Memory
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart2"> <svg></svg> </div>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Disk</div>
+                                                <div class="panel-heading">Disk
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart2"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
-                                            <div class="panel panel-primary">
-                                                <div class="panel-heading">Network</div>
+                                        <div class="col-md-6 col-sm-12">
+                                            <div class="panel panel-success">
+                                                <div class="panel-heading">Network
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart2"> <svg></svg> </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </uib-tab>
-                            <uib-tab heading="one year">
+                            <uib-tab heading="one year" ng-click="oneYear()">
                                 <div class="templatemo-charts">
-                                    <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                    <div class="row" style="margin-top: 10px">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">CPU</div>
+                                                <div class="panel-heading">CPU
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart3"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Memory</div>
+                                                <div class="panel-heading">Memory
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart3"> <svg></svg> </div>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-md-5 col-sm-6">
+                                        <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
-                                                <div class="panel-heading">Disk</div>
+                                                <div class="panel-heading">Disk
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart3"> <svg></svg> </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-5 col-sm-6">
-                                            <div class="panel panel-primary">
-                                                <div class="panel-heading">Network</div>
+                                        <div class="col-md-6 col-sm-12">
+                                            <div class="panel panel-success">
+                                                <div class="panel-heading">Network
+                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart3"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -180,13 +194,11 @@
                                 </div>
                             </uib-tab>
                         </uib-tabset>
-
                     </div>
                     <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.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html
index 43e27022..426836c6 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
@@ -13,48 +13,47 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<div class="templatemo-content-wrapper">
-     <div class="templatemo-content">
-         <h1>Performance</h1>
-         <div class="row">
-             <div class="col-md-9" >
-                 <div class="table-responsive">
-                     <h4 class="margin-bottom-15">Another Table of Existing Users</h4>
-                 </div>
-             </div>
-             <div class="col-md-3">
-                 <button ng-click="trashcan()" class="glyphicon glyphicon-trash btn btn-primary"></button>
-                 <button ng-click="" class=" btn btn-primary">remove</button>
-                 <button ng-click="" class="btn btn-primary">CSV</button>
-             </div>
-         </div>
-		
-         <div ng-controller="perGridCtrl">
-		 <ul id="list">
-  <li>cpu <input type="text" /></li>
-  <li>state <input type="text" /></li>
-  <li>memory<input type="text" /></li>
-  <button>search</button>
-</ul>
-<ul id="list" ng-show='menuState.show'>
-  <li>disk <input type="text"/></li>
-   <li>Network <input type="text"/></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 class="templatemo-content-wrapper" ng-controller="perGridCtrl">
+    <div class="templatemo-content">
+        <h1>Performance</h1>
+        <div>
+            <ul class="list">
+                <li>cpu <input type="text" ng-model="seek1"/></li>
+                <li>state <input type="text" ng-model="seek2"/></li>
+                <li>memory <input type="text" ng-model="seek3"/></li>
+                <button ng-click="getSearch()">search</button>
+            </ul>
+            <ul class="list" ng-show='menuState.show'>
+                <li>disk <input type="text" ng-model="seek4"/></li>
+                <li>Network <input type="text" ng-model="seek5"/></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">Another Table of Existing Users</h4>
+                    </div>
+                </div>
+                <div class="col-md-1">
+                    <button ng-click="generateCsv()" class="btn btn-primary">CSV</button>
+                </div>
+            </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  ui-grid="gridOptions" style="width: 100%;margin-top:10px; min-height: 350px; text-align: center;" ui-grid-edit ui-grid-pagination
-                   ui-grid-selection  ui-grid-resize-columns ui-grid-auto-resize>
-             </div>
-         </div>
-     </div>
- </div>
+</div>