Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/pages/EqSelfInspection/components/Detail.js

@@ -313,10 +313,7 @@ export function DeviceTable(props) {
     {
       title: '巡检项',
       key: 'TemplateItem.Name',
-      dataIndex: 'TemplateItem',
-      render: (TemplateItem) => {
-        return TemplateItem?.Name || '-';
-      },
+      dataIndex: ['TemplateItem', 'Name'],
     },
     // {
     //   title: '设备位号',
@@ -631,26 +628,13 @@ export function WarningTable(props) {
     },
     {
       title: '巡检项',
-      key: 'TemplateItem.Name',
-      dataIndex: 'TemplateItem',
-      render: (TemplateItem) => {
-        return TemplateItem?.Name || '-';
-      },
+      dataIndex: ['TemplateItem', 'Name'],
     },
-    // {
-    //   title: '设备位号',
-    //   width: '16%',
-    //   dataIndex: 'DeviceCode',
-    // },
     {
       title: '设定值范围',
       width: '30%',
       render: (record) => (
-        <ThresholdDetail
-          current={record.Value || 0}
-          data={record || {}}
-          // onClick={() => onClickThreshold(record)}
-        />
+        <ThresholdDetail current={record.Value || 0} data={record || {}} />
       ),
     },
     {