diff --git a/src/app/system-management/condition-monitoring/condition-monitoring.component.html b/src/app/system-management/condition-monitoring/condition-monitoring.component.html
index afb5bf1..cd6953a 100644
--- a/src/app/system-management/condition-monitoring/condition-monitoring.component.html
+++ b/src/app/system-management/condition-monitoring/condition-monitoring.component.html
@@ -19,6 +19,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -134,6 +144,6 @@
- 16条/页,共{{num}}条
+ 10条/页,共{{num}}条
\ No newline at end of file
diff --git a/src/app/system-management/condition-monitoring/condition-monitoring.component.ts b/src/app/system-management/condition-monitoring/condition-monitoring.component.ts
index cd722c3..3c7d9fb 100644
--- a/src/app/system-management/condition-monitoring/condition-monitoring.component.ts
+++ b/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(
diff --git a/src/app/system-management/condition-monitoring/model/model.component.html b/src/app/system-management/condition-monitoring/model/model.component.html
index c9d7e09..26b4f8e 100644
--- a/src/app/system-management/condition-monitoring/model/model.component.html
+++ b/src/app/system-management/condition-monitoring/model/model.component.html
@@ -3,14 +3,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+