From e271a3be06b8aac5ff1aa54ed2500fb2b8a768fc Mon Sep 17 00:00:00 2001
From: stt <email>
Date: Thu, 13 Nov 2025 14:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/harmonic-boot/cockpit/cockpit.ts      |   18 +
 .../cockpit/exceedanceLevel/index.vue         |  171 ++-
 .../components/overLimitDetails.vue           |  184 +++
 .../cockpit/gridSideStatistics/index.vue      |    2 +-
 .../listOfMainMonitoringPoints/index.vue      |   41 +-
 .../components/overLimitDetails.vue           |  184 +++
 .../cockpit/monitoringPointList/index.vue     |    2 +-
 .../components/harmonicRatio‌.vue              | 1104 ++++++++++-------
 .../components/overLimitDetails.vue           |    7 +-
 .../cockpit/overLimitStatistics/index.vue     |  134 +-
 .../components/transientStatisticsDetail.vue  |   14 +-
 .../cockpit/transientStatistics/index.vue     |    2 +-
 12 files changed, 1295 insertions(+), 568 deletions(-)
 create mode 100644 src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue
 create mode 100644 src/components/cockpit/monitoringPointList/components/overLimitDetails.vue

diff --git a/src/api/harmonic-boot/cockpit/cockpit.ts b/src/api/harmonic-boot/cockpit/cockpit.ts
index b376d2a..fa3524f 100644
--- a/src/api/harmonic-boot/cockpit/cockpit.ts
+++ b/src/api/harmonic-boot/cockpit/cockpit.ts
@@ -53,5 +53,23 @@ export function totalLimitStatisticsList(data: any) {
     })
 }
 
+// 总体指标越限统计数据
+export function totalLimitStatisticsData(data: any) {
+    return request({
+        url: '/harmonic-boot/totalLimitStatistics/data',
+        method: 'post',
+        data: data
+    })
+}
+
+// 指标越限程度数据
+export function limitExtentData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitExtentData',
+        method: 'post',
+        data: data
+    })
+}
+
 
 
diff --git a/src/components/cockpit/exceedanceLevel/index.vue b/src/components/cockpit/exceedanceLevel/index.vue
index 79f188a..4c8778e 100644
--- a/src/components/cockpit/exceedanceLevel/index.vue
+++ b/src/components/cockpit/exceedanceLevel/index.vue
@@ -1,13 +1,18 @@
 <template>
     <div>
         <!--指标越限程度 -->
-         <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
             :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
         />
-        <Table ref="tableRef" @cell-click="cellClickEvent"  :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`" isGroup></Table>
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"
+            isGroup
+        ></Table>
         <!-- 指标日趋势图 -->
         <DailyTrendChart ref="dailyTrendChartRef" />
     </div>
@@ -59,49 +64,39 @@ const fullscreen = computed(() => {
     }
 })
 
-const echartList = ref({
-    title: {
-        text: '指标越限严重度'
-    },
+const echartList = ref()
 
-    xAxis: {
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
+// const echartList = ref({
+//     title: {
+//         text: '指标越限严重度'
+//     },
 
-    yAxis: {
-        name: '%', // 给X轴加单位
-        interval: 20
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 7.5, 36, 0, 80],
-                barMaxWidth: 30
+//     xAxis: {
+//         data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+//     },
 
-                // label: {
-                //     show: true,
-                //     position: 'top',
-                //     textStyle: {
-                //         //数值样式
-                //         color: '#000'
-                //     },
-                //     fontSize: 12
-                // }
-            }
-        ]
-    }
-})
+//     yAxis: {
+//         name: '%', // 给X轴加单位
+//         interval: 20
+//     },
+//     grid: {
+//         left: '10px',
+//         right: '20px'
+//     },
+//     options: {
+//         series: [
+//             {
+//                 type: 'bar',
+//                 name: '越限占比',
+//                 data: [0, 7.5, 36, 0, 80],
+//                 barMaxWidth: 30
+//             }
+//         ]
+//     }
+// })
 const dailyTrendChartRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/harmonic-boot/limitRateDetailD/limitExtentData',
     method: 'POST',
 
     showPage: false,
@@ -123,7 +118,7 @@ const tableStore: any = new TableStore({
 
         {
             title: '越限最大值',
-            field: 'type',
+            field: 'maxValue',
             minWidth: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
@@ -132,26 +127,26 @@ const tableStore: any = new TableStore({
         },
         {
             title: '国标限值',
-            field: 'type1',
+            field: 'internationalValue',
             minWidth: '60'
         },
         {
             title: '越限程度(%)',
-            field: 'type2',
+            field: 'extent',
             minWidth: '60'
         },
         {
             title: '发生日期',
-            field: 'type3',
+            field: 'time',
             minWidth: '100'
         },
         {
             title: '越限最高监测点',
-            field: 'type4',
+            field: 'lineName',
             minWidth: '90'
         }
     ],
-       beforeSearchFun: () => {
+    beforeSearchFun: () => {
         // 尝试从缓存获取时间值
         let beginTime, endTime
 
@@ -164,54 +159,48 @@ const tableStore: any = new TableStore({
         }
 
         // 如果缓存中没有则使用默认值
-        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-
-        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0]
+        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '闪变',
-                type: '0.0',
-                type1: '2.0',
-                type2: '0.0',
-                type3: '/',
-                type4: '/'
-            },
-            {
-                name: '谐波电压',
-                type: '1.72',
-                type1: '1.6',
-                type2: '7.5',
-                type3: '2025-03-09',
-                type4: '10kV1#电动机'
-            },
-            {
-                name: '谐波电流',
-                type: '27.2',
-                type1: '20.0',
-                type2: '36.0',
-                type3: '2025-03-16',
-                type4: '380V电焊机(治理前)'
-            },
-            {
-                name: '电压偏差',
-                type: '0.0',
-                type1: '2.0',
-                type2: '0.0',
-                type3: '/',
-                type4: '/'
-            },
-            {
-                name: '三相不平衡',
-                type: '3.6',
-                type1: '2.0',
-                type2: '80.0',
-                type3: '2025-03-01',
-                type4: '380V电焊机(治理前)'
-            }
-        ]
+        // 定义 x 轴标签顺序
+        const xAxisLabels = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
 
+        // 根据指标名称顺序提取对应的 maxValue 数据
+        const chartData = xAxisLabels.map(label => {
+            // 在表格数据中查找对应指标名称的数据项
+            const item = tableStore.table.data.find((row: any) => row.name === label)
+            // 如果找到对应项，则返回 maxValue 值，否则返回 0
+            return item ? parseFloat(item.maxValue) || 0 : 0
+        })
+        echartList.value = {
+            title: {
+                text: '指标越限严重度'
+            },
+
+            xAxis: {
+                data: xAxisLabels
+            },
+
+            yAxis: {
+                name: '%', // 给X轴加单位
+                interval: 20
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            options: {
+                series: [
+                    {
+                        type: 'bar',
+                        name: '越限占比',
+                        data: chartData,
+                        barMaxWidth: 30
+                    }
+                ]
+            }
+        }
     }
 })
 
diff --git a/src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue b/src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue
new file mode 100644
index 0000000..74ecb38
--- /dev/null
+++ b/src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue
@@ -0,0 +1,184 @@
+<template>
+    <div>
+        <!-- 指标越限详情  -->
+        <el-dialog draggable title="指标越限详情" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select
+                            v-model="tableStore.table.params.lineId"
+                            placeholder="请选择监测点"
+                            style="width: 150px"
+                        >
+                            <el-option
+                                v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" @close="onHarmonicRatioClose" :TrendList="TrendList" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide,nextTick } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import HarmonicRatio‌ from '@/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue'
+import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+
+const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
+
+const options = ref()
+const height = mainHeight(0, 2).height as any
+const tableHeaderRef = ref()
+const TrendList = ref([{lineType:1}])
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 26; i++) {
+        list.push({
+            title: i + '次',
+            field: key + i + 'Overtime',
+            width: '80',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
+            }
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/harmonic-boot/mainLine/statLimitRateDetails',
+    method: 'POST',
+    publicHeight: 30,
+    showPage: false,
+    exportName: '主要监测点列表',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '日期',
+            field: 'time',
+            width: '150',
+            sortable: true
+        },
+        {
+            title: '名称',
+            field: 'lineName',
+            width: '150'
+        },
+        {
+            title: '闪变越限(分钟)',
+            field: 'flickerOvertime',
+            width: '80',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('iharm')
+        },
+        {
+            title: '三相不平衡度越限(分钟)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '电压偏差越限(分钟)',
+            field: 'uaberranceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '频率偏差越限(分钟)',
+            field: 'freqDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+            }
+        }
+    ],
+     beforeSearchFun: () => {
+    },
+    loadCallback: () => {
+    }
+})
+
+
+provide('tableStore', tableStore)
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+    dialogVisible.value = true
+    initCSlineList()
+    tableStore.table.params.lineId = row.lineId
+
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime =searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+    })
+
+}
+
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    if (column.field != 'name' && column.field != 'time') {
+        dialogVisible.value = false
+        // if(column.title && column.title=='闪变越限(分钟)'){
+        //     column.title = '1次'
+        // }
+        // harmonicRatio‌Ref.value.openDialog(row,column.title.replace(/次/g, ""))
+        harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+    }
+}
+
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+    // 重新打开指标越限详情弹窗
+    nextTick(() => {
+        dialogVisible.value = true
+    })
+}
+
+const initCSlineList = async () => {
+    const res = await cslineList({})
+    options.value = res.data
+}
+
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/components/cockpit/gridSideStatistics/index.vue b/src/components/cockpit/gridSideStatistics/index.vue
index aa8a9cf..8ec42cb 100644
--- a/src/components/cockpit/gridSideStatistics/index.vue
+++ b/src/components/cockpit/gridSideStatistics/index.vue
@@ -26,7 +26,7 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { getTimeOfTheMonth } from '@/utils/formatTime'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import OverLimitDetails from '@/components/cockpit/gridSideStatistics/components/overLimitDetails.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
diff --git a/src/components/cockpit/listOfMainMonitoringPoints/index.vue b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
index cf6838c..0105dcd 100644
--- a/src/components/cockpit/listOfMainMonitoringPoints/index.vue
+++ b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
@@ -3,6 +3,21 @@
         <!--指标拟合图 -->
         <TableHeader :showReset="false" datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
+                <el-form-item label="监测点">
+                    <el-select
+                        v-model="tableStore.table.params.lineId"
+                        placeholder="请选择监测点"
+                        clearable
+                        style="width: 130px"
+                    >
+                        <el-option
+                            v-for="item in lineList"
+                            :key="item.lineId"
+                            :label="item.name"
+                            :value="item.lineId"
+                        />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="用户功率">
                     <el-select
                         v-model="tableStore.table.params.power"
@@ -72,6 +87,7 @@ import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
+import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
 
 const prop = defineProps({
     w: { type: String },
@@ -82,10 +98,12 @@ const prop = defineProps({
     timeValue: { type: Object }
 })
 
-
 const route = useRoute()
 const timeCacheStore = useTimeCacheStore()
 const config = useConfig()
+
+const lineList: any = ref()
+
 const powerList: any = ref([
     {
         label: '三相总有功功率',
@@ -101,6 +119,7 @@ const fullscreen = computed(() => {
     const w = Number(prop.w)
     const h = Number(prop.h)
     if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        initLineList()
         // 执行相应逻辑
         return true
     } else {
@@ -135,6 +154,16 @@ const indicatorList: any = ref([
         value: '4'
     }
 ])
+
+const initLineList = async () => {
+    cslineList({}).then(res => {
+        lineList.value = res.data
+        if (lineList.value && lineList.value.length > 0) {
+            tableStore.table.params.lineId = lineList.value[0].lineId
+        }
+    })
+}
+
 const echartList = ref({
     title: {
         text: '谐波电压总畸变率越限与功率负荷曲线拟合图'
@@ -249,7 +278,7 @@ const tableStore: any = new TableStore({
     showPage: false,
     exportName: '主要监测点列表',
     column: [],
-       beforeSearchFun: () => {
+    beforeSearchFun: () => {
         // 尝试从缓存获取时间值
         let beginTime, endTime
 
@@ -262,9 +291,11 @@ const tableStore: any = new TableStore({
         }
 
         // 如果缓存中没有则使用默认值
-        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-
-        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0]
+        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1]
+        if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
+            tableStore.table.params.lineId = lineList.value[0].lineId
+        }
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
diff --git a/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue b/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue
new file mode 100644
index 0000000..74ecb38
--- /dev/null
+++ b/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue
@@ -0,0 +1,184 @@
+<template>
+    <div>
+        <!-- 指标越限详情  -->
+        <el-dialog draggable title="指标越限详情" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select
+                            v-model="tableStore.table.params.lineId"
+                            placeholder="请选择监测点"
+                            style="width: 150px"
+                        >
+                            <el-option
+                                v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" @close="onHarmonicRatioClose" :TrendList="TrendList" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide,nextTick } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import HarmonicRatio‌ from '@/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue'
+import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+
+const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
+
+const options = ref()
+const height = mainHeight(0, 2).height as any
+const tableHeaderRef = ref()
+const TrendList = ref([{lineType:1}])
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 26; i++) {
+        list.push({
+            title: i + '次',
+            field: key + i + 'Overtime',
+            width: '80',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
+            }
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/harmonic-boot/mainLine/statLimitRateDetails',
+    method: 'POST',
+    publicHeight: 30,
+    showPage: false,
+    exportName: '主要监测点列表',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '日期',
+            field: 'time',
+            width: '150',
+            sortable: true
+        },
+        {
+            title: '名称',
+            field: 'lineName',
+            width: '150'
+        },
+        {
+            title: '闪变越限(分钟)',
+            field: 'flickerOvertime',
+            width: '80',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('iharm')
+        },
+        {
+            title: '三相不平衡度越限(分钟)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '电压偏差越限(分钟)',
+            field: 'uaberranceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '频率偏差越限(分钟)',
+            field: 'freqDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+            }
+        }
+    ],
+     beforeSearchFun: () => {
+    },
+    loadCallback: () => {
+    }
+})
+
+
+provide('tableStore', tableStore)
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+    dialogVisible.value = true
+    initCSlineList()
+    tableStore.table.params.lineId = row.lineId
+
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime =searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+    })
+
+}
+
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    if (column.field != 'name' && column.field != 'time') {
+        dialogVisible.value = false
+        // if(column.title && column.title=='闪变越限(分钟)'){
+        //     column.title = '1次'
+        // }
+        // harmonicRatio‌Ref.value.openDialog(row,column.title.replace(/次/g, ""))
+        harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+    }
+}
+
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+    // 重新打开指标越限详情弹窗
+    nextTick(() => {
+        dialogVisible.value = true
+    })
+}
+
+const initCSlineList = async () => {
+    const res = await cslineList({})
+    options.value = res.data
+}
+
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/components/cockpit/monitoringPointList/index.vue b/src/components/cockpit/monitoringPointList/index.vue
index eb17e26..b347124 100644
--- a/src/components/cockpit/monitoringPointList/index.vue
+++ b/src/components/cockpit/monitoringPointList/index.vue
@@ -14,7 +14,7 @@ import Table from '@/components/table/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { ElTag } from 'element-plus'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import OverLimitDetails from '@/components/cockpit/monitoringPointList/components/overLimitDetails.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
diff --git a/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue b/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue
index 166ed96..79d8024 100644
--- a/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue
+++ b/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue
@@ -1,449 +1,709 @@
 <template>
-    <!-- 总体指标占比详情谐波含有率 -->
     <el-dialog draggable title="谐波电压/电流含有率" v-model="dialogVisible" append-to-body width="70%">
-        <TableHeader datePicker showExport :showReset="false" @selectChange="selectChange">
-            <template v-slot:select>
-                <el-form-item label="谐波次数">
-                    <el-select
-                        v-model="tableStore.table.params.searchValue"
-                        placeholder="请选择谐波次数"
-                        style="width: 150px"
-                    >
-                        <el-option
-                            v-for="item in harmonicOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="指标类型" v-show="!tableStore.table.params.checked">
-                    <el-select
-                        v-model="tableStore.table.params.indicatorType"
-                        placeholder="请选择指标类型"
-                        style="width: 150px"
-                    >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="指标类型1" v-show="tableStore.table.params.checked == true">
-                    <el-select
-                        v-model="tableStore.table.params.indicatorType1"
-                        placeholder="请选择指标类型1"
-                        style="width: 150px"
-                    >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="指标类型2" v-show="tableStore.table.params.checked == true">
-                    <el-select
-                        v-model="tableStore.table.params.indicatorType2"
-                        placeholder="请选择指标类型2"
-                        style="width: 150px"
-                    >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-checkbox v-model="tableStore.table.params.checked">指标对比分析</el-checkbox>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <my-echart
-            class="tall"
-            v-if="!tableStore.table.params.checked"
-            :options="echartList"
-            style="width: 98%; height: 320px"
-        />
-        <my-echart class="tall" v-else :options="echartContrastList" style="width: 98%; height: 320px" />
+        <!-- 总体指标占比详情谐波含有率 -->
+        <div>
+            <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
+                <template v-slot:select>
+                    <el-form-item>
+                        <DatePicker ref="datePickerRef"></DatePicker>
+                    </el-form-item>
+                    <el-form-item label="统计指标" label-width="80px">
+                        <el-select
+                            multiple
+                            :multiple-limit="2"
+                            collapse-tags
+                            collapse-tags-tooltip
+                            v-model="searchForm.index"
+                            placeholder="请选择统计指标"
+                            @change="onIndexChange($event)"
+                        >
+                            <el-option
+                                v-for="item in indexOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-radio-group v-model="searchForm.dataLevel" @change="init()">
+                            <el-radio-button label="一次值" value="Primary" />
+                            <el-radio-button label="二次值" value="Secondary" />
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="统计类型">
+                        <el-select
+                            style="min-width: 120px !important"
+                            placeholder="请选择"
+                            v-model="searchForm.valueType"
+                        >
+                            <el-option value="max" label="最大值"></el-option>
+                            <el-option value="min" label="最小值"></el-option>
+                            <el-option value="avg" label="平均值"></el-option>
+                            <el-option value="cp95" label="cp95"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <div
+                            class="history_count"
+                            v-for="(item, index) in countData"
+                            :key="index"
+                            v-show="item.countOptions.length != 0"
+                        >
+                            <span class="mr12">
+                                {{ item.name.includes('次数') ? item.name : item.name + '谐波次数' }}
+                            </span>
+                            <el-select
+                                v-model="item.count"
+                                @change="onCountChange($event, index)"
+                                placeholder="请选择谐波次数"
+                                style="width: 100px"
+                                class="mr20"
+                            >
+                                <el-option
+                                    v-for="vv in item.countOptions"
+                                    :key="vv"
+                                    :label="vv"
+                                    :value="vv"
+                                ></el-option>
+                            </el-select>
+                        </div>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button type="primary" icon="el-icon-Search" @click="init()">查询</el-button>
+                    <el-button :type="timeControl ? 'primary' : ''" icon="el-icon-Sort" @click="setTimeControl">
+                        缺失数据
+                    </el-button>
+                </template>
+            </TableHeader>
+        </div>
+        <div class="history_chart" :style="pageHeight" v-loading="loading">
+            <MyEchart
+                ref="historyChart"
+                :options="echartsData"
+                v-if="showEchart"
+            />
+            <el-empty :style="pageHeight" v-else description="暂无数据" />
+        </div>
     </el-dialog>
 </template>
-
-<script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h } from 'vue'
-import TableStore from '@/utils/tableStore'
-import TableHeader from '@/components/table/header/index.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+<script lang="ts" setup>
+import { mainHeight } from '@/utils/layout'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { ref, onMounted, watch } from 'vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useConfig } from '@/stores/config'
-const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+import { useDictData } from '@/stores/dictData'
+import { queryStatistical } from '@/api/system-boot/csstatisticalset'
+import { yMethod, exportCSV, completeTimeSeries } from '@/utils/echartMethod'
+import TableHeader from '@/components/table/header/index.vue'
+import { trendData } from '@/api/harmonic-boot/cockpit/cockpit'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import { color } from '@/components/echarts/color'
+import { ElMessage } from 'element-plus'
+const dictData = useDictData()
+defineOptions({
+    // name: 'govern/device/control'
+})
+const props = defineProps({
+    TrendList: {
+        type: Array
+    }
 })
 
 const dialogVisible: any = ref(false)
-
-const options = [
+// console.log("🚀 ~ props:", props.TrendList)
+const showEchart = ref(true)
+const num = ref(0)
+const timeControl = ref(false)
+//值类型
+const pageHeight = ref(mainHeight(332))
+const loading = ref(true)
+const searchForm: any = ref({})
+const tableHeaderRef = ref()
+const typeOptions = [
     {
-        value: '35kV进线',
-        label: '35kV进线'
+        name: '平均值',
+        id: 'avg'
+    },
+    {
+        name: '最大值',
+        id: 'max'
+    },
+    {
+        name: '最小值',
+        id: 'min'
+    },
+    {
+        name: 'CP95值',
+        id: 'cp95'
     }
 ]
-
-const config = useConfig()
-
-const harmonicOptions = Array.from({ length: 50 }, (_, i) => ({
-    value: String(i + 1),
-    label: `${i + 1}次谐波`
-}))
-
-const exceedingTheLimitList: any = ref([
-    {
-        label: '越限',
-        value: '1'
-    },
-    {
-        label: '不越限',
-        value: '0'
-    }
-])
-const indicatorList: any = ref([
-    {
-        label: '谐波电压总畸变率',
-        value: '1'
-    },
-    {
-        label: '各次谐波电压',
-        value: '2'
-    },
-    {
-        label: '各次谐波电压',
-        value: '3'
-    },
-    {
-        label: '三相电压不平衡',
-        value: '4'
-    }
-])
-const echartList = ref({
-    title: {
-        text: '谐波电压含有率'
-    },
-    xAxis: {
-        type: 'time',
-        axisLabel: {
-            formatter: {
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
-            }
-        }
-    },
-    yAxis: [{}, {}],
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                name: 'A相',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 0.5],
-                    ['2025-10-16 07:15:00', 0.6],
-                    ['2025-10-16 07:30:00', 0.4],
-                    ['2025-10-16 07:45:00', 0.7],
-                    ['2025-10-16 08:00:00', 1.2],
-                    ['2025-10-16 08:15:00', 1.5],
-                    ['2025-10-16 08:30:00', 1.8],
-                    ['2025-10-16 08:45:00', 2.1],
-                    ['2025-10-16 09:00:00', 2.5],
-                    ['2025-10-16 09:15:00', 2.8],
-                    ['2025-10-16 09:30:00', 3.0],
-                    ['2025-10-16 09:45:00', 2.7],
-                    ['2025-10-16 10:00:00', 2.2],
-                    ['2025-10-16 10:15:00', 1.9],
-                    ['2025-10-16 10:30:00', 1.6],
-                    ['2025-10-16 10:45:00', 1.3],
-                    ['2025-10-16 11:00:00', 1.1],
-                    ['2025-10-16 11:15:00', 0.8],
-                    ['2025-10-16 11:30:00', 0.6],
-                    ['2025-10-16 11:45:00', 0.4],
-                    ['2025-10-16 12:00:00', 0.3],
-                    ['2025-10-16 12:15:00', 0.2],
-                    ['2025-10-16 12:30:00', 0.3],
-                    ['2025-10-16 12:45:00', 0.4]
-                ],
-                yAxisIndex: 0
-            },
-            {
-                name: 'B相',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 0.4],
-                    ['2025-10-16 07:15:00', 0.5],
-                    ['2025-10-16 07:30:00', 0.3],
-                    ['2025-10-16 07:45:00', 0.6],
-                    ['2025-10-16 08:00:00', 1.0],
-                    ['2025-10-16 08:15:00', 1.3],
-                    ['2025-10-16 08:30:00', 1.6],
-                    ['2025-10-16 08:45:00', 1.9],
-                    ['2025-10-16 09:00:00', 2.2],
-                    ['2025-10-16 09:15:00', 2.5],
-                    ['2025-10-16 09:30:00', 2.7],
-                    ['2025-10-16 09:45:00', 2.4],
-                    ['2025-10-16 10:00:00', 2.0],
-                    ['2025-10-16 10:15:00', 1.7],
-                    ['2025-10-16 10:30:00', 1.4],
-                    ['2025-10-16 10:45:00', 1.1],
-                    ['2025-10-16 11:00:00', 0.9],
-                    ['2025-10-16 11:15:00', 0.7],
-                    ['2025-10-16 11:30:00', 0.5],
-                    ['2025-10-16 11:45:00', 0.3],
-                    ['2025-10-16 12:00:00', 0.2],
-                    ['2025-10-16 12:15:00', 0.1],
-                    ['2025-10-16 12:30:00', 0.2],
-                    ['2025-10-16 12:45:00', 0.3]
-                ],
-                yAxisIndex: 0
-            },
-            {
-                name: 'C相',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 0.6],
-                    ['2025-10-16 07:15:00', 0.7],
-                    ['2025-10-16 07:30:00', 0.5],
-                    ['2025-10-16 07:45:00', 0.8],
-                    ['2025-10-16 08:00:00', 1.4],
-                    ['2025-10-16 08:15:00', 1.7],
-                    ['2025-10-16 08:30:00', 2.0],
-                    ['2025-10-16 08:45:00', 2.3],
-                    ['2025-10-16 09:00:00', 2.8],
-                    ['2025-10-16 09:15:00', 3.1],
-                    ['2025-10-16 09:30:00', 3.3],
-                    ['2025-10-16 09:45:00', 3.0],
-                    ['2025-10-16 10:00:00', 2.5],
-                    ['2025-10-16 10:15:00', 2.1],
-                    ['2025-10-16 10:30:00', 1.8],
-                    ['2025-10-16 10:45:00', 1.5],
-                    ['2025-10-16 11:00:00', 1.3],
-                    ['2025-10-16 11:15:00', 1.0],
-                    ['2025-10-16 11:30:00', 0.8],
-                    ['2025-10-16 11:45:00', 0.6],
-                    ['2025-10-16 12:00:00', 0.5],
-                    ['2025-10-16 12:15:00', 0.4],
-                    ['2025-10-16 12:30:00', 0.5],
-                    ['2025-10-16 12:45:00', 0.6]
-                ],
-                yAxisIndex: 0
-            },
-            {
-                name: '暂降触发点',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 3.14159],
-                    ['2025-10-16 07:15:00', 3.14159],
-                    ['2025-10-16 07:30:00', 3.14159],
-                    ['2025-10-16 07:45:00', 3.14159],
-                    ['2025-10-16 08:00:00', 3.14159],
-                    ['2025-10-16 08:15:00', 3.14159],
-                    ['2025-10-16 08:30:00', 3.14159],
-                    ['2025-10-16 08:45:00', 3.14159],
-                    ['2025-10-16 09:00:00', 3.14159],
-                    ['2025-10-16 09:15:00', 3.14159],
-                    ['2025-10-16 09:30:00', 3.14159],
-                    ['2025-10-16 09:45:00', 3.14159],
-                    ['2025-10-16 10:00:00', 3.14159],
-                    ['2025-10-16 10:15:00', 3.14159],
-                    ['2025-10-16 10:30:00', 3.14159],
-                    ['2025-10-16 10:45:00', 3.14159],
-                    ['2025-10-16 11:00:00', 3.14159],
-                    ['2025-10-16 11:15:00', 3.14159],
-                    ['2025-10-16 11:30:00', 3.14159],
-                    ['2025-10-16 11:45:00', 3.14159],
-                    ['2025-10-16 12:00:00', 3.14159],
-                    ['2025-10-16 12:15:00', 3.14159],
-                    ['2025-10-16 12:30:00', 3.14159],
-                    ['2025-10-16 12:45:00', 3.14159]
-                ],
-                lineStyle: {
-                    type: 'dashed',
-                    color: '#ff0000' // 红色
-                },
-                itemStyle: {
-                    color: '#ff0000' // 红色
-                },
-                yAxisIndex: 0
-            }
-        ]
-    }
-})
-
-const echartContrastList = ref({
-    title: {
-        text: 'A相谐波电压和A相谐波电流对比趋势图'
-    },
-    xAxis: {
-        type: 'time',
-        axisLabel: {
-            formatter: {
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
-            }
-        }
-    },
-    yAxis: [{}, {}],
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                name: 'A相谐波电压',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 0],
-                    ['2025-10-16 07:15:00', 0],
-                    ['2025-10-16 07:30:00', 0],
-                    ['2025-10-16 07:45:00', 0],
-                    ['2025-10-16 08:00:00', 0],
-                    ['2025-10-16 08:15:00', 0.1],
-                    ['2025-10-16 08:30:00', 0.1],
-                    ['2025-10-16 08:45:00', 0.1],
-                    ['2025-10-16 09:00:00', 1],
-                    ['2025-10-16 09:15:00', 1],
-                    ['2025-10-16 09:30:00', 1],
-                    ['2025-10-16 09:45:00', 1],
-                    ['2025-10-16 10:00:00', 0.8],
-                    ['2025-10-16 10:15:00', 0.8],
-                    ['2025-10-16 10:30:00', 0.8],
-                    ['2025-10-16 10:45:00', 0.8],
-                    ['2025-10-16 11:00:00', 0.8],
-                    ['2025-10-16 11:15:00', 0.1],
-                    ['2025-10-16 11:30:00', 0.1],
-                    ['2025-10-16 11:45:00', 0.1],
-                    ['2025-10-16 12:00:00', 0],
-                    ['2025-10-16 12:15:00', 0],
-                    ['2025-10-16 12:30:00', 0],
-                    ['2025-10-16 12:45:00', 0]
-                ],
-                yAxisIndex: 0
-            },
-            {
-                name: 'A相谐波电流',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 0],
-                    ['2025-10-16 07:15:00', 0],
-                    ['2025-10-16 07:30:00', 0],
-                    ['2025-10-16 07:45:00', 0],
-                    ['2025-10-16 08:00:00', 0],
-                    ['2025-10-16 08:15:00', 0.05],
-                    ['2025-10-16 08:30:00', 0.05],
-                    ['2025-10-16 08:45:00', 0.05],
-                    ['2025-10-16 09:00:00', 0.5],
-                    ['2025-10-16 09:15:00', 0.5],
-                    ['2025-10-16 09:30:00', 0.5],
-                    ['2025-10-16 09:45:00', 0.5],
-                    ['2025-10-16 10:00:00', 0.4],
-                    ['2025-10-16 10:15:00', 0.4],
-                    ['2025-10-16 10:30:00', 0.4],
-                    ['2025-10-16 10:45:00', 0.4],
-                    ['2025-10-16 11:00:00', 0.4],
-                    ['2025-10-16 11:15:00', 0.05],
-                    ['2025-10-16 11:30:00', 0.05],
-                    ['2025-10-16 11:45:00', 0.05],
-                    ['2025-10-16 12:00:00', 0],
-                    ['2025-10-16 12:15:00', 0],
-                    ['2025-10-16 12:30:00', 0],
-                    ['2025-10-16 12:45:00', 0]
-                ],
-                yAxisIndex: 1
-            }
-        ]
-    }
-})
-
-const headerHeight = ref(57)
-const selectChange = (showSelect: any, height: any) => {
-    headerHeight.value = height
+searchForm.value = {
+    index: [],
+    type: typeOptions[0].id,
+    count: '',
+    searchBeginTime: '',
+    searchEndTime: '',
+    dataLevel: 'Primary',
+    valueType: 'avg'
 }
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
+//统计指标
+const indexOptions: any = ref([])
+//谐波次数
+const countOptions: any = ref([])
+// Harmonic_Type
+// portable-harmonic
+const legendDictList: any = ref([])
 
-    showPage: false,
-    exportName: '主要监测点列表',
-    column: [],
-    beforeSearchFun: () => {},
-    loadCallback: () => {
-        tableStore.table.height = `calc(${prop.height} - 80px)`
+const initCode = (field: string, title: string) => {
+    queryByCode('steady_state_power_quality').then(res => {
+        queryCsDictTree(res.data.id).then(item => {
+            //排序
+            indexOptions.value = item.data.sort((a: any, b: any) => {
+                return a.sort - b.sort
+            })
+            const titleMap: Record<string, number> = {
+                flickerOvertime: 0,
+                uaberranceOvertime: 3,
+                ubalanceOvertime: 4,
+                freqDevOvertime: 5
+            }
+
+            let defaultIndex = 0 // 默认值
+
+            if (field in titleMap) {
+                defaultIndex = titleMap[field]
+            } else if (field.includes('uharm')) {
+                defaultIndex = 1
+            } else if (field.includes('iharm')) {
+                defaultIndex = 2
+            }
+
+            searchForm.value.index[0] = indexOptions.value[defaultIndex].id
+        })
+        queryStatistical(res.data.id).then(vv => {
+            legendDictList.value = vv.data
+            indexOptions.value.map((item: any, index: any) => {
+                if (!countDataCopy.value[index]) {
+                    countDataCopy.value[index] = {
+                        index: item.id,
+                        countOptions: [],
+                        count: [],
+                        name: indexOptions.value.find((vv: any) => {
+                            return vv.id == item.id
+                        })?.name
+                    }
+                }
+                legendDictList.value?.selectedList?.map((vv: any, vvs: any) => {
+                    //查找相等的指标
+                    if (item.id == vv.dataType) {
+                        vv.eleEpdPqdVOS.map((kk: any, kks: any) => {
+                            if (kk.harmStart && kk.harmEnd) {
+                                range(0, 0, 0)
+
+                                if (kk.showName == '间谐波电压含有率') {
+                                    countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
+                                        (item: any) => {
+                                            return item - 0.5
+                                        }
+                                    )
+                                } else {
+                                    countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
+                                }
+                                if (title && countDataCopy.value[index].countOptions.includes(Number(title))) {
+                                    countDataCopy.value[index].count = Number(title)
+                                } else if (title && countDataCopy.value[index].countOptions.includes(title)) {
+                                    countDataCopy.value[index].count = title
+                                } else if (
+                                    !countDataCopy.value[index].count ||
+                                    countDataCopy.value[index].count.length == 0
+                                ) {
+                                    // 只有当count为空时才设置默认值
+                                    countDataCopy.value[index].count = countDataCopy.value[index].countOptions[0]
+                                }
+                            }
+                        })
+                    }
+                })
+            })
+            nextTick(() => {
+                formatCountOptions()
+            })
+            init()
+        })
+    })
+}
+
+const chartsList = ref<any>([])
+const chartTitle: any = ref('')
+const echartsData = ref<any>(null)
+//加载echarts图表
+//历史趋势数据
+const historyDataList: any = ref([])
+const range = (start: any, end: any, step: any) => {
+    return Array.from({ length: (end - start) / step + 1 }, (_, i) => start + i * step)
+}
+//获取请求趋势数据参数
+const trendRequestData = ref()
+const getTrendRequest = (val: any) => {
+    trendRequestData.value = val
+    // init()
+}
+//初始化趋势图
+const headerRef = ref()
+const datePickerRef = ref()
+const lineStyle = [{ type: 'solid' }, { type: 'dashed' }, { type: 'dotted' }]
+const init = async () => {
+    loading.value = true
+    // 选择指标的时候切换legend内容和data数据
+    let list: any = []
+    legendDictList.value?.selectedList?.map((item: any) => {
+        searchForm.value.index.map((vv: any) => {
+            if (item.dataType == vv) {
+                list.push(item.eleEpdPqdVOS)
+            }
+        })
+    })
+
+    //颜色数组
+    const colorList = color
+    //选择的指标使用方法处理
+    formatCountOptions()
+    //查询历史趋势
+    historyDataList.value = []
+    chartTitle.value = ''
+
+    searchForm.value.index.map((item: any, indexs: any) => {
+        indexOptions.value.map((vv: any) => {
+            if (vv.id == item) {
+                chartTitle.value += indexs == searchForm.value.index.length - 1 ? vv.name : vv.name + '/'
+            }
+        })
+    })
+    let lists: any = []
+    let frequencys: any = null
+    countData.value.map((item: any, index: any) => {
+        if (item.name.includes('谐波含有率')) {
+            frequencys = item.count
+        } else {
+            frequencys = ''
+        }
+        lists[index] = {
+            statisticalId: item.index,
+             frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : ''
+        }
+    })
+    let obj = {
+        //...trendRequestData.value,
+        lineId: trendRequestData.value.lineId,
+        list: lists,
+        dataLevel: searchForm.value.dataLevel,
+        valueType: searchForm.value.valueType,
+        searchBeginTime: datePickerRef.value && datePickerRef.value.timeValue[0],
+        searchEndTime: datePickerRef.value && datePickerRef.value.timeValue[1]
     }
-})
-
-const tableRef = ref()
-provide('tableRef', tableRef)
-tableStore.table.params.power = '1'
-tableStore.table.params.indicator = '1'
-tableStore.table.params.exceedingTheLimit = '1'
-tableStore.table.params.searchValue = ''
-tableStore.table.params.checked = false
-tableStore.table.params.indicatorType = '' // 指标类型
-tableStore.table.params.indicatorType1 = '' // 指标类型1
-tableStore.table.params.indicatorType2 = '' // 指标类型2
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-watch(
-    () => prop.timeKey,
-    val => {
-        tableStore.index()
+    if (searchForm.value.index.length == 0) {
+        ElMessage.warning('请选择统计指标')
+        loading.value = false
+        return
     }
-)
+    if (obj.list.length != 0) {
+        try {
+            showEchart.value = true
+            await trendData(obj)
+                .then((res: any) => {
+                    if (res.code == 'A0000') {
+                        if (res.data.length == 0) {
+                            loading.value = false
+                            showEchart.value = false
+                            return
+                        }
+                        historyDataList.value = res.data
+                        chartsList.value = JSON.parse(JSON.stringify(res.data))
+                        loading.value = false
+                        setEchart()
+                    }
+                })
+                .catch(error => {
+                    loading.value = false
+                })
+        } catch (error) {
+            loading.value = false
+        }
+    }
+}
+const setEchart = () => {
+    loading.value = true
+    echartsData.value = {}
+    //icon图标替换legend图例
+
+    // y轴单位数组
+    let unitList: any = []
+
+    let groupedData = chartsList.value.reduce((acc: any, item: any) => {
+        let key = ''
+        if (item.phase == null) {
+            key = item.unit
+        } else {
+            key = item.anotherName
+        }
+
+        if (!acc[key]) {
+            acc[key] = []
+        }
+        acc[key].push(item)
+        return acc
+    }, {})
+    let result = Object.values(groupedData)
+    if (chartsList.value.length > 0) {
+        unitList = result.map((item: any) => {
+            return item[0].unit
+        })
+    }
+
+    echartsData.value = {
+        legend: {
+            itemWidth: 20,
+            itemHeight: 20,
+            itemStyle: { opacity: 0 }, //去圆点
+            type: 'scroll', // 开启滚动分页
+            // orient: 'vertical', // 垂直排列
+            top: 5,
+            right: 70
+            // width: 550,
+            // height: 50
+        },
+        grid: {
+            top: '80px'
+        },
+        tooltip: {
+            axisPointer: {
+                type: 'cross',
+                label: {
+                    color: '#fff',
+                    fontSize: 16
+                }
+            },
+            textStyle: {
+                color: '#fff',
+                fontStyle: 'normal',
+                opacity: 0.35,
+                fontSize: 14
+            },
+            backgroundColor: 'rgba(0,0,0,0.55)',
+            borderWidth: 0,
+            formatter(params: any) {
+                const xname = params[0].value[0]
+                let str = `${xname}<br>`
+                params.forEach((el: any, index: any) => {
+                    let marker = ''
+
+                    if (el.value[3] == 'dashed') {
+                        for (let i = 0; i < 3; i++) {
+                            marker += `<span style="display:inline-block;border: 2px ${el.color} solid;margin-right:5px;width:10px;height:0px;background-color:#ffffff00;"></span>`
+                        }
+                    } else {
+                        marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
+                    }
+                    let unit = el.value[2] ? el.value[2] : ''
+                    str += `${marker}${el.seriesName.split('(')[0]}：${el.value[1]}${unit}
+                                            <br>`
+                })
+                return str
+            }
+        },
+        color: ['#DAA520', '#2E8B57', '#A52a2a', ...color],
+        xAxis: {
+            type: 'time',
+            axisLabel: {
+                formatter: {
+                    day: '{MM}-{dd}',
+                    month: '{MM}',
+                    year: '{yyyy}'
+                }
+            }
+        },
+        yAxis: [{}],
+        toolbox: {
+            featureProps: {
+                myTool1: {
+                    show: true,
+                    title: '下载csv',
+                    icon: 'path://M588.8 551.253333V512H352v39.253333h236.373333z m0 78.933334v-39.253334H352v39.253334h236.373333z m136.533333 78.933333V334.933333l-157.866666-157.866666H273.066667A59.306667 59.306667 0 0 0 213.333333 236.373333v551.253334a59.306667 59.306667 0 0 0 59.306667 59.306666h274.773333v42.666667H853.333333v-180.48zM568.746667 234.666667l100.266666 100.693333h-81.066666a20.053333 20.053333 0 0 1-19.626667-20.053333z m-20.48 573.013333H273.066667a19.2 19.2 0 0 1-17.493334-19.626667V236.373333a19.2 19.2 0 0 1 19.626667-19.626666h256v98.133333a58.88 58.88 0 0 0 58.88 59.306667h96.426667v334.933333h-98.133334v-39.68H352v39.68h196.266667z m100.266666 23.04a37.973333 37.973333 0 0 1-32 15.786667 38.826667 38.826667 0 0 1-32.426666-15.786667 53.76 53.76 0 0 1-10.24-32.853333 42.666667 42.666667 0 0 1 42.666666-47.786667 35.84 35.84 0 0 1 37.546667 29.866667h-12.8a23.893333 23.893333 0 0 0-24.746667-19.2c-17.066667 0-29.013333 14.08-29.013333 35.84s11.52 37.546667 28.586667 37.546666a26.453333 26.453333 0 0 0 26.453333-25.6h12.8a39.253333 39.253333 0 0 1-7.253333 22.186667z m59.733334 15.786667a35.84 35.84 0 0 1-40.106667-34.56H682.666667a23.893333 23.893333 0 0 0 26.88 23.04c12.8 0 22.613333-6.4 22.613333-15.786667s-4.266667-11.52-14.506667-13.653333l-21.333333-5.12c-17.066667-4.266667-24.32-11.52-24.32-23.893334s12.8-26.453333 34.133333-26.453333a31.573333 31.573333 0 0 1 35.413334 30.293333h-13.653334a19.626667 19.626667 0 0 0-22.613333-18.773333c-12.8 0-20.48 5.12-20.48 12.8s5.12 11.093333 17.066667 13.653333l14.933333 2.986667a42.666667 42.666667 0 0 1 20.906667 8.96 23.893333 23.893333 0 0 1 7.68 17.92c-0.426667 17.066667-14.506667 28.16-37.12 28.16z m88.746666 0h-14.506666l-32.426667-92.16h14.08l19.626667 59.733333 6.4 20.053333c0-9.386667 3.413333-12.8 5.546666-20.053333l19.2-59.733333h14.08z',
+                    onclick: e => {
+                        // console.log("🚀 ~ init ~ echartsData.value:", echartsData.value.options.series.map(item => item.data))
+
+                        let list = echartsData.value.options.series?.map((item: any) => item.data)
+                        let dataList = list[0]?.map((item: any, index: any) => {
+                            let value = [item[0], item[1]]
+                            list.forEach((item1: any, index1: any) => {
+                                if (index1 > 0) {
+                                    value.push(item1 && item1[index] ? item1[index][1] : null)
+                                }
+                            })
+
+                            return value
+                        })
+                        exportCSV(
+                            echartsData.value.options.series.map((item: any) => item.name),
+                            dataList,
+                            '监测点指标趋势.csv'
+                        )
+                    }
+                }
+            }
+        },
+        options: {
+            series: []
+        }
+    }
+    // console.log("🚀 ~ unitList.forEach ~ unitList:", unitList)
+
+    if (chartsList.value.length > 0) {
+        let yData: any = []
+        echartsData.value.yAxis = []
+        let setList = [...new Set(unitList)]
+
+        setList.forEach((item: any, index: any) => {
+            if (index > 2) {
+                echartsData.value.grid.right = (index - 1) * 80
+            }
+            yData.push([])
+            let right = {
+                position: 'right',
+                offset: (index - 1) * 80
+            }
+            // console.log("🚀 ~ unitList.forEach ~ right.index:", index)
+            echartsData.value.yAxis.push({
+                name: item,
+                yAxisIndex: index,
+                splitNumber: 5,
+                minInterval: 1,
+                splitLine: {
+                    show: false
+                },
+                ...(index > 0 ? right : null)
+            })
+        })
+        // console.log("🚀 ~ result.forEach ~ result:", result)
+        // '电压负序分量', '电压正序分量', '电压零序分量'
+        let ABCName = [
+            ...new Set(
+                chartsList.value.map((item: any) => {
+                    return item.anotherName == '电压负序分量'
+                        ? '电压不平衡'
+                        : item.anotherName == '电压正序分量'
+                        ? '电压不平衡'
+                        : item.anotherName == '电压零序分量'
+                        ? '电压不平衡'
+                        : item.anotherName
+                })
+            )
+        ]
+        // console.log("🚀 ~ .then ~ ABCName:", ABCName)
+        result.forEach((item: any, index: any) => {
+            let yMethodList: any = []
+
+            let ABCList = Object.values(
+                item.reduce((acc, item) => {
+                    let key = ''
+                    if (item.phase == null) {
+                        key = item.anotherName
+                    } else {
+                        key = item.phase
+                    }
+
+                    if (!acc[key]) {
+                        acc[key] = []
+                    }
+                    acc[key].push(item)
+                    return acc
+                }, {})
+            )
+            // console.log("🚀 ~ ABCList.forEach ~ ABCList:", ABCList)
+
+            ABCList.forEach((kk: any) => {
+                let colorName = kk[0].phase?.charAt(0).toUpperCase()
+                let lineS = ABCName.findIndex(
+                    item =>
+                        item ===
+                        (kk[0].anotherName == '电压负序分量'
+                            ? '电压不平衡'
+                            : kk[0].anotherName == '电压正序分量'
+                            ? '电压不平衡'
+                            : kk[0].anotherName == '电压零序分量'
+                            ? '电压不平衡'
+                            : kk[0].anotherName)
+                )
+
+                let seriesList: any = []
+                kk.forEach((cc: any) => {
+                    if (cc.statisticalData !== null) {
+                        yData[setList.indexOf(kk[0].unit)].push(cc.statisticalData?.toFixed(2))
+                    }
+
+                    seriesList.push([cc.time, cc.statisticalData?.toFixed(2), cc.unit, lineStyle[lineS].type])
+                })
+                // console.log(kk);
+
+                echartsData.value.options.series.push({
+                    name: kk[0].phase ? kk[0].phase + '相' + kk[0].anotherName : kk[0].anotherName,
+                    type: 'line',
+                    smooth: true,
+                    color:
+                        colorName == 'A' ? '#DAA520' : colorName == 'B' ? '#2E8B57' : colorName == 'C' ? '#A52a2a' : '',
+                    symbol: 'none',
+                    // data: seriesList,
+                    data: timeControl.value ? completeTimeSeries(seriesList) : seriesList,
+                    lineStyle: lineStyle[lineS],
+                    yAxisIndex: setList.indexOf(kk[0].unit)
+                })
+            })
+        })
+        yData.forEach((item: any, index: any) => {
+            let [min, max] = yMethod(item)
+            echartsData.value.yAxis[index].min = min
+            echartsData.value.yAxis[index].max = max
+        })
+        // console.log("🚀 ~ result.forEach ~ echartsData.value:", echartsData.value)
+    }
+    loading.value = false
+}
+const setTimeControl = () => {
+    timeControl.value = !timeControl.value
+    setEchart()
+}
+
+const selectChange = (flag: boolean) => {
+    if (flag) {
+        pageHeight.value = mainHeight(372)
+    } else {
+        pageHeight.value = mainHeight(332)
+    }
+}
+//导出
+const historyChart = ref()
+
+const countData: any = ref([])
+const countDataCopy: any = ref([])
+
+//根据选择的指标处理谐波次数
+const formatCountOptions = () => {
+    countData.value = []
+    if (searchForm.value.index.length != 0) {
+        searchForm.value.index.forEach((item: any, index: any) => {
+            countDataCopy.value.forEach((vv: any, vvs: any) => {
+                if (vv.index == item) {
+                    countData.value.push(vv)
+                }
+            })
+        })
+
+        countData.value.map((item: any, key: any) => {
+            if (item.name == '谐波电流有效值') {
+                item.name = '谐波电流次数'
+            } else if (item.name == '谐波电压含有率') {
+                item.name = '谐波电压次数'
+            } else if (item.name == '间谐波电压含有率') {
+                item.name = '间谐波电压次数'
+            }
+        })
+    }
+    // setTimeout(() => {
+    //     tableHeaderRef.value.computedSearchRow()
+    // }, 500)
+}
+// 判断下拉框是否存在
+const onCountChange = (val: any, index: any) => {
+    if (val.length == 0) {
+        countData.value[index].count = countData.value[index].countOptions[0]
+    }
+}
+const flag = ref(true)
+const onIndexChange = (val: any) => {
+    num.value += 1
+    let pp: any = []
+    indexOptions.value.forEach((item: any) => {
+        const filteredResult = val.filter(vv => item.id == vv)
+        if (filteredResult.length > 0) {
+            pp.push(filteredResult[0])
+        }
+    })
+    searchForm.value.index = pp
+    flag.value = true
+    formatCountOptions()
+}
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
-    (newVal, oldVal) => {
-        tableStore.index()
-    },
+    () => searchForm.value.index,
+    (val: any, oldval: any) => {},
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true,
+        immediate: true
     }
 )
 
-const openDialog = async (row: any) => {
+const openDialog = async (row: any, field: any, title: any) => {
     dialogVisible.value = true
-    tableStore.index()
+    trendRequestData.value = row
+
+    nextTick(() => {
+        // 默认当天
+        datePickerRef.value.setInterval(5)
+        datePickerRef.value.timeValue = [row.time, row.time]
+        initCode(field, title)
+    })
 }
 
-defineExpose({ openDialog })
+defineExpose({ getTrendRequest, openDialog })
 </script>
+
 <style lang="scss" scoped>
-:deep(.el-select) {
-    min-width: 80px;
+.history_header {
+    display: flex;
+
+    // flex-wrap: wrap;
+    #history_select {
+        width: 100%;
+        display: flex;
+        // justify-content: flex-start;
+        // overflow-x: auto;
+        height: auto;
+        flex-wrap: wrap;
+
+        .el-form-item {
+            flex: none !important;
+            // max-width: 380px;
+        }
+
+        .el-select {
+            margin-right: 10px;
+        }
+    }
+
+    // #history_select::-webkit-scrollbar {
+    //     width: 0 !important;
+    //     display: none !important;
+    // }
+
+    .history_searchBtn {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 3px;
+    }
+}
+
+.history_chart {
+    width: 100%;
+
+    // flex: 1;
+    margin-top: 10px;
+}
+
+.history_count {
+    .el-select {
+        min-width: 100px;
+    }
 }
 </style>
diff --git a/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue b/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue
index c899911..0b2699e 100644
--- a/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue
+++ b/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue
@@ -156,12 +156,7 @@ const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name' && column.field != 'time') {
         dialogVisible.value = false
-        // if(column.title && column.title=='闪变越限(分钟)'){
-        //     column.title = '1次'
-        // }
-        // harmonicRatio‌Ref.value.openDialog(row,column.title.replace(/次/g, ""))
-        harmonicRatio‌Ref.value.openDialog(row,column.title)
-        harmonicRatio‌Ref.value.getTrendRequest(row)
+        harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
     }
 }
 
diff --git a/src/components/cockpit/overLimitStatistics/index.vue b/src/components/cockpit/overLimitStatistics/index.vue
index 9df1657..88b2c6d 100644
--- a/src/components/cockpit/overLimitStatistics/index.vue
+++ b/src/components/cockpit/overLimitStatistics/index.vue
@@ -30,6 +30,7 @@ import { getTimeOfTheMonth } from '@/utils/formatTime'
 import OverLimitDetails from '@/components/cockpit/overLimitStatistics/components/overLimitDetails.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
+import { totalLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
 
 const prop = defineProps({
     w: { type: String },
@@ -45,6 +46,8 @@ const headerHeight = ref(57)
 const route = useRoute()
 const timeCacheStore = useTimeCacheStore()
 
+const echartList = ref({})
+
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -67,46 +70,98 @@ const fullscreen = computed(() => {
         return false
     }
 })
-const echartList = ref({
-    title: {
-        text: '指标越限占比'
-    },
 
-    xAxis: {
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
+const initEcharts = () => {
+    totalLimitStatisticsData({
+        searchBeginTime: tableStore.table.params.searchBeginTime,
+        searchEndTime: tableStore.table.params.searchEndTime
+    }).then((res: any) => {
+        const dataArray = [res.data.flicker, res.data.uharm, res.data.iharm, res.data.voltageDev, res.data.ubalance]
+        echartList.value = {
+            title: {
+                text: '指标越限占比'
+            },
 
-    yAxis: {
-        name: '%', // 给X轴加单位
-        interval: 20
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 45, 22, 0, 70],
-                barMaxWidth: 30
+            xAxis: {
+                // name: '(区域)',
+                data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+            },
 
-                // label: {
-                //     show: true,
-                //     position: 'top',
-                //     textStyle: {
-                //         //数值样式
-                //         color: '#000'
-                //     },
-                //     fontSize: 12
-                // }
+            yAxis: {
+                name: '%', // 给X轴加单位
+                interval: 20
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            options: {
+                series: [
+                    {
+                        //   name: '暂降次数',
+                        type: 'bar',
+                        name: '越限占比',
+                        data: dataArray,
+                        barMaxWidth: 30
+
+                        // label: {
+                        //     show: true,
+                        //     position: 'top',
+                        //     textStyle: {
+                        //         //数值样式
+                        //         color: '#000'
+                        //     },
+                        //     fontSize: 12
+                        // }
+                    }
+                ]
             }
-        ]
-    }
-})
+        }
+
+        // echartList.value.options.series[0].data = dataArray
+    })
+}
+
+// const echartList: any = ref({
+//     title: {
+//         text: '指标越限占比'
+//     },
+
+//     xAxis: {
+//         // name: '(区域)',
+//         data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+//     },
+
+//     yAxis: {
+//         name: '%', // 给X轴加单位
+//         interval: 20
+//     },
+//     grid: {
+//         left: '10px',
+//         right: '20px'
+//     },
+//     options: {
+//         series: [
+//             {
+//                 //   name: '暂降次数',
+//                 type: 'bar',
+//                 name: '越限占比',
+//                 data: [],
+//                 barMaxWidth: 30
+
+//                 // label: {
+//                 //     show: true,
+//                 //     position: 'top',
+//                 //     textStyle: {
+//                 //         //数值样式
+//                 //         color: '#000'
+//                 //     },
+//                 //     fontSize: 12
+//                 // }
+//             }
+//         ]
+//     }
+// })
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
     url: '/harmonic-boot/totalLimitStatistics/list',
@@ -192,9 +247,9 @@ const tableStore: any = new TableStore({
         }
 
         // 如果缓存中没有则使用默认值
-        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
+        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0]
 
-        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1]
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
@@ -219,17 +274,20 @@ const cellClickEvent = ({ row, column }: any) => {
 
 onMounted(() => {
     tableStore.index()
+    initEcharts()
 })
 watch(
     () => prop.timeKey,
     val => {
         tableStore.index()
+        initEcharts()
     }
 )
 watch(
     () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
     (newVal, oldVal) => {
         tableStore.index()
+        initEcharts()
     },
     {
         deep: true // 若 timeValue 是对象/数组，需开启深度监听
diff --git a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
index 05ea7b6..8d1ebeb 100644
--- a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
+++ b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
@@ -23,7 +23,10 @@
             <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
         </el-dialog>
         <!-- 查看波形 -->
-        <HarmonicRatio‌ ref="harmonicRatio‌Ref" />
+         <el-dialog v-model="isWaveCharts" draggable title="瞬时/RMS波形" append-to-body width="70%">
+            <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
+            @handleHideCharts="isWaveCharts = false" :wp="wp" />
+        </el-dialog>
     </div>
 </template>
 <script setup lang="ts">
@@ -32,9 +35,14 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
-import HarmonicRatio‌ from '@/components/cockpit/listOfMainMonitoringPoints/components/harmonicRatio‌.vue'
+import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
 const dialogVisible: any = ref(false)
 const harmonicRatio‌Ref: any = ref(null)
+// 波形
+const isWaveCharts = ref(false)
+const loading = ref(false)
+const wp = ref({})
+
 const options = [
     {
         value: '35kV进线',
@@ -140,7 +148,7 @@ const open = async (row: any) => {
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        harmonicRatio‌Ref.value.openDialog(row)
+        isWaveCharts.value = true
     }
 }
 
diff --git a/src/components/cockpit/transientStatistics/index.vue b/src/components/cockpit/transientStatistics/index.vue
index bf88d72..9857749 100644
--- a/src/components/cockpit/transientStatistics/index.vue
+++ b/src/components/cockpit/transientStatistics/index.vue
@@ -26,7 +26,7 @@ import Table from '@/components/table/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { useConfig } from '@/stores/config'
-import TransientStatisticsDetail from './components/transientStatisticsDetail.vue'
+import TransientStatisticsDetail from '@/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'