From 59569559a1d90d7a4340e5474346353fb823a0c1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 15 十一月 2024 17:01:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/utils/dict.ts |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index a9b5c62..9347dfc 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -162,6 +162,8 @@
   MODEL_TYPE = 'model_type',
   MODEL_METHOD_SETTING_TYPE = 'model_method_setting_type',
   MODEL_METHOD_SETTING_VALUE_TYPE = 'model_method_setting_value_type',
+  PRED_GRANULARITY = 'pred_granularity',
+  ITEM_RUN_STATUS = 'item_run_status',
 
   // ========== DATA - 数据平台模块  ==========
   DATA_FIELD_TYPE = 'data_field_type',
@@ -179,7 +181,9 @@
   COM_IS_INT = 'com_is_int',
   DATA_POINT_TYPE = 'data_point_type',
   MINFREQID = 'minfreqid',
-  VALUETYPE = 'value_type',
+  MEASURE_VALUE_TYPE = 'measure_value_type',
   NVR_ONLINE_STATUS = 'nvr_online_status',
   CAMERA_BRAND = 'camera_brand',
+  CAPTURE_TYPE = 'capture_type',
+  MODEL_RESULT_TYPE = 'model_result_type',
 }

--
Gitblit v1.9.3