Commit 88d3a7ba84b277d19f04d51990ab1ac6cdd6c45b
1 parent
4304f1a9
Exists in
master
เหลือจัด layout
Showing
2 changed files
with
4 additions
and
2 deletions
Show diff stats
src/app/dashboard/dashboard.component.html
| @@ -936,7 +936,7 @@ | @@ -936,7 +936,7 @@ | ||
| 936 | <br> | 936 | <br> |
| 937 | <br> | 937 | <br> |
| 938 | <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);" | 938 | <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);" |
| 939 | - style="margin-left: 5px; margin-top: 2px;"><span class="badge2" style="margin-top: 20px;"> {{ name.num }} </span> {{ name.name }} | 939 | + style="margin-left: 5px; margin-top: 2px;"><span class="badge2" style="float: right; position: absolute; margin-top: -15px; margin-left: 23px;"> {{ name.num }} </span> {{ name.name }} |
| 940 | </button> | 940 | </button> |
| 941 | <!-- <span class="badge"> {{resultNum7}} </span> --> | 941 | <!-- <span class="badge"> {{resultNum7}} </span> --> |
| 942 | <hr> | 942 | <hr> |
src/app/dashboard/dashboard.component.ts
| @@ -98,7 +98,7 @@ export class DashboardComponent implements OnInit { | @@ -98,7 +98,7 @@ export class DashboardComponent implements OnInit { | ||
| 98 | id: 33, | 98 | id: 33, |
| 99 | name: 'All', | 99 | name: 'All', |
| 100 | valueN: '', | 100 | valueN: '', |
| 101 | - num : '' | 101 | + num : 0 |
| 102 | }, | 102 | }, |
| 103 | { | 103 | { |
| 104 | id: 1, | 104 | id: 1, |
| @@ -870,8 +870,10 @@ setInterval(async () => { | @@ -870,8 +870,10 @@ setInterval(async () => { | ||
| 870 | for(var o=0;o<this.sum.length;o++){ | 870 | for(var o=0;o<this.sum.length;o++){ |
| 871 | if (this.ButtonValue[k].valueN === this.sum[o].name) { | 871 | if (this.ButtonValue[k].valueN === this.sum[o].name) { |
| 872 | this.ButtonValue[k].num = this.sum[o].value; | 872 | this.ButtonValue[k].num = this.sum[o].value; |
| 873 | + this.ButtonValue[0].num = this.resultNum9; | ||
| 873 | } | 874 | } |
| 874 | } | 875 | } |
| 876 | + | ||
| 875 | } | 877 | } |
| 876 | 878 | ||
| 877 | console.log('summ',this.ButtonValue); | 879 | console.log('summ',this.ButtonValue); |