Merge remote-tracking branch 'origin/xc-new' into xc-new

src/views/healthMonitor/healMonitorManage/monitorToll/sectoralData/sectoralData.data.ts

@@ -160,7 +160,7 @@ export const columnsNew: BasicColumn[] = [
     },
     {
         title: '未分配设备数',
-        dataIndex: 'unassignedDeviceNums',
+        dataIndex: 'undistributedDeviceNums',
         customRender: ({ record }) => {
             const total = record.totalAssignedDeviceNums ?? 0;
             const assigned = record.assignedDeviceNums ?? 0;
@@ -177,21 +177,13 @@ export const columnsNew: BasicColumn[] = [
     },
     {
         title: '未绑定设备数',
-        dataIndex: 'unassignedDeviceNums',
+        dataIndex: 'undistributedDeviceNums',
         customRender: ({ record }) => {
             const total = record.totalAssignedDeviceNums ?? 0;
             const assigned = record.assignedDeviceNums ?? 0;
             return Math.max(0, total - assigned);
         },
     },
-    {
-        title: '非关爱人员数量',
-        dataIndex: ['nonCareNums'],
-        customRender: ({ text }) => {
-            if (!text) return 0;
-            return text;
-        },
-    },
     {
         title: '佩戴人员数',
         dataIndex: ['assignedUserNums'],
@@ -200,6 +192,15 @@ export const columnsNew: BasicColumn[] = [
             return text;
         },
     },
+    {
+        title: '关爱人员佩戴人数',
+        dataIndex: ['careWearNums'],
+        width: 150,
+        customRender: ({ text }) => {
+            if (!text) return 0;
+            return text;
+        },
+    },
     {
         title: '未佩戴人员数',
         dataIndex: ['undistributedUserNums'],
@@ -208,6 +209,47 @@ export const columnsNew: BasicColumn[] = [
             return text;
         },
     },
+    {
+        title: '关爱人员未佩戴人数',
+        dataIndex: ['careUnwearNums'],
+        width: 160,
+        customRender: ({ text }) => {
+            if (!text) return 0;
+            return text;
+        },
+    },
+    {
+        title: '关爱人员未佩戴人数\n（仅计入统计日期起期已绑定的人数）',
+        dataIndex: ['careUnwearAtStartNums'],
+        width: 180,
+        customHeaderCell: () => {
+            return {
+                style: {
+                    whiteSpace: 'pre-wrap',
+                },
+            };
+        },
+        customRender: ({ text }) => {
+            if (!text) return 0;
+            return text;
+        },
+    },
+    {
+        title: '非关爱人员数量',
+        dataIndex: ['nonCareNums'],
+        customRender: ({ text }) => {
+            if (!text) return 0;
+            return text;
+        },
+    },
+    {
+        title: '关爱人员数量',
+        dataIndex: ['careNums'],
+        customRender: ({ text }) => {
+            if (!text) return 0;
+            return text;
+        },
+    },
     {
         title: '心率异常人数',
         dataIndex: ['heartRateNums'],