Merge branch 'ft' into 'main_dev'

perf: DEFECT-1503 优化告警记录里面，告警级别筛选条件和场景联动告警级别条件需一致

See merge request yunteng/thingskit-front!814

@@ -335,7 +335,7 @@ export const childDeviceColumns: BasicColumn[] = [
 
 
 export const alarmLevel = (type: string): string => {
 export const alarmLevel = (type: string): string => {
   if (type === 'CRITICAL') {
   if (type === 'CRITICAL') {
-    return '紧急';
+    return '危险';
   } else if (type === 'MAJOR') {
   } else if (type === 'MAJOR') {
     return '重要';
     return '重要';
   } else if (type === 'MINOR') {
   } else if (type === 'MINOR') {