summaryrefslogtreecommitdiffstats
path: root/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models
diff options
context:
space:
mode:
authorshentao <shentao@chinamobile.com>2017-09-20 18:39:35 +0800
committershentao <shentao@chinamobile.com>2017-09-20 18:39:43 +0800
commit443ce34bafc3e7aa716728a7b8cd0288bf923287 (patch)
treeee1d96de7f24aa3aee913de5c6b687ea4a642657 /usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models
parent290e9b481168cbb753758ffbe95765e77233ebd6 (diff)
Upload alarm display pages
Change-Id: I1dce4ae37288adc57bce21845c6f9469b6defa77 Issue-Id: USECASEUI-33 Signed-off-by: shentao <shentao@chinamobile.com>
Diffstat (limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models')
-rw-r--r--usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html53
-rw-r--r--usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html15
-rw-r--r--usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html117
-rw-r--r--usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html22
4 files changed, 195 insertions, 12 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 b40e8520..9fc1e38c 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
@@ -1,12 +1,30 @@
+<!--
+ 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" 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 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>-->
+
+ <div class="row margin-bottom-20">
+
</div>
<div class="row margin-bottom-10">
- <div class="col-md-6">
+ <div class="col-md-5">
<ul class="nav nav-pills">
<li ng-repeat="s in status"
ng-click="selectStatus(s.id)"
@@ -19,6 +37,25 @@
<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)}" >
+ <a href="">
+ {{o.name}}
+ <span class="badge">{{o.count}}</span>
+ </a>
+ </li>
+ <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>
@@ -43,14 +80,12 @@
<div class="col-md-4">
<h4 class="margin-bottom-15">Another Table of Existing Users</h4>
</div>
- <div class="col-md-7">
- </div>
- <div class="col-md-1">
- <button ng-click="trashcan()" class="glyphicon glyphicon-trash btn btn-primary"></button>
+ <div class="col-md-5">
</div>
+
</div>
<div>
- <div ui-grid="gridOptions" style="width: 100%; height: 500px; text-align: center;" ui-grid-edit
+ <div ui-grid="gridOptions" style="width: 100%; min-height: 320px; text-align: center;" ui-grid-edit
ui-grid-pagination
ui-grid-selection ui-grid-resize-columns ui-grid-auto-resize>
</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 a67d8456..390b2015 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
@@ -1,3 +1,18 @@
+<!--
+ 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 ng-controller="cmCtrl">
<div id="main-wrapper">
<div id="navbar" role="navigation">
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 a5ecfd06..6dc12726 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
@@ -1,3 +1,18 @@
+<!--
+ 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>
body {
overflow-y:scroll;
@@ -35,7 +50,8 @@
<div class="row" style="min-height: 500px" ng-controller="pertabCtrl">
<div class="col-md-12 col-sm-12" ng-controller="pertabCtrl">
<uib-tabset active="active" >
- <uib-tab index="$index + 1" ng-repeat="tab in tabes" heading="{{tab.title}}" disable="tab.disabled">
+ <!--<uib-tab index="$index + 1" ng-repeat="tab in tabes" heading="{{tab.title}}" disable="tab.disabled">-->
+ <uib-tab heading="one hour">
<div class="templatemo-charts">
<div class="row">
<div class="col-md-5 col-sm-6">
@@ -67,13 +83,110 @@
</div>
</div>
</uib-tab>
+ <uib-tab heading="one day">
+ <div class="templatemo-charts">
+ <div class="row">
+ <div class="col-md-5 col-sm-6">
+ <div class="panel panel-success">
+ <div class="panel-heading">CPU</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="panel panel-success">
+ <div class="panel-heading">Memory</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="panel panel-success">
+ <div class="panel-heading">Disk</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 align="center"><H3></H3></div><div id="Networkchart1"> <svg></svg> </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </uib-tab>
+ <uib-tab heading="one month">
+ <div class="templatemo-charts">
+ <div class="row">
+ <div class="col-md-5 col-sm-6">
+ <div class="panel panel-success">
+ <div class="panel-heading">CPU</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="panel panel-success">
+ <div class="panel-heading">Memory</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="panel panel-success">
+ <div class="panel-heading">Disk</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 align="center"><H3></H3></div><div id="Networkchart2"> <svg></svg> </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </uib-tab>
+ <uib-tab heading="one year">
+ <div class="templatemo-charts">
+ <div class="row">
+ <div class="col-md-5 col-sm-6">
+ <div class="panel panel-success">
+ <div class="panel-heading">CPU</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="panel panel-success">
+ <div class="panel-heading">Memory</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="panel panel-success">
+ <div class="panel-heading">Disk</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 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
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 f2ae7b44..43e27022 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
@@ -1,3 +1,18 @@
+<!--
+ 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">
<div class="templatemo-content">
<h1>Performance</h1>
@@ -7,6 +22,11 @@
<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">
@@ -29,7 +49,7 @@
<div class="col-md-5" style="border-top:1px dotted #ddd">
</div>
</div>
- <div ui-grid="gridOptions" style="width: 100%;margin-top:10px; height: 500px; text-align: center;" ui-grid-edit ui-grid-pagination
+ <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>