[完善]完善

src/app/system-management/condition-monitoring/condition-monitoring.component.html

@@ -19,6 +19,16 @@
         </nz-form-control>
       </nz-form-item>
 
+      <nz-form-item>
+        <!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="state">设备状态</nz-form-label> -->
+        <nz-form-control>
+          <nz-select formControlName="state" nzPlaceHolder="请选择设备状态">
+            <nz-option [nzValue]="0" nzLabel="未连接"></nz-option>
+            <nz-option [nzValue]="1" nzLabel="已连接"></nz-option>
+          </nz-select>
+        </nz-form-control>
+      </nz-form-item>
+
 
       <nz-form-item class="btn">
         <nz-form-control>
@@ -134,6 +144,6 @@
     <nz-pagination [nzHideOnSinglePage]="false" [nzPageIndex]="1" [nzTotal]="num" [nzPageSize]="10"
       [nzShowTotal]="totalTemplate" nzShowQuickJumper (nzPageIndexChange)="pageChange($event)">
     </nz-pagination>
-    <ng-template #totalTemplate let-total> 16条/页,共{{num}}条 </ng-template>
+    <ng-template #totalTemplate let-total> 10条/页,共{{num}}条 </ng-template>
   </div>
 </div>

src/app/system-management/condition-monitoring/condition-monitoring.component.ts

@@ -16,7 +16,8 @@ export class ConditionMonitoringComponent implements OnInit {
   validateForm!: FormGroup;
   ngOnInit(): void {
     this.validateForm = this.fb.group({
-      organization: [null]
+      organization: [null],
+      state: [null]
     });
     this.getAllOrganization()
 
@@ -76,7 +77,8 @@ export class ConditionMonitoringComponent implements OnInit {
       ContainsChildren: true,
       OrganizationId: this.defaultOrId,
       PageNumber: this.PageNumber,
-      PageSize: 10
+      PageSize: 10,
+      HubConnectionState:this.validateForm.value.state
     }
     this.isLoading = true
     this.http.get('/api/EdgeDevices/Statuses', { params: params }).subscribe(

src/app/system-management/condition-monitoring/model/model.component.html

@@ -3,14 +3,14 @@
         <nz-form-item>
             <nz-form-control>
                 <nz-select nzMode="multiple" formControlName="type" nzPlaceHolder="请选择类型">
-                    <nz-option [nzValue]="'Peoplenet'" nzLabel="Peoplenet"></nz-option>
-                    <nz-option [nzValue]="'Trafficcam'" nzLabel="Trafficcam"></nz-option>
-                    <nz-option [nzValue]="'Actionnet'" nzLabel="Actionnet"></nz-option>
-                    <nz-option [nzValue]="'Idnet'" nzLabel="Idnet"></nz-option>
-                    <nz-option [nzValue]="'Oilnet'" nzLabel="Oilnet"></nz-option>
-                    <nz-option [nzValue]="'Smoking_calling_net'" nzLabel="Smoking_calling_net"></nz-option>
-                    <nz-option [nzValue]="'Connet'" nzLabel="Connet"></nz-option>
-                    <nz-option [nzValue]="'Fire_smoke_net'" nzLabel="Fire_smoke_net"></nz-option>
+                    <nz-option [nzValue]="'peoplenet'" nzLabel="peoplenet"></nz-option>
+                    <nz-option [nzValue]="'trafficcam'" nzLabel="trafficcam"></nz-option>
+                    <nz-option [nzValue]="'actionnet'" nzLabel="actionnet"></nz-option>
+                    <nz-option [nzValue]="'idnet'" nzLabel="idnet"></nz-option>
+                    <nz-option [nzValue]="'oilnet'" nzLabel="oilnet"></nz-option>
+                    <nz-option [nzValue]="'smoking_calling_net'" nzLabel="smoking_calling_net"></nz-option>
+                    <nz-option [nzValue]="'connet'" nzLabel="connet"></nz-option>
+                    <nz-option [nzValue]="'fire_smoke_net'" nzLabel="fire_smoke_net"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>