diff --git a/src/views/run/instant/warnConfig/warn.data.ts b/src/views/run/instant/warnConfig/warn.data.ts index 05e356b..b684dfd 100644 --- a/src/views/run/instant/warnConfig/warn.data.ts +++ b/src/views/run/instant/warnConfig/warn.data.ts @@ -44,6 +44,18 @@ export const columns: BasicColumn[] = [ dataIndex: 'systemName', width: 200, + }, + { + title: '报警表达式', + dataIndex: 'equation', + width: 200, + + }, + { + title: '输出点号', + dataIndex: 'outputPoint', + width: 200, + }, { title: '报警类型', diff --git a/src/views/run/model/point.data.ts b/src/views/run/model/point.data.ts index 4d4206a..46864bd 100644 --- a/src/views/run/model/point.data.ts +++ b/src/views/run/model/point.data.ts @@ -6,17 +6,17 @@ import { DICT_TYPE, getDictOptions } from '@/utils/dict' export const columns: BasicColumn[] = [ { title: '点号', - dataIndex: 'PointId', + dataIndex: 'pointId', width: 150, }, { title: '描述', - dataIndex: 'Description', + dataIndex: 'description', width: 200, }, { title: '单位', - dataIndex: 'Unit', + dataIndex: 'unit', width: 80, },