Repository: incubator-griffin Updated Branches: refs/heads/master ecfbcefca -> 67ecfc4bc
Change how the charts are dispalyed on my dashboard view 1.fix health display bug 2.Change how the charts are dispalyed on my dashboard view 3.Delete the unnecessary picture Author: dodobel <[email protected]> Closes #269 from dodobel/button. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/67ecfc4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/67ecfc4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/67ecfc4b Branch: refs/heads/master Commit: 67ecfc4bc618e953fce3b2b3b558ff0167f4255b Parents: ecfbcef Author: dodobel <[email protected]> Authored: Thu Apr 26 15:02:03 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu Apr 26 15:02:03 2018 +0800 ---------------------------------------------------------------------- ui/angular/src/app/health/health.component.ts | 2 +- ui/angular/src/app/metric/metric.component.html | 15 ++++++++------- ui/angular/src/assets/img/1.PNG | Bin 13855 -> 0 bytes ui/angular/src/assets/img/2.PNG | Bin 8562 -> 0 bytes ui/angular/src/assets/img/b3vHigh.jpg | Bin 555201 -> 0 bytes ui/angular/src/assets/img/bollinger.png | Bin 145323 -> 0 bytes ui/angular/src/assets/img/construction.gif | Bin 4853 -> 0 bytes ui/angular/src/assets/img/mad.png | Bin 47922 -> 0 bytes ui/angular/src/assets/img/sidebar1.png | Bin 1536 -> 0 bytes ui/angular/src/assets/img/sidebar2.png | Bin 1617 -> 0 bytes ui/angular/src/assets/img/yoy.png | Bin 28400 -> 0 bytes 11 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/app/health/health.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/health/health.component.ts b/ui/angular/src/app/health/health.component.ts index cd62ccc..a2c99b4 100644 --- a/ui/angular/src/app/health/health.component.ts +++ b/ui/angular/src/app/health/health.component.ts @@ -195,7 +195,7 @@ export class HealthComponent implements OnInit { metricNode.details = JSON.parse( JSON.stringify(jobs[i].metricValues) ); - metricNode.name = mesName; //jobs[i].name;// to avoid same metricName + metricNode.name = jobs[i].name; metricNode.timestamp = jobs[i].metricValues[0].tmst; metricNode.dq = jobs[i].metricValues[0].value.matched / http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/app/metric/metric.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/metric/metric.component.html b/ui/angular/src/app/metric/metric.component.html index 52023ca..01e0080 100644 --- a/ui/angular/src/app/metric/metric.component.html +++ b/ui/angular/src/app/metric/metric.component.html @@ -29,20 +29,21 @@ under the License. </span> </div> </div> - <div class="col-sm-5 chartItem" *ngFor="let outerItems of finalData;let parent=index" style="margin-bottom:30px;margin-right:15px;"> - <div class="row"> + <!-- <div class="col-sm-5 chartItem" *ngFor="let outerItems of finalData;let parent=index" style="margin-bottom:30px;margin-right:15px;"> --> + <div *ngFor="let outerItems of finalData;let parent=index"> + <!-- <div class="row"> <div style="text-align: center;" > <h4>{{outerItems.name}}</h4> </div> - </div> - <div class="row"> - <!-- <div class="col-sm-6 col-md-4 col-xs-12 col-lg-3 chartItem" *ngFor="let items of outerItems.metrics;let i=index;" style="margin-bottom:30px;"> --> - <div *ngFor="let items of outerItems.metrics;let i=index;"> + </div> --> + <!-- <div class="row"> --> + <div class="col-sm-6 col-md-4 col-xs-12 col-lg-3 chartItem" *ngFor="let items of outerItems.metrics;let i=index;" style="margin-bottom:30px;"> + <!-- <div *ngFor="let items of outerItems.metrics;let i=index;"> --> <div class="row-fluid" style="cursor: pointer;"> <div id="thumbnail{{parent}}-{{i}}" class="thumb-chart" style="border: 2px solid;" echarts [options]="getOption(parent,i)" (click)="goTo(parent,i)"></div> </div> </div> - </div> + <!-- </div> --> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/1.PNG ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/1.PNG b/ui/angular/src/assets/img/1.PNG deleted file mode 100644 index e9a3063..0000000 Binary files a/ui/angular/src/assets/img/1.PNG and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/2.PNG ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/2.PNG b/ui/angular/src/assets/img/2.PNG deleted file mode 100644 index af12dc4..0000000 Binary files a/ui/angular/src/assets/img/2.PNG and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/b3vHigh.jpg ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/b3vHigh.jpg b/ui/angular/src/assets/img/b3vHigh.jpg deleted file mode 100644 index 0d6949d..0000000 Binary files a/ui/angular/src/assets/img/b3vHigh.jpg and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/bollinger.png ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/bollinger.png b/ui/angular/src/assets/img/bollinger.png deleted file mode 100644 index efb1f49..0000000 Binary files a/ui/angular/src/assets/img/bollinger.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/construction.gif ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/construction.gif b/ui/angular/src/assets/img/construction.gif deleted file mode 100644 index 7d03450..0000000 Binary files a/ui/angular/src/assets/img/construction.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/mad.png ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/mad.png b/ui/angular/src/assets/img/mad.png deleted file mode 100644 index aa85a76..0000000 Binary files a/ui/angular/src/assets/img/mad.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/sidebar1.png ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/sidebar1.png b/ui/angular/src/assets/img/sidebar1.png deleted file mode 100644 index 6a64412..0000000 Binary files a/ui/angular/src/assets/img/sidebar1.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/sidebar2.png ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/sidebar2.png b/ui/angular/src/assets/img/sidebar2.png deleted file mode 100644 index 425b863..0000000 Binary files a/ui/angular/src/assets/img/sidebar2.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/67ecfc4b/ui/angular/src/assets/img/yoy.png ---------------------------------------------------------------------- diff --git a/ui/angular/src/assets/img/yoy.png b/ui/angular/src/assets/img/yoy.png deleted file mode 100644 index 2f071ac..0000000 Binary files a/ui/angular/src/assets/img/yoy.png and /dev/null differ
