From 69cf72af22b2d1cc04b2a43bc7daecfeb7f72be1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 17 Mar 2025 18:10:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=8A=E8=AD=A6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=AF=BC=E8=87=B4=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/faultManage/actAlarm.ts | 8 ++++---- src/api/faultManage/eventAlarm.ts | 2 -- src/api/faultManage/historyAlarm.ts | 6 +++--- src/api/perfManage/customTarget.ts | 3 --- src/api/perfManage/perfThreshold.ts | 1 - src/views/index/tenantUPF.vue | 1 - 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/api/faultManage/actAlarm.ts b/src/api/faultManage/actAlarm.ts index 29c5466b..0cf5cb4e 100644 --- a/src/api/faultManage/actAlarm.ts +++ b/src/api/faultManage/actAlarm.ts @@ -1,7 +1,7 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; -import { parseDateToStr } from '@/utils/date-utils'; +import { parseDateToStr, YYYY_MM_DD_HH_MM_SS } from '@/utils/date-utils'; import useUserStore from '@/store/modules/user'; /** @@ -122,7 +122,7 @@ export function updateConfirm(data: Record) { const userName = useUserStore().userName; let finalData = { alarm: { - ack_time: parseDateToStr(time), + ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS), ack_user: userName, ack_state: '1', }, @@ -145,7 +145,7 @@ export function cancelConfirm(data: (string | number)[]) { const userName = useUserStore().userName; let finalData = { alarm: { - ack_time: parseDateToStr(time), + ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS), ack_user: '', ack_state: '0', }, @@ -216,7 +216,7 @@ export function clearAlarm(data: Record) { const userName = useUserStore().userName; let finalData = { data: { - clear_time: parseDateToStr(time), + clear_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS), clear_type: '2', alarm_status: '0', clear_user: userName, diff --git a/src/api/faultManage/eventAlarm.ts b/src/api/faultManage/eventAlarm.ts index e84dfca5..636b79d6 100644 --- a/src/api/faultManage/eventAlarm.ts +++ b/src/api/faultManage/eventAlarm.ts @@ -1,8 +1,6 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; -import { parseDateToStr } from '@/utils/date-utils'; -import useUserStore from '@/store/modules/user'; /** * 查询列表 diff --git a/src/api/faultManage/historyAlarm.ts b/src/api/faultManage/historyAlarm.ts index e7df7458..6db2accf 100644 --- a/src/api/faultManage/historyAlarm.ts +++ b/src/api/faultManage/historyAlarm.ts @@ -1,7 +1,7 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; -import { parseDateToStr } from '@/utils/date-utils'; +import { parseDateToStr, YYYY_MM_DD_HH_MM_SS } from '@/utils/date-utils'; import useUserStore from '@/store/modules/user'; /** @@ -79,7 +79,7 @@ export function updateConfirm(data: Record) { const userName = useUserStore().userName; let finalData = { alarm: { - ack_time: parseDateToStr(time), + ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS), ack_user: userName, ack_state: '1', }, @@ -101,7 +101,7 @@ export function cancelConfirm(data: (string | number)[]) { var time = new Date(); let finalData = { alarm: { - ack_time: parseDateToStr(time), + ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS), ack_user: '', ack_state: '0', }, diff --git a/src/api/perfManage/customTarget.ts b/src/api/perfManage/customTarget.ts index ac3b9ab6..c6b97f49 100644 --- a/src/api/perfManage/customTarget.ts +++ b/src/api/perfManage/customTarget.ts @@ -1,7 +1,4 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; -import { parseDateToStr } from '@/utils/date-utils'; /** * 查询自定义指标 diff --git a/src/api/perfManage/perfThreshold.ts b/src/api/perfManage/perfThreshold.ts index d884a049..e1d2d8d3 100644 --- a/src/api/perfManage/perfThreshold.ts +++ b/src/api/perfManage/perfThreshold.ts @@ -1,7 +1,6 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; -import { parseDateToStr } from '@/utils/date-utils'; /** * 查询任务列表 diff --git a/src/views/index/tenantUPF.vue b/src/views/index/tenantUPF.vue index 83032ac9..faa7dd4c 100644 --- a/src/views/index/tenantUPF.vue +++ b/src/views/index/tenantUPF.vue @@ -15,7 +15,6 @@ import { UniversalTransition } from 'echarts/features'; import { CanvasRenderer } from 'echarts/renderers'; import { markRaw } from 'vue'; import useI18n from '@/hooks/useI18n'; -import { parseDateToStr } from '@/utils/date-utils'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { upfFlowData,