暂态前后延时间

frontend/src/views/machine/testScript/components/scriptForm.ts

@@ -37,7 +37,9 @@ let scriptForm: any = {
             }, //闪变
             dipData: {
                 ftransValue: '', // 暂态幅值
-                retainTime: '' // 暂态持续时间
+                retainTime: '', // 暂态持续时间
+                fpreTime:2.0,
+                fafterTime:3.0
             } //暂态
         },
         {
@@ -67,7 +69,9 @@ let scriptForm: any = {
             }, //闪变
             dipData: {
                 ftransValue: '', // 暂态幅值
-                retainTime: '' // 暂态持续时间
+                retainTime: '', // 暂态持续时间
+                fpreTime:2.0,
+                fafterTime:3.0
             } //暂态
         },
         {
@@ -97,7 +101,9 @@ let scriptForm: any = {
             }, //闪变
             dipData: {
                 ftransValue: '', // 暂态幅值
-                retainTime: '' // 暂态持续时间
+                retainTime: '', // 暂态持续时间
+                fpreTime:2.0,
+                fafterTime:3.0
             } //暂态
         },
         {
@@ -127,7 +133,9 @@ let scriptForm: any = {
             }, //闪变
             dipData: {
                 ftransValue: '', // 暂态幅值
-                retainTime: '' // 暂态持续时间
+                retainTime: '', // 暂态持续时间
+                fpreTime:2.0,
+                fafterTime:3.0
             } //暂态
         },
         {
@@ -157,7 +165,9 @@ let scriptForm: any = {
             }, //闪变
             dipData: {
                 ftransValue: '', // 暂态幅值
-                retainTime: '' // 暂态持续时间
+                retainTime: '', // 暂态持续时间
+                fpreTime:2.0,
+                fafterTime:3.0
             } //暂态
         },
         {
@@ -187,7 +197,9 @@ let scriptForm: any = {
             }, //闪变
             dipData: {
                 ftransValue: '', // 暂态幅值
-                retainTime: '' // 暂态持续时间
+                retainTime: '', // 暂态持续时间
+                fpreTime:2.0,
+                fafterTime:3.0
             } //暂态
         }
     ]

frontend/src/views/machine/testScript/components/testProjectPopup.vue

@@ -162,7 +162,7 @@
                             <TestScriptFlickerTab :childForm="childForm" />
                         </el-tab-pane>
                         <el-tab-pane label="暂态编辑" v-if="childForm[0].dipFlag || childForm[1].dipFlag">
-                            <TestScriptDipTab :childForm="childForm" @setRetainTime="setRetainTime" />
+                            <TestScriptDipTab :childForm="childForm" @setRetainTime="setRetainTime" @setFPreTime="setFPreTime" @setFAfterTime="setFAfterTime" />
                         </el-tab-pane>
                     </el-tabs>
                 </div>
@@ -303,6 +303,18 @@ const setRetainTime = (val: any) => {
     })
 }
 
+const setFPreTime = (val: any) => {
+  form.value.channelList.forEach((item: any) => {
+    item.dipData.fpreTime = val
+  })
+}
+
+const setFAfterTime = (val: any) => {
+  form.value.channelList.forEach((item: any) => {
+    item.dipData.fafterTime = val
+  })
+}
+
 // 保存数据
 const save = () => {
     let copyForm = handleHarmData()
@@ -644,6 +656,8 @@ const validateFreq = () => {
         form.value.ffreq = 60
     }
 }
+
+
 // 点击使能按钮
 const handleHarmFlag = (e: boolean, i: number) => {
     if (e) {

frontend/src/views/machine/testScript/components/testScriptDipTab.vue

@@ -3,7 +3,7 @@
         <div class="left-editor">
             <!-- 左侧编辑区域内容 -->
 
-            <img src="@/assets/images/transient.png" />
+            <img src="@/assets/images/transient.png"/>
             <!-- <div class="inputTop">
                 <el-input v-model="form[0].dipData.fValue" style="width: 150px; left: 4%" :disabled="!form[0].dipFlag">
                     <template #append>S</template>
@@ -25,27 +25,45 @@
             </div> -->
         </div>
         <div class="right-editor">
+          <el-form :inline="true" label-width="auto" class="form-two">
             <!-- 右侧编辑区域内容 -->
-            <el-form-item label-width="120px" label="设定幅度(%)">
+            <el-form-item label="设定幅度(%)">
-                <el-input
+              <el-input
-                    type="number"
+                  type="number"
-                    @input="handleInput"
+                  @input="handleInput"
-                    v-model="form[0].dipData.ftransValue"
+                  v-model="form[0].dipData.ftransValue"
-                    style="width: 150px"
+                  :disabled="!form[0].dipFlag"
-                    :disabled="!form[0].dipFlag"
+                  onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
-                    onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
+              />
-                />
             </el-form-item>
-            <el-form-item label-width="120px" label="持续时间(周波)">
+            <el-form-item label="持续时间(周波)">
-                <el-input
+              <el-input
-                    type="number"
+                  type="number"
-                    v-model="form[0].dipData.retainTime"
+                  v-model="form[0].dipData.retainTime"
-                    @input="handleInputRetainTime"
+                  @input="handleInputRetainTime"
-                    style="width: 150px"
+                  :disabled="!form[0].dipFlag"
-                    :disabled="!form[0].dipFlag"
+                  onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
-                    onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
+              />
-                />
             </el-form-item>
+            <el-form-item label="前延时间(S)">
+              <el-input
+                  type="number"
+                  v-model="form[0].dipData.fpreTime"
+                  @input="validateFPreTime"
+                  :disabled="!form[0].dipFlag"
+                  onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
+              />
+            </el-form-item>
+            <el-form-item label="后延时间(S)">
+              <el-input
+                  type="number"
+                  v-model="form[0].dipData.fafterTime"
+                  @input="validateFAfterTime"
+                  :disabled="!form[0].dipFlag"
+                  onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
+              />
+            </el-form-item>
+          </el-form>
         </div>
     </div>
 </template>
@@ -60,11 +78,12 @@ const props = defineProps({
 })
 const form: any = computed({
     get() {
+      console.log(props.childForm)
         return props.childForm
     },
     set(value) {}
 })
-const emit = defineEmits(['setRetainTime'])  
+const emit = defineEmits(['setRetainTime','setFPreTime','setFAfterTime'])
 const handleInput = value => {
     if (value < 0) {
       ElMessage.warning("设定幅度不能小于0%")
@@ -91,6 +110,34 @@ const handleInputRetainTime = value => {
     }
 }
 
+const validateFPreTime = value => {
+  if (value < 0.01) {
+    ElMessage.warning('暂态前延时间不能低于0.01S')
+    props.childForm[0].dipData.fPreTime = 0.01
+    emit('setFPreTime', 0.01 )
+  } else if (value > 60) {
+    ElMessage.warning('暂态前延时间不能高于60S')
+    props.childForm[0].dipData.fPreTime = 60
+    emit('setFPreTime', 60 )
+  }else{
+    emit('setFPreTime', value )
+  }
+}
+
+const validateFAfterTime = value => {
+  if (value < 0.01) {
+    ElMessage.warning('暂态后延时间不能低于0.01S')
+    props.childForm[0].dipData.fafterTime = 0.01
+    emit('setFAfterTime', 0.01 )
+  } else if (value > 60) {
+    ElMessage.warning('暂态后延时间不能高于60S')
+    props.childForm[0].dipData.fafterTime = 60
+    emit('setFAfterTime', 60 )
+  }else{
+    emit('setFAfterTime', value )
+  }
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -107,8 +154,9 @@ canvas {
 .left-editor {
     flex: 1; /* 左侧区域占据 3/4 的宽度 */
     position: relative;
+    width: 55%;
     img {
-        width: 90%;
+        width: 95%;
         height: 140px;
         margin: 0 10px 20px;
     }
@@ -125,7 +173,9 @@ canvas {
 }
 
 .right-editor {
-    width: 400px;
+  display: flex;
+  align-items: center;
+    width: 45%;
     /* margin-right: 250px; 向左侧移动一点 */
 }
 </style>