From 29ef22c9b78ff2a9cb2e9719b2479366b555b784 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Fri, 26 Jun 2026 13:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AA=E5=8F=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../testScript/components/flickerData.js      |  4 ++--
 .../testScript/components/scriptForm.ts       | 24 +++++++++----------
 .../components/testScriptFlickerTab.vue       | 10 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/frontend/src/views/machine/testScript/components/flickerData.js b/frontend/src/views/machine/testScript/components/flickerData.js
index 8b89f81..922a89c 100644
--- a/frontend/src/views/machine/testScript/components/flickerData.js
+++ b/frontend/src/views/machine/testScript/components/flickerData.js
@@ -1,5 +1,5 @@
-const DEFAULT_WAVE_TYPE = 'CPM'
-const DEFAULT_WAVE_FLU_TYPE = 'SQU'
+const DEFAULT_WAVE_TYPE = 'SQU'
+const DEFAULT_WAVE_FLU_TYPE = 'CPM'
 const DEFAULT_DUTY_CYCLE = 50
 
 export function normalizeFlickerData(flickerData) {
diff --git a/frontend/src/views/machine/testScript/components/scriptForm.ts b/frontend/src/views/machine/testScript/components/scriptForm.ts
index 4059ac7..360c887 100644
--- a/frontend/src/views/machine/testScript/components/scriptForm.ts
+++ b/frontend/src/views/machine/testScript/components/scriptForm.ts
@@ -31,8 +31,8 @@ let scriptForm: any = {
                 flickerValue: '1', //标准值
                 fchagValue: '2.724', //变动量
                 fchagFre: '1', //波动频度
-                waveType: 'CPM', // 波动类型
-                waveFluType: 'SQU', //波类型
+                waveType: 'SQU', // 波类型
+                waveFluType: 'CPM', //波动类型
                 fdutyCycle: 50 //占空比
             }, //闪变
             dipData: {
@@ -63,8 +63,8 @@ let scriptForm: any = {
                 flickerValue: '1', //标准值
                 fchagValue: '2.724', //变动量
                 fchagFre: '1', //波动频度
-                waveType: 'CPM', // 波动类型
-                waveFluType: 'SQU', //波类型
+                waveType: 'SQU', // 波动类型
+                waveFluType: 'CPM', //波类型
                 fdutyCycle: 50 //占空比
             }, //闪变
             dipData: {
@@ -95,8 +95,8 @@ let scriptForm: any = {
                 flickerValue: '1', //标准值
                 fchagValue: '2.724', //变动量
                 fchagFre: '1', //波动频度
-                waveType: 'CPM', // 波动类型
-                waveFluType: 'SQU', //波类型
+                waveType: 'SQU', // 波动类型
+                waveFluType: 'CPM', //波类型
                 fdutyCycle: 50 //占空比
             }, //闪变
             dipData: {
@@ -127,8 +127,8 @@ let scriptForm: any = {
                 flickerValue: '1', //标准值
                 fchagValue: '2.724', //变动量
                 fchagFre: '1', //波动频度
-                waveType: 'CPM', // 波动类型
-                waveFluType: 'SQU', //波类型
+                waveType: 'SQU', // 波动类型
+                waveFluType: 'CPM', //波类型
                 fdutyCycle: 50 //占空比
             }, //闪变
             dipData: {
@@ -159,8 +159,8 @@ let scriptForm: any = {
                 flickerValue: '1', //标准值
                 fchagValue: '2.724', //变动量
                 fchagFre: '1', //波动频度
-                waveType: 'CPM', // 波动类型
-                waveFluType: 'SQU', //波类型
+                waveType: 'SQU', // 波动类型
+                waveFluType: 'CPM', //波类型
                 fdutyCycle: 50 //占空比
             }, //闪变
             dipData: {
@@ -191,8 +191,8 @@ let scriptForm: any = {
                 flickerValue: '1', //标准值
                 fchagValue: '2.724', //变动量
                 fchagFre: '1', //波动频度
-                waveType: 'CPM', // 波动类型
-                waveFluType: 'SQU', //波类型
+                waveType: 'SQU', // 波动类型
+                waveFluType: 'CPM', //波类型
                 fdutyCycle: 50 //占空比
             }, //闪变
             dipData: {
diff --git a/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue b/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue
index 7ca4219..a975ebb 100644
--- a/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue
+++ b/frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue
@@ -8,7 +8,7 @@
                     <el-form-item abel-width="180px">
                         <template #label>
                             <el-select
-                                v-model="form[0].flickerData.waveType"
+                                v-model="form[0].flickerData.waveFluType"
                                 @change="changeLable"
                                 style="width: 170px"
                             >
@@ -26,7 +26,7 @@
                             style="width: 180px"
                             filterable
                             v-model="form[0].flickerData.fchagFre"
-                            @change="changeWaveType"
+                            @change="changeWaveFluType"
                         >
                             <el-option
                                 v-for="(item, i) in waveChildrenList"
@@ -65,7 +65,7 @@
                         <el-select
                             placeholder="请选择波类型"
                             style="width: 150px"
-                            v-model="form[0].flickerData.waveFluType"
+                            v-model="form[0].flickerData.waveType"
                             :disabled="!form[0].flickerFlag"
                         >
                             <el-option label="RECT" value="RECT"></el-option>
@@ -343,7 +343,7 @@ const waveList = [
 ]
 
 const waveChildrenList = computed(() => {
-    return waveList.filter((item: any) => item.value === form.value[0].flickerData.waveType)[0].children
+    return waveList.filter((item: any) => item.value === form.value[0].flickerData.waveFluType)[0].children
 })
 const changeLable = e => {
     setTimeout(() => {
@@ -363,7 +363,7 @@ const changeLable = e => {
     }, 100)
 }
 // [频率变化]
-const changeWaveType = e => {
+const changeWaveFluType = e => {
   let fchagValueTemp = waveChildrenList.value.filter(
         (item: any) => item.fchagFre == e
     )[0].fchagValue