Browse Source

fix bug

pull/14/head
PhamY0601 1 year ago
parent
commit
b534d8892d
4 changed files with 6 additions and 22 deletions
  1. +5
    -18
      src/app/modules/homepage/homepage/home-page.component.html
  2. +0
    -1
      src/app/modules/homepage/security-system-details/security-system-details.component.html
  3. +0
    -1
      src/app/modules/homepage/security-system-details/security-system-details.component.scss
  4. +1
    -2
      src/app/modules/homepage/security-system-details/security-system-details.component.ts

+ 5
- 18
src/app/modules/homepage/homepage/home-page.component.html View File

@@ -10,7 +10,7 @@

<mat-card class="sound-group">
<mat-card-header>
<mat-card-title>WHISTLE TIME</mat-card-title>
<mat-card-title>WHISTLE TIME: {{whistle.time}}s</mat-card-title>
</mat-card-header>
<mat-card-content>
<div class="volume-group">
@@ -20,35 +20,22 @@
(valueChange)="whistle.time = $event"
></app-slider-range>
</div>
<div class="volume-group">
<app-slider-range
[value]="alarm.sound"
[(ngModel)]="alarm.sound"
(valueChange)="alarm.sound = $event"
[icon]="alarm.sound == 0 ? 'volume_off' : 'volume_up'"
></app-slider-range>
</div>
</mat-card-content>
</mat-card>


<mat-card class="sound-group">
<mat-card-header>
<mat-card-title>24-HOUR ZONE ALARM TIME</mat-card-title>
<mat-card-title>24-HOUR ZONE ALARM TIME: {{alarm.time}}s</mat-card-title>
</mat-card-header>
<mat-card-content>
<div class="volume-group">
<app-slider-range
[value]="whistle.time"
[value]="alarm.time"
[icon]="'access_alarm'"
(valueChange)="alarm.time = $event"
></app-slider-range>
</div>
<div class="volume-group">
<app-slider-range
[value]="whistle.sound"
[(ngModel)]="whistle.sound"
[icon]="whistle.sound == 0 ? 'volume_off' : 'volume_up'"
></app-slider-range>
</div>

</mat-card-content>
</mat-card>

+ 0
- 1
src/app/modules/homepage/security-system-details/security-system-details.component.html View File

@@ -51,6 +51,5 @@
</div>
<div fxFlex="30" fxLayout="column" fxLayoutGap="50px">
<button [disabled]="!isConnected" mat-flat-button color="{{switchArm ? 'accent' : 'primary'}}" (click)="toggleState1()">{{ switchArm ? 'DISARM' : 'ARM'}}</button>

</div>
</div>

+ 0
- 1
src/app/modules/homepage/security-system-details/security-system-details.component.scss View File

@@ -214,7 +214,6 @@ p {
bottom: 100%;
left: -50%;
}

.tooltip:hover .tooltiptext {
visibility: visible;
cursor: pointer;

+ 1
- 2
src/app/modules/homepage/security-system-details/security-system-details.component.ts View File

@@ -27,8 +27,7 @@ export class SecuritySystemDetailsComponent implements OnInit, OnDestroy {
constructor(
private socketService$: SocketService,
private toastr: ToastrService
) {
}
) {}

ngOnInit() {
// this.socketService$.connect();

Loading…
Cancel
Save