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 8578673..28e3ecb 100644
--- a/src/app/system-management/condition-monitoring/condition-monitoring.component.ts
+++ b/src/app/system-management/condition-monitoring/condition-monitoring.component.ts
@@ -225,7 +225,7 @@ export class ConditionMonitoringComponent implements OnInit {
nzTitle: '配置文件',
nzContent: FileComponent,
nzViewContainerRef: this.viewContainerRef,
- nzWidth: 388,
+ nzWidth: 500,
nzComponentParams: {},
nzOnOk: async () => {
if (instance.validateForm.valid) {
@@ -233,7 +233,8 @@ export class ConditionMonitoringComponent implements OnInit {
edgeDeviceIds: strArr,
scheme: instance.validateForm.value.scheme,
host: instance.validateForm.value.host,
- port: instance.validateForm.value.port
+ port: instance.validateForm.value.port,
+ maxRetries: instance.validateForm.value.maxRetries
}
await new Promise(resolve => {
this.loading = 'file'
diff --git a/src/app/system-management/condition-monitoring/file/file.component.html b/src/app/system-management/condition-monitoring/file/file.component.html
index 0418d1c..aa5fd97 100644
--- a/src/app/system-management/condition-monitoring/file/file.component.html
+++ b/src/app/system-management/condition-monitoring/file/file.component.html
@@ -1,10 +1,10 @@
diff --git a/src/app/system-management/status-monitoring/status-monitoring.component.ts b/src/app/system-management/status-monitoring/status-monitoring.component.ts
index 5afd2a9..b928843 100644
--- a/src/app/system-management/status-monitoring/status-monitoring.component.ts
+++ b/src/app/system-management/status-monitoring/status-monitoring.component.ts
@@ -4,6 +4,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TreeService } from 'src/app/service/tree.service';
+import { ScriptComponent } from './script/script.component';
@Component({
selector: 'app-status-monitoring',
@@ -168,4 +169,53 @@ export class StatusMonitoringComponent implements OnInit {
}
+
+ executeTheScript() {
+ const requestData = this.listOfData.filter(data => this.setOfCheckedId.has(data.id));
+ let strArr = []
+ requestData.forEach(element => {
+ strArr.push(element.id)
+ });
+ const modal = this.modal.create({
+ nzTitle: '选择执行脚本',
+ nzContent: ScriptComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: 288,
+ nzComponentParams: {},
+ nzOnOk: async () => {
+ if (instance.validateForm.valid) {
+ let body = {
+ edgeDeviceIds: strArr
+ }
+ await new Promise(resolve => {
+ this.http.patch('/api/EdgeDevices/Commands/ExecuteScript', body, { params: { name: instance.validateForm.value.script } }).subscribe({
+ next: (data: any) => {
+ resolve(data)
+ this.message.create('success', '通知边缘盒子成功,请过一段时间手动刷新尝试!');
+ // if (data.failedItems && data.failedItems.length != 0) {
+ // data.failedItems.forEach(element => {
+ // this.message.create('info', element.detail);
+ // });
+ // }
+ this.setOfCheckedId.clear();
+ this.refreshCheckedStatus();
+ this.loading = null;
+ this.getConditionMonitoring()
+ return true
+ },
+ error: (err) => {
+ resolve(err)
+ this.loading = null;
+ return false
+ }
+ })
+ })
+ } else {
+ this.message.create('warning', '请填写完整!');
+ return false
+ }
+ }
+ });
+ const instance = modal.getContentComponent();
+ }
}
diff --git a/src/app/system-management/system-management.module.ts b/src/app/system-management/system-management.module.ts
index aea5713..a09039e 100644
--- a/src/app/system-management/system-management.module.ts
+++ b/src/app/system-management/system-management.module.ts
@@ -42,8 +42,9 @@ import { ModelComponent } from './condition-monitoring/model/model.component';
import { KafkaComponent } from './kafka/kafka.component';
import { StatusMonitoringComponent } from './status-monitoring/status-monitoring.component';
import { FileComponent } from './condition-monitoring/file/file.component';
+import { ScriptComponent } from './status-monitoring/script/script.component';
@NgModule({
- declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, ImageListComponent, ImageLabelComponent, PlottingImageComponent, cameraType, ImageLabel2Component, ConfigFormComponent, ConditionMonitoringComponent, SendFileComponent, ModelComponent, KafkaComponent, StatusMonitoringComponent, FileComponent],
+ declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, ImageListComponent, ImageLabelComponent, PlottingImageComponent, cameraType, ImageLabel2Component, ConfigFormComponent, ConditionMonitoringComponent, SendFileComponent, ModelComponent, KafkaComponent, StatusMonitoringComponent, FileComponent, ScriptComponent],
imports: [
CommonModule,
SystemRoutingModule,
@@ -68,7 +69,7 @@ import { FileComponent } from './condition-monitoring/file/file.component';
NzTabsModule,
NzPopconfirmModule
],
- entryComponents: [AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, SendFileComponent, ModelComponent, FileComponent]
+ entryComponents: [AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, SendFileComponent, ModelComponent, FileComponent,ScriptComponent]
})
export class SystemManagementModule { }