Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

# Conflicts: # frontend/src/views/machine/device/components/monitorTab.vue
2025-11-04 09:18:40 +08:00
parent a4b016ef0d d329b68592
commit e7c93d03aa
3 changed files with 22 additions and 17 deletions
--- a/frontend/src/api/device/interface/monitor.ts
+++ b/frontend/src/api/device/interface/monitor.ts
@@ -27,6 +27,7 @@ export namespace Monitor {
    statInterval: number; //统计间隔
    harmSysId: string; //默认与谐波系统监测点ID相同
    checkFlag: number;//是否参与检测0否1是
+    resultType:string|null; //检测结果类型
  }

  /**