From 5a2de0077a3561c49f30bc3fe185dfc67716befc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Mon, 1 Dec 2025 11:09:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=A2=84=E8=AD=A6=E7=82=B9=E5=8F=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/run/instant/warnConfig/warn.data.ts | 12 ++++++++++++ src/views/run/model/point.data.ts | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) 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, },