From 5619413f376a180465dd2155f98d94022c737048 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 10 Apr 2025 11:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB=E4=BD=BF?=
 =?UTF-8?q?=E8=83=BD=E9=BB=98=E8=AE=A4=E5=A4=9F=E9=80=89=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E4=BD=BF=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9A=82=E6=80=81?=
 =?UTF-8?q?=E4=BD=BF=E8=83=BD=E6=8C=81=E7=BB=AD=E6=97=B6=E9=97=B4=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/testProjectPopup.vue           | 48 ++++++++++++++-----
 .../components/testScriptDipTab.vue           |  8 ++++
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/frontend/src/views/machine/testScript/components/testProjectPopup.vue b/frontend/src/views/machine/testScript/components/testProjectPopup.vue
index 7c74737..137d2b1 100644
--- a/frontend/src/views/machine/testScript/components/testProjectPopup.vue
+++ b/frontend/src/views/machine/testScript/components/testProjectPopup.vue
@@ -31,7 +31,11 @@
                                 :show-header="false"
                                 :span-method="arraySpanMethod"
                                 :cell-style="tableStyle.cellStyle"
-                                :header-cell-style="{ textAlign: 'center', backgroundColor: 'var(--el-color-primary)', color: '#fff' }"
+                                :header-cell-style="{
+                                    textAlign: 'center',
+                                    backgroundColor: 'var(--el-color-primary)',
+                                    color: '#fff'
+                                }"
                                 @cell-click="handleRowClick"
                                 :key="key"
                             >
@@ -89,18 +93,22 @@
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].harmFlag"
                                             label="谐波使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].inHarmFlag"
                                             label="间谐波使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].flickerFlag"
                                             label="闪变使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].dipFlag"
                                             label="暂态使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                     </template>
                                 </el-table-column>
@@ -114,7 +122,13 @@
                                 <div class="form-item-container">
                                     <el-form-item label="频率：" prop="name">
                                         <div class="input-label-container">
-                                            <el-input type="number" style="width: 100px" v-model="form.ffreq" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" @change="validateFreq" />
+                                            <el-input
+                                                type="number"
+                                                style="width: 100px"
+                                                v-model="form.ffreq"
+                                                onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
+                                                @change="validateFreq"
+                                            />
                                             <label>Hz</label>
                                         </div>
                                     </el-form-item>
@@ -142,7 +156,7 @@
                             <TestScriptFlickerTab :childForm="childForm" />
                         </el-tab-pane>
                         <el-tab-pane label="暂态编辑" v-if="childForm[0].dipFlag || childForm[1].dipFlag">
-                            <TestScriptDipTab :childForm="childForm" />
+                            <TestScriptDipTab :childForm="childForm" @setRetainTime="setRetainTime" />
                         </el-tab-pane>
                     </el-tabs>
                 </div>
@@ -154,7 +168,7 @@
                     :formContent="props.formContent"
                     :form="form"
                     :key="initial"
-                    :valueCode=valueCode
+                    :valueCode="valueCode"
                     @recalculation="recalculation"
                 />
             </el-carousel-item>
@@ -277,6 +291,12 @@ const close = () => {
     dialogVisible.value = false
     emit('close')
 }
+// 设置持续时间
+const setRetainTime = (val: any) => {
+    form.value.channelList.forEach((item: any) => {
+        item.dipData.retainTime = val
+    })
+}
 
 // 保存数据
 const save = () => {
@@ -612,13 +632,19 @@ const copyRow = (num: number, index: number) => {
 }
 
 const validateFreq = () => {
-  if (form.value.ffreq < 40) {
-    ElMessage.warning("频率不能低于40Hz")
-    form.value.ffreq = 40
-  } else if (form.value.ffreq > 60) {
-    ElMessage.warning("频率不能高于60Hz")
-    form.value.ffreq = 60
-  }
+    if (form.value.ffreq < 40) {
+        ElMessage.warning('频率不能低于40Hz')
+        form.value.ffreq = 40
+    } else if (form.value.ffreq > 60) {
+        ElMessage.warning('频率不能高于60Hz')
+        form.value.ffreq = 60
+    }
+}
+// 点击使能按钮
+const handleHarmFlag = (e: boolean, i: number) => {
+    if (e) {
+        form.value.channelList[i].channelFlag = true
+    }
 }
 
 // 打开 drawer(新增、编辑)
diff --git a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue
index a8f6f88..5c47b86 100644
--- a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue
+++ b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue
@@ -64,6 +64,7 @@ const form: any = computed({
     },
     set(value) {}
 })
+const emit = defineEmits(['setRetainTime'])  
 const handleInput = value => {
     if (value < 0) {
       ElMessage.warning("设定幅度不能小于0%")
@@ -78,11 +79,18 @@ const handleInputRetainTime = value => {
     if (value < 0) {
       ElMessage.warning("持续时间不能小于0周波")
       props.childForm[0].dipData.retainTime = 0
+      emit('setRetainTime', 0 )
     }else if (value > 300) {
       ElMessage.warning("持续时间不能大于300周波")
       props.childForm[0].dipData.retainTime = 300
+      emit('setRetainTime', 300 )
+    }else{
+     console.log(props);
+     
+        emit('setRetainTime', value )
     }
 }
+
 </script>
 
 <style lang="scss" scoped>