|
@@ -313,8 +313,7 @@ export function DeviceTable(props) {
|
|
|
{
|
|
|
title: '巡检项',
|
|
|
key: 'TemplateItem.Name',
|
|
|
- dataIndex: 'TemplateItem',
|
|
|
- render: (TemplateItem) => <div>{TemplateItem.Name}</div>,
|
|
|
+ dataIndex: ['TemplateItem', 'Name'],
|
|
|
},
|
|
|
// {
|
|
|
// title: '设备位号',
|
|
@@ -596,6 +595,7 @@ export function WarningTable(props) {
|
|
|
const [errVisible, setErrVisible] = useState(false);
|
|
|
const [currentItem, setCurrentItem] = useState({});
|
|
|
const isSensor = type == 'sensor';
|
|
|
+ console.log('--------------', items);
|
|
|
|
|
|
const onClickThreshold = (record) => {
|
|
|
setCurrentItem(record);
|
|
@@ -629,13 +629,8 @@ export function WarningTable(props) {
|
|
|
},
|
|
|
{
|
|
|
title: '巡检项',
|
|
|
- dataIndex: 'TemplateItem.Name',
|
|
|
+ dataIndex: ['TemplateItem', 'Name'],
|
|
|
},
|
|
|
- // {
|
|
|
- // title: '设备位号',
|
|
|
- // width: '16%',
|
|
|
- // dataIndex: 'DeviceCode',
|
|
|
- // },
|
|
|
{
|
|
|
title: '设定值范围',
|
|
|
width: '30%',
|