From b31efb9edebda992e066198848736cf312583cfb Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 11 Jun 2026 09:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AA=E5=8F=98=E7=BC=96=E8=BE=91=E6=A1=86?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../testScript/components/flickerData.d.ts | 10 +++++++ .../testScript/components/flickerData.js | 27 +++++++++++++++++++ .../components/testScriptFlickerTab.vue | 18 ++++++++----- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 frontend/src/views/machine/testScript/components/flickerData.d.ts create mode 100644 frontend/src/views/machine/testScript/components/flickerData.js diff --git a/frontend/src/views/machine/testScript/components/flickerData.d.ts b/frontend/src/views/machine/testScript/components/flickerData.d.ts new file mode 100644 index 0000000..df70538 --- /dev/null +++ b/frontend/src/views/machine/testScript/components/flickerData.d.ts @@ -0,0 +1,10 @@ +export interface FlickerData { + flickerValue: string | null + fchagFre: string + fchagValue: string + waveType: string + waveFluType: string + fdutyCycle: number +} + +export function normalizeFlickerData(flickerData: Partial | null | undefined): FlickerData diff --git a/frontend/src/views/machine/testScript/components/flickerData.js b/frontend/src/views/machine/testScript/components/flickerData.js new file mode 100644 index 0000000..8b89f81 --- /dev/null +++ b/frontend/src/views/machine/testScript/components/flickerData.js @@ -0,0 +1,27 @@ +const DEFAULT_WAVE_TYPE = 'CPM' +const DEFAULT_WAVE_FLU_TYPE = 'SQU' +const DEFAULT_DUTY_CYCLE = 50 + +export function normalizeFlickerData(flickerData) { + const normalized = { + flickerValue: flickerData?.flickerValue ?? null, + fchagFre: flickerData?.fchagFre ?? '', + fchagValue: flickerData?.fchagValue ?? '', + waveType: flickerData?.waveType ?? DEFAULT_WAVE_TYPE, + waveFluType: flickerData?.waveFluType ?? DEFAULT_WAVE_FLU_TYPE, + fdutyCycle: flickerData?.fdutyCycle ?? DEFAULT_DUTY_CYCLE + } + + const isBackendEmptyState = + normalized.flickerValue == null && + normalized.fchagFre === '1' && + normalized.fchagValue === '2.724' + + if (isBackendEmptyState) { + normalized.fchagFre = '' + normalized.fchagValue = '' + } + + return normalized +} + diff --git a/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue b/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue index 1d520e0..3d6a300 100644 --- a/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue +++ b/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue @@ -80,7 +80,8 @@