From c682de1139f52b8ac701844bf026293e387ca1d5 Mon Sep 17 00:00:00 2001 From: xjf <378266566@qq.com> Date: Tue, 16 Dec 2025 23:31:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=9B=86=E4=B8=AD=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/appEnum.ts | 3 ++- src/locales/lang/en/action.json | 5 +++-- src/locales/lang/zh-CN/action.json | 3 ++- src/views/warn/alarm/alarm.data.ts | 10 ++++++++- src/views/warn/alarm/index.vue | 36 +++++------------------------- 5 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/enums/appEnum.ts b/src/enums/appEnum.ts index 26d9d8a..76ced39 100644 --- a/src/enums/appEnum.ts +++ b/src/enums/appEnum.ts @@ -74,5 +74,6 @@ export enum IconEnum { CHANGE = 'ant-design:one-to-one-outlined', WARN = 'ant-design:warning-outlined', BACK_CALC = 'ant-design:backward-outlined', - + DETAIL = 'ant-design:eye-outlined', + TREND = 'ant-design:line-chart-outlined', } diff --git a/src/locales/lang/en/action.json b/src/locales/lang/en/action.json index 529585c..45926d2 100644 --- a/src/locales/lang/en/action.json +++ b/src/locales/lang/en/action.json @@ -15,6 +15,7 @@ "createInstant": "CreateInstant", "pointConfig": "PointConfig", "warnConfig": "WarnConfig", - "backCalc": "backCalc", - "calcIng": "calcIng" + "backCalc": "BackCalc", + "calcIng": "CalcIng", + "trend": "Trend" } diff --git a/src/locales/lang/zh-CN/action.json b/src/locales/lang/zh-CN/action.json index 5c0bb93..ae88f07 100644 --- a/src/locales/lang/zh-CN/action.json +++ b/src/locales/lang/zh-CN/action.json @@ -17,5 +17,6 @@ "pointConfig": "测点配置", "warnConfig": "预警配置", "backCalc": "回算", - "calcIng": "回算中" + "calcIng": "回算中", + "trend": "趋势" } diff --git a/src/views/warn/alarm/alarm.data.ts b/src/views/warn/alarm/alarm.data.ts index 589b208..d301db2 100644 --- a/src/views/warn/alarm/alarm.data.ts +++ b/src/views/warn/alarm/alarm.data.ts @@ -159,7 +159,15 @@ export const columns: BasicColumn[] = [ { title: '预警时间', dataIndex: 'createTime', - width: 150 + width: 200, + // 将 JSX 改为 h 函数调用 + customRender: ({ record }) => { + return h('div', [ + h('div', record.createTime), + h('div', '--'), + ]); + }, + }, { title: '持续时长', diff --git a/src/views/warn/alarm/index.vue b/src/views/warn/alarm/index.vue index 4730507..10dd894 100644 --- a/src/views/warn/alarm/index.vue +++ b/src/views/warn/alarm/index.vue @@ -21,7 +21,7 @@ const { createMessage } = useMessage() const { t } = useI18n() const [registerUpdateModal, { openModal: openUpdateModal }] = useModal() const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }] = useTable({ - title: '预警测点列表', + title: '集中告警列表', api: getWarnPageReal, rowKey: 'warnId', immediate: true, @@ -42,7 +42,7 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }] showTableSetting: true, showIndexColumn: false, actionColumn: { - width: 120, + width: 200, title: t('common.action'), dataIndex: 'action', fixed: 'right', @@ -73,40 +73,14 @@ onMounted(async () => { - - - - - -