From 7ccb238420f77552219a6dd3c9255a3103714e22 Mon Sep 17 00:00:00 2001
From: shentao <shentao@chinamobile.com>
Date: Mon, 13 Nov 2017 10:56:31 +0800
Subject: Fix monitor display bug

Change-Id: I831bb8ec2197b1aa1acf99072edfa8c02cd22085
Issue-Id: USECASEUI-54
Signed-off-by: shentao <shentao@chinamobile.com>
---
 .../scripts/view-models/performance-details.html   | 248 +++++----------------
 1 file changed, 59 insertions(+), 189 deletions(-)

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

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 054b5f5f..61c2bc57 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
@@ -13,192 +13,62 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<style>
-        body {
-            overflow-y:scroll;
-        }
-        text {
-            font: 12px sans-serif;
-        }
-        svg {
-            display: block;
-        }
-        #CPUchart,#Memorychart,#Diskchart,#Networkchart 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 Details</h1>
-				   <div class="row" style="min-height: 500px" ng-controller="pertabCtrl">
-                    <div class="col-md-12 col-sm-12">
-                        <uib-tabset active="active" >
-                                <uib-tab heading="one hour" ng-click="oneHour()" >
-                                <div class="templatemo-charts">
-                                    <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
-                                                    <button ng-click="generateCsv('cpu');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Memory
-                                                    <button ng-click="generateCsv('memory');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Disk
-                                                    <button ng-click="generateCsv('disk');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Network
-                                                    <button ng-click="generateCsv('network');" 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" ng-click="oneDay()">
-                                <div class="templatemo-charts">
-                                    <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
-                                                    <button ng-click="generateCsv('cpu');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Memory
-                                                    <button ng-click="generateCsv('memory');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Disk
-                                                    <button ng-click="generateCsv('disk');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Network
-                                                    <button ng-click="generateCsv('network');" 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" ng-click="oneMonth()">
-                                <div class="templatemo-charts">
-                                    <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
-                                                    <button ng-click="generateCsv('cpu');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Memory
-                                                    <button ng-click="generateCsv('memory');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Disk
-                                                    <button ng-click="generateCsv('disk');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Network
-                                                    <button ng-click="generateCsv('network');" 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" ng-click="oneYear()">
-                                <div class="templatemo-charts">
-                                    <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
-                                                    <button ng-click="generateCsv('cpu');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Memory
-                                                    <button ng-click="generateCsv('memory');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Disk
-                                                    <button ng-click="generateCsv('disk');" 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-6 col-sm-12">
-                                            <div class="panel panel-success">
-                                                <div class="panel-heading">Network
-                                                    <button ng-click="generateCsv('network');" 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>
-                                    </div>
-                                </div>
-                            </uib-tab>
-                        </uib-tabset>
-                    </div>
-                    <br />
-                    <br />
-                    <br />
-                    <br />
-                </div>
-            </div>
-        </div>
\ No newline at end of file
+<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>
+    
+    <div>
+		<span>Header Information</span>
+        <table width="80%" border="1" cellspacing="50%" cellpadding="10">
+            <tr>
+                <th style="background-color:lightblue;">Event Name</th>
+                <td>{{eventName}}</td>
+                <th style="background-color:lightblue;">Event Id</th>
+                <td>{{eventId}}</td>
+            </tr>
+            <tr>
+                <th style="background-color:lightblue;">Source Id</th>
+                <td>{{sourceId}}</td>
+                <th style="background-color:lightblue;">Source Name</th>
+                <td>{{sourceName}}</td>
+            </tr>
+            <tr>
+                <th style="background-color:lightblue;">Reporting Entity Id</th>
+                <td>{{reportingEntityId}}</td>
+                <th style="background-color:lightblue;">Reporting Entity Name</th>
+                <td>{{reportingEntityName}}</td>
+            </tr>
+            <tr>
+                <th style="background-color:lightblue;">Priority</th>
+                <td>{{priority}}</td>
+                <th style="background-color:lightblue;">Start Time</th>
+                <td>{{createTime}}</td>
+            </tr>
+            <tr>
+                <th style="background-color:lightblue;">NFC Naming Code</th>
+                <td>{{nfcNamingCode}}</td>
+                <th style="background-color:lightblue;">NF Naming Code</th>
+                <td>{{nfNamingCode}}</td>
+            </tr>
+        </table>
+    </div>
+    <div style="padding-top:10px;">
+        <span>
+            Additional Information
+        </span>
+        <table width="80%" border="1" cellspacing="50%" cellpadding="10">
+            <tr>
+                <th style="background-color:lightblue;">Item Name</th>
+                <th style="background-color:lightblue;">Item Value</th>
+            </tr>
+            <tbody ng-repeat="info in performanceInformation">
+                <td>{{info.name}}</td>
+                <td>{{info.value}}</td>
+            </tbody>
+        </table>
+    </div>
+
+</div>
\ No newline at end of file
-- 
cgit 1.2.3-korg