Merge remote-tracking branch 'origin/master'

# Conflicts: # imt-ui/src/utils/dict.js
报警规则功能更新
2024-08-30 17:38:24 +08:00 · 2024-08-30 17:37:09 +08:00
1 changed files with 4 additions and 0 deletions
--- a/imt-ui/src/utils/dict.js
+++ b/imt-ui/src/utils/dict.js
@ -14,6 +14,10 @@ export const DICT_TYPE = {
  MACHINE_TYPE: "machine_type",
  INDUSTRY_TYPE: "industry_type",
  GATEWAY_STATUS: "gateway_status",
+  MACHINE_TYPE: "machine_type",
+  INDUSTRY_TYPE: "industry_type",
+  EQUIP_STATUS: "equip_status",
+  ALARM_LEVEL: "alarm_level",
  MACHINE_TYPE: 'machine_type',
  INDUSTRY_TYPE: 'industry_type',
  EQUIP_STATUS: 'equip_status',
Author	SHA1	Message	Date
zhangjunwen	4cfb0af603	Merge remote-tracking branch 'origin/master' # Conflicts: # imt-ui/src/utils/dict.js	2024-08-30 17:38:24 +08:00
zhangjunwen	8cfe467967	报警规则功能更新	2024-08-30 17:37:09 +08:00