diff --git a/src/components/cockpit/F47Curve/index.vue b/src/components/cockpit/F47Curve/index.vue
index c7d4c50..8a45516 100644
--- a/src/components/cockpit/F47Curve/index.vue
+++ b/src/components/cockpit/F47Curve/index.vue
@@ -18,7 +18,7 @@
             }"
             @chart-click="handleChartClick"
         />
-        <el-dialog v-model="isWaveCharts" draggable title="瞬时/RMS波形" append-to-body width="70%">
+        <el-dialog v-model="isWaveCharts" draggable :title="dialogTitle" append-to-body width="70%">
             <waveFormAnalysis
                 v-loading="loading"
                 v-if="isWaveCharts"
@@ -42,19 +42,17 @@ import { useTimeCacheStore } from '@/stores/timeCache'
 import { analyseWave } from '@/api/common'
 
 const prop = defineProps({
-    w: { type:  [String, Number]},
-    h: { type:  [String, Number]},
-    width: { type:  [String, Number]},
-    height: { type:  [String, Number]},
-    timeKey: { type:  [String, Number]},
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
     timeValue: { type: Object }
 })
 
 const headerHeight = ref(57)
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
-
+const dialogTitle = ref('波形分析')
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -104,7 +102,7 @@ const tableStore: any = new TableStore({
     showPage: false,
 
     column: [],
-     beforeSearchFun: () => {
+    beforeSearchFun: () => {
         tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
         tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
     },
@@ -413,28 +411,33 @@ onMounted(() => {
 const handleChartClick = (params: any) => {
     if (params.seriesName === '可容忍事件') {
         // 处理可容忍事件点击
-        ElMessage.info(`点击了可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
+        dialogTitle.value = '可容忍事件波形分析'
         handleTolerableEventClick(params)
     } else if (params.seriesName === '不可容忍事件') {
+        dialogTitle.value = '不可容忍事件波形分析'
         // 处理不可容忍事件点击
-        ElMessage.info(`点击了不可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
-        handleIntolerableEventClick(params)
+        // ElMessage.info(`点击了不可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
+        handleTolerableEventClick(params)
     }
 }
 
 // 可容忍事件点击处理函数
 const handleTolerableEventClick = async (row: any) => {
-    console.log('可容忍事件详情:', row)
     isWaveCharts.value = true
     loading.value = true
     isWaveCharts.value = true
-    await analyseWave(row.id)
+    nextTick(() => {
+        if (waveFormAnalysisRef.value) {
+            waveFormAnalysisRef.value.setHeight(false, 360)
+        }
+    })
+    await analyseWave(row.value[3])
         .then(res => {
             row.loading1 = false
             if (res != undefined) {
                 boxoList.value = row
                 boxoList.value.featureAmplitude = row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
-                boxoList.value.systemType = 'WX'
+                boxoList.value.systemType = 'YPT'
                 wp.value = res.data
             }
             loading.value = false
diff --git a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
index d9a646d..8d09521 100644
--- a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
+++ b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
@@ -22,7 +22,7 @@
         <el-dialog
             v-model="isWaveCharts"
             draggable
-            title="瞬时/RMS波形"
+            title="波形分析"
             append-to-body
             width="70%"
             @close="handleHideCharts"