Merge branch 'fix/DEFECT-1829' into 'main_dev'

fix: 看板中告警记录，第一栏状态修改为告警级别，第四栏修改为告警等级，并调换第一栏和第四栏的位置

See merge request yunteng/thingskit-front!1130

@@ -58,24 +58,24 @@
 
 
   const alarmColumns: BasicColumn[] = [
   const alarmColumns: BasicColumn[] = [
     {
     {
-      title: '状态',
-      dataIndex: 'severity',
+      title: '告警等级',
+      dataIndex: 'status',
       ellipsis: true,
       ellipsis: true,
       width: 80,
       width: 80,
-      customRender: ({ record }) => {
-        const { severity } = record;
-        const { text, color } = alarmLevel(severity);
-        return h(Tag, { color }, () => text);
-      },
+      format: (text) => statusType(text),
     },
     },
     { title: '设备', dataIndex: 'device', ellipsis: true, width: 120 },
     { title: '设备', dataIndex: 'device', ellipsis: true, width: 120 },
     { title: '告警场景', dataIndex: 'type', ellipsis: true, width: 80 },
     { title: '告警场景', dataIndex: 'type', ellipsis: true, width: 80 },
     {
     {
-      title: '状态',
-      dataIndex: 'status',
+      title: '告警级别',
+      dataIndex: 'severity',
       ellipsis: true,
       ellipsis: true,
       width: 80,
       width: 80,
-      format: (text) => statusType(text),
+      customRender: ({ record }) => {
+        const { severity } = record;
+        const { text, color } = alarmLevel(severity);
+        return h(Tag, { color }, () => text);
+      },
     },
     },
     {
     {
       title: '时间',
       title: '时间',