From c3d7e91f4e5c8e649bb040f9560d7c800aaa0295 Mon Sep 17 00:00:00 2001
From: stt <email>
Date: Mon, 10 Nov 2025 14:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=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      |  10 +
 .../components/dailyTrendChart.vue            | 110 ++---
 .../cockpit/indicatorDetails/index.vue        |  10 +-
 .../cockpit/indicatorDistribution/index.vue   | 397 +++++++++++++++---
 .../components/overLimitDetails.vue           | 158 +++++++
 .../cockpit/indicatorFittingChart/index.vue   |  53 +--
 .../components/harmonicRatio‌.vue              | 313 +++++++++++---
 .../components/overLimitDetails.vue           |   3 +-
 src/views/pqs/cockpit/homePage/index.vue      |   2 +-
 9 files changed, 817 insertions(+), 239 deletions(-)
 create mode 100644 src/api/harmonic-boot/cockpit/cockpit.ts
 create mode 100644 src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue

diff --git a/src/api/harmonic-boot/cockpit/cockpit.ts b/src/api/harmonic-boot/cockpit/cockpit.ts
new file mode 100644
index 0000000..b276fc1
--- /dev/null
+++ b/src/api/harmonic-boot/cockpit/cockpit.ts
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 主要监测点列表查询
+export function mainLineList(data: any) {
+    return request({
+        url: '/harmonic-boot/mainLine/list',
+        method: 'post',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue b/src/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue
index 7f9408e..da7f3a3 100644
--- a/src/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue
+++ b/src/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue
@@ -11,9 +11,6 @@
 
 <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'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
 const prop = defineProps({
@@ -30,103 +27,50 @@ const config = useConfig()
 
 const echartList = ref({
     title: {
-        text: '35kV进线谐波含有率',
+        text: '指标日趋势图',
     },
-
     xAxis: {
-        type: 'time',
+        type: 'category',
+        data: [
+            '00:00', '01:00', '02:00', '03:00', '04:00', '05:00', 
+            '06:00', '07:00', '08:00', '09:00', '10:00', '11:00',
+            '12:00', '13:00', '14:00', '15:00', '16:00', '17:00',
+            '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'
+        ],
         axisLabel: {
-            formatter: {
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
-            }
+            interval: 1
         }
     },
-
-    yAxis: [{}, {}],
+    yAxis: {
+        type: 'value',
+        name: '数值'
+    },
     grid: {
         left: '10px',
-        right: '20px'
+        right: '20px',
+        containLabel: true
     },
     options: {
         series: [
             {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '有功功率',
+                name: '指标值',
+                type: 'line',
+                showSymbol: true,
+                smooth: true,
                 data: [
-                    ['2025-10-16 07:00:00', 10],
-                    ['2025-10-16 07:15:00', 10],
-                    ['2025-10-16 07:30:00', 10],
-                    ['2025-10-16 07:45:00', 10],
-                    ['2025-10-16 08:00:00', 30],
-                    ['2025-10-16 08:15:00', 50],
-                    ['2025-10-16 08:30:00', 60],
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
+                    10, 12, 15, 18, 22, 28, 
+                    35, 45, 60, 75, 88, 95,
+                    100, 98, 90, 80, 70, 60,
+                    50, 40, 30, 25, 20, 15
                 ],
                 itemStyle: {
                     normal: {
-                        //这里是颜色
-                        color: function (params: any) {
-                            if (params.value[1] == 0 || params.value[1] == 3.14159) {
-                                return '#ccc'
-                            } else {
-                                return config.layout.elementUiPrimary[0]
-                            }
-                        }
+                        color: config.layout.elementUiPrimary[0]
                     }
                 },
-                yAxisIndex: 0
-            },
-            {
-                name: '谐波总畸变率',
-                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: 1
+                areaStyle: {
+                    opacity: 0.3
+                }
             }
         ]
     }
diff --git a/src/components/cockpit/indicatorDetails/index.vue b/src/components/cockpit/indicatorDetails/index.vue
index 03688b6..b871452 100644
--- a/src/components/cockpit/indicatorDetails/index.vue
+++ b/src/components/cockpit/indicatorDetails/index.vue
@@ -79,7 +79,7 @@ const fullscreen = computed(() => {
 
 const list = ref([
     {
-        time: '2025-10-01',
+        time: '2025-11-01',
         key: 81,
         text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
     },
@@ -89,22 +89,22 @@ const list = ref([
         text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
     },
     {
-        time: '2025-10-08',
+        time: '2025-11-08',
         key: 20,
         text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
     },
     {
-        time: '2025-10-16',
+        time: '2025-11-16',
         key: 20,
         text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
     },
     {
-        time: '2025-10-23',
+        time: '2025-11-23',
         key: 20,
         text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
     },
     {
-        time: '2025-10-04',
+        time: '2025-11-04',
         key: 0,
         text: ''
     },
diff --git a/src/components/cockpit/indicatorDistribution/index.vue b/src/components/cockpit/indicatorDistribution/index.vue
index 4c301dd..6d2034a 100644
--- a/src/components/cockpit/indicatorDistribution/index.vue
+++ b/src/components/cockpit/indicatorDistribution/index.vue
@@ -47,11 +47,10 @@ const prop = defineProps({
 })
 
 const options = [
-  {
-    value: '1',
-    label: '35V进线',
-  },
- 
+    {
+        value: '1',
+        label: '35V进线'
+    }
 ]
 
 const headerHeight = ref(57)
@@ -82,14 +81,146 @@ const fullscreen = computed(() => {
     }
 })
 
+// const echartList = ref({
+//     options: {
+//         xAxis: null,
+//         yAxis: null,
+//         dataZoom: null,
+//         backgroundColor: '#fff',
+//         tooltip: {
+//             // trigger: 'axis'
+//             textStyle: {
+//                 color: '#fff',
+//                 fontStyle: 'normal',
+//                 opacity: 0.35,
+//                 fontSize: 14
+//             },
+//             backgroundColor: 'rgba(0,0,0,0.55)',
+//             borderWidth: 0,
+//             formatter: function (params: any) {
+//                 console.log(params)
+//                 var tips = ''
+//                 for (var i = 0; i < params.length; i++) {
+//                     tips += params[i].name + '</br/>'
+//                     tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
+//                 }
+//                 return tips
+//             }
+//         },
+//         title: {
+//             text: '指标越限概率分布',
+//             x: 'center'
+//         },
+
+//         visualMap: {
+//             max: 20,
+//             show: false,
+//             inRange: {
+//                 color: ['#313695', '#00BB00', '#ff8000', '#a50026']
+//             }
+//         },
+//         xAxis3D: {
+//             type: 'category',
+//             name: '指标越限',
+//             data: ['0-10', '10-20', '20-30', '30-40', '40-50'],
+//             axisLine: {
+//                 lineStyle: {
+//                     color: '#111'
+//                 }
+//             },
+//             axisLabel: {
+//                 color: '#111'
+//             }
+//         },
+//         yAxis3D: {
+//             type: 'category',
+//             name: '指标类型',
+//             data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'],
+//             nameTextStyle: {
+//                 color: '#111'
+//             },
+//             axisLine: {
+//                 show: true,
+//                 lineStyle: {
+//                     color: '#111'
+//                 }
+//             },
+//             axisLabel: {
+//                 color: '#111'
+//             },
+//             splitLine: {
+//                 lineStyle: {
+//                     // 使用深浅的间隔色
+//                     color: ['#111'],
+//                     type: 'dashed',
+//                     opacity: 0.5
+//                 }
+//             }
+//         },
+//         zAxis3D: {
+//             type: 'value',
+//             splitNumber: 10,
+//             minInterval: 10,
+//             name: '越限占比'
+//         },
+//         grid3D: {
+//             viewControl: {
+//                 projection: 'perspective',
+//                 distance: 250
+//             },
+//             boxWidth: 200,
+//             boxDepth: 80,
+//             light: {
+//                 main: {
+//                     intensity: 1.2
+//                 },
+//                 ambient: {
+//                     intensity: 0.3
+//                 }
+//             }
+//         },
+//         series: [
+//             {
+//                 type: 'bar3D',
+//                 data: [
+//                     [0, 0, 1],
+//                     [0, 1, 1],
+//                     [0.2, 1]
+//                 ],
+//                 shading: 'realistic',
+//                 label: {
+//                     show: false,
+//                     textStyle: {
+//                         fontSize: 16,
+//                         borderWidth: 1
+//                     }
+//                 },
+
+//                 itemStyle: {
+//                     opacity: 1
+//                 },
+//                 emphasis: {
+//                     label: {
+//                         textStyle: {
+//                             fontSize: 20,
+//                             color: '#900'
+//                         }
+//                     },
+//                     itemStyle: {
+//                         color: '#900'
+//                     }
+//                 }
+//             }
+//         ]
+//     }
+// })
+
+var yAxisData=['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+
 const echartList = ref({
     options: {
-        xAxis: null,
-        yAxis: null,
-        dataZoom: null,
         backgroundColor: '#fff',
         tooltip: {
-            // trigger: 'axis'
             textStyle: {
                 color: '#fff',
                 fontStyle: 'normal',
@@ -99,44 +230,74 @@ const echartList = ref({
             backgroundColor: 'rgba(0,0,0,0.55)',
             borderWidth: 0,
             formatter: function (params: any) {
-                console.log(params)
+                console.log(params, '33344')
+                var yIndex = params.value[1]; //获取y轴索引
                 var tips = ''
-                for (var i = 0; i < params.length; i++) {
-                    tips += params[i].name + '</br/>'
-                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
-                }
+                // tips += '指标类型: ' + params.name + '</br>'
+                tips += '指标类型: ' + yAxisData[yIndex] + '</br>'
+                tips += '越限程度: ' + params.seriesName + '</br>'
+                // tips += '越限占比: ' + params.value + '%</br>'
+                tips += '越限占比: ' + params.value[2] + '%</br>'
                 return tips
             }
         },
         title: {
             text: '指标越限概率分布',
-            x: 'center'
-        },
-
-        visualMap: {
-            max: 20,
-            show: false,
-            inRange: {
-                color: ['#313695', '#00BB00', '#ff8000', '#a50026']
+            x: 'center',
+            textStyle: {
+                fontSize: 16,
+                fontWeight: 'normal'
             }
         },
+        visualMap: {
+            max: 100,
+            show: true,
+            inRange: {
+                color: [
+                    '#313695',
+                    '#4575b4',
+                    '#74add1',
+                    '#abd9e9',
+                    '#e0f3f8',
+                    '#ffffbf',
+                    '#fee090',
+                    '#fdae61',
+                    '#f46d43',
+                    '#d73027',
+                    '#a50026'
+                ]
+            }
+            // calculable: true,
+            // orient: 'horizontal',
+            // left: 'center',
+            // bottom: '5%'
+        },
         xAxis3D: {
             type: 'category',
-            name: '指标越限',
-            data: ['0-10', '10-20', '20-30', '30-40', '40-50'],
+            name: '越限程度',
+            nameLocation: 'middle',
+            nameGap: 30,
+            data: ['0-20%', '20-40%', '40-60%', '60-80%', '80-100%'],
             axisLine: {
                 lineStyle: {
                     color: '#111'
                 }
             },
             axisLabel: {
+                color: '#111',
+                margin: 15
+            },
+            nameTextStyle: {
                 color: '#111'
             }
         },
         yAxis3D: {
             type: 'category',
             name: '指标类型',
-            data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'],
+            nameLocation: 'middle',
+            nameGap: 30,
+            // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'],
+            data:yAxisData,
             nameTextStyle: {
                 color: '#111'
             },
@@ -147,11 +308,11 @@ const echartList = ref({
                 }
             },
             axisLabel: {
-                color: '#111'
+                color: '#111',
+                margin: 15
             },
             splitLine: {
                 lineStyle: {
-                    // 使用深浅的间隔色
                     color: ['#111'],
                     type: 'dashed',
                     opacity: 0.5
@@ -160,61 +321,203 @@ const echartList = ref({
         },
         zAxis3D: {
             type: 'value',
-            splitNumber: 10,
-            minInterval: 10,
-            name: '越限占比'
+            name: '越限占比(%)',
+            nameLocation: 'middle',
+            nameGap: 30,
+            nameTextStyle: {
+                color: '#111'
+            },
+            axisLine: {
+                lineStyle: {
+                    color: '#111'
+                }
+            },
+            axisLabel: {
+                color: '#111'
+            },
+            min: 0,
+            max: 100
         },
         grid3D: {
             viewControl: {
                 projection: 'perspective',
-                distance: 250
+                distance: 250,
+                rotateSensitivity: 10,
+                zoomSensitivity: 2
             },
-            boxWidth: 200,
-            boxDepth: 80,
+            boxWidth: 150,
+            boxDepth: 100,
+            boxHeight: 100,
             light: {
                 main: {
                     intensity: 1.2
                 },
                 ambient: {
-                    intensity: 0.3
+                    intensity: 0.4
                 }
             }
         },
         series: [
             {
                 type: 'bar3D',
+                name: '0-20%',
                 data: [
-                    [0, 0, 1],
-                    [0, 1, 1],
-                    [0.2, 1]
+                    // [xIndex, yIndex, value]
+                    [0, 0, 5], // 闪变 - 0-20%    
+                    [0, 1, 10], // 谐波电压 - 0-20%
+                    [0, 2, 8], // 谐波电流 - 0-20%
+                    [0, 3, 15], // 电压偏差 - 0-20%
+                    [0, 4, 12] // 三相不平衡 - 0-20%
                 ],
                 shading: 'realistic',
                 label: {
-                    show: false,
-                    textStyle: {
-                        fontSize: 16,
-                        borderWidth: 1
-                    }
+                    show: false
                 },
-
                 itemStyle: {
-                    opacity: 1
+                    opacity: 0.9
                 },
                 emphasis: {
                     label: {
+                        show: true,
                         textStyle: {
-                            fontSize: 20,
-                            color: '#900'
+                            fontSize: 14,
+                            color: '#000'
                         }
                     },
                     itemStyle: {
-                        color: '#900'
+                        color: '#ff8000'
+                    }
+                }
+            },
+            {
+                type: 'bar3D',
+                name: '20-40%',
+                //   data: chartData.map(function (item) {
+				// 				return {
+				// 					value: [item[1], item[0], item[2]]
+				// 				};
+							// }),
+                data: [
+                    [1, 0, 10], // 闪变 - 20-40%
+                    [1, 1, 20], // 谐波电压 - 20-40%
+                    [1, 2, 15], // 谐波电流 - 20-40%
+                    [1, 3, 25], // 电压偏差 - 20-40%
+                    [1, 4, 18] // 三相不平衡 - 20-40%
+                ],
+                shading: 'realistic',
+                label: {
+                    show: false
+                },
+                itemStyle: {
+                    opacity: 0.9
+                },
+                emphasis: {
+                    label: {
+                        show: true,
+                        textStyle: {
+                            fontSize: 14,
+                            color: '#000'
+                        }
+                    },
+                    itemStyle: {
+                        color: '#ff8000'
+                    }
+                }
+            },
+            {
+                type: 'bar3D',
+                name: '40-60%',
+                data: [
+                    [2, 0, 15], // 闪变 - 40-60%
+                    [2, 1, 25], // 谐波电压 - 40-60%
+                    [2, 2, 30], // 谐波电流 - 40-60%
+                    [2, 3, 35], // 电压偏差 - 40-60%
+                    [2, 4, 28] // 三相不平衡 - 40-60%
+                ],
+                shading: 'realistic',
+                label: {
+                    show: false
+                },
+                itemStyle: {
+                    opacity: 0.9
+                },
+                emphasis: {
+                    label: {
+                        show: true,
+                        textStyle: {
+                            fontSize: 14,
+                            color: '#000'
+                        }
+                    },
+                    itemStyle: {
+                        color: '#ff8000'
+                    }
+                }
+            },
+            {
+                type: 'bar3D',
+                name: '60-80%',
+                data: [
+                    [3, 0, 20], // 闪变 - 60-80%
+                    [3, 1, 30], // 谐波电压 - 60-80%
+                    [3, 2, 35], // 谐波电流 - 60-80%
+                    [3, 3, 40], // 电压偏差 - 60-80%
+                    [3, 4, 35] // 三相不平衡 - 60-80%
+                ],
+                shading: 'realistic',
+                label: {
+                    show: false
+                },
+                itemStyle: {
+                    opacity: 0.9
+                },
+                emphasis: {
+                    label: {
+                        show: true,
+                        textStyle: {
+                            fontSize: 14,
+                            color: '#000'
+                        }
+                    },
+                    itemStyle: {
+                        color: '#ff8000'
+                    }
+                }
+            },
+            {
+                type: 'bar3D',
+                name: '80-100%',
+                data: [
+                    [4, 0, 25], // 闪变 - 80-100%
+                    [4, 1, 35], // 谐波电压 - 80-100%
+                    [4, 2, 40], // 谐波电流 - 80-100%
+                    [4, 3, 45], // 电压偏差 - 80-100%
+                    [4, 4, 42] // 三相不平衡 - 80-100%
+                ],
+                shading: 'realistic',
+                label: {
+                    show: false
+                },
+                itemStyle: {
+                    opacity: 0.9
+                },
+                emphasis: {
+                    label: {
+                        show: true,
+                        textStyle: {
+                            fontSize: 14,
+                            color: '#000'
+                        }
+                    },
+                    itemStyle: {
+                        color: '#ff8000'
                     }
                 }
             }
         ]
     }
 })
+
 const echartList1 = ref({
     title: {
         text: '越限时间概率分布'
diff --git a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue
new file mode 100644
index 0000000..b1f4805
--- /dev/null
+++ b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue
@@ -0,0 +1,158 @@
+<template>
+    <div>
+        <!-- 综合评估详情 -->
+        <el-dialog draggable title="指标合格率统计" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false">
+                <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 options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide } 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/listOfMainMonitoringPoints/components/harmonicRatio‌.vue'
+const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
+const options = [
+    {
+        value: '35kV进线',
+        label: '35kV进线'
+    }
+]
+const height = mainHeight(0, 2).height as any
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 51; i++) {
+        list.push({
+            title: i + '次',
+            // field: key + i,
+            field: 'flicker',
+            width: '80',
+            // render: 'customTemplate',
+            // customTemplate: (row: any) => {
+            //     return `<span style='cursor: pointer;text-decoration: underline;'>${row.flicker}</span>`
+            // }
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/user-boot/role/selectRoleDetail?id=0',
+    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'
+        },
+        {
+            title: '名称',
+            field: 'name',
+            width: '150'
+        },
+        {
+            title: '闪变越限(分钟)',
+            field: 'flicker',
+            width: '80',
+            // render: 'customTemplate',
+            // customTemplate: (row: any) => {
+            //     return `<span style='cursor: pointer;text-decoration: underline;'>${row.flicker}</span>`
+            // }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('voltage')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('harmonicCurrent')
+        },
+        {
+            title: '三相不平衡度越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        },
+        {
+            title: '电压偏差越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        },
+        {
+            title: '频率偏差越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        }
+    ],
+    beforeSearchFun: () => {},
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                time: '2024-01-01 00:00:00',
+                name: '35kV进线',
+                flicker: '0'
+            },
+            {
+                time: '2024-01-01 00:00:00',
+                name: '35kV进线',
+                flicker: '0'
+            },
+            {
+                time: '2024-01-01 00:00:00',
+                name: '35kV进线',
+                flicker: '0'
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+const open = async (row: any) => {
+    dialogVisible.value = true
+    tableStore.index()
+}
+
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    if (column.field != 'name' && column.field != 'time') {
+        harmonicRatio‌Ref.value.openDialog(row)
+    }
+}
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/components/cockpit/indicatorFittingChart/index.vue b/src/components/cockpit/indicatorFittingChart/index.vue
index fdf8ae8..540095d 100644
--- a/src/components/cockpit/indicatorFittingChart/index.vue
+++ b/src/components/cockpit/indicatorFittingChart/index.vue
@@ -11,7 +11,7 @@
         >
             <template v-slot:select>
                 <el-form-item label="关键词">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输关键字" />
+                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输关键字" />
                 </el-form-item>
             </template>
         </TableHeader>
@@ -29,11 +29,8 @@ import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-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/indicatorFittingChart/components/overLimitDetails.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
 
@@ -76,9 +73,8 @@ const fullscreen = computed(() => {
 
 
 const tableStore: any = new TableStore({
-    url: '/system-boot/dashboard/queryPage',
+    url: '/harmonic-boot/mainLine/list',
     method: 'POST',
-
     showPage: false,
     exportName: '主要监测点列表',
     column: [
@@ -92,27 +88,26 @@ const tableStore: any = new TableStore({
         },
         {
             title: '监测点名称',
-            field: 'name',
+            field: 'lineName',
             minWidth: '90',
-
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.name}</span>`
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
             }
         },
 
         {
             title: '监测对象类型',
-            field: 'type',
+            field: 'objType',
             minWidth: '90'
         },
         {
             title: '是否治理',
-            field: 'whetherToGovern',
+            field: 'govern',
             minWidth: '70'
         },
 
-        { title: '主要存在的电能质量问题', field: 'question', minWidth: '150' }
+        { title: '主要存在的电能质量问题', field: 'problems', minWidth: '150' }
     ],
     beforeSearchFun: () => {
         // 尝试从缓存获取时间值
@@ -132,46 +127,18 @@ const tableStore: any = new TableStore({
         tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '10kV1#电动机',
-                type: '电动机',
-                whetherToGovern: '否',
-                question: '3次谐波电压、5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '10kV2#(治理后)',
-                type: '电焊机',
-                whetherToGovern: '100A APF',
-                question: '所有指标均合格'
-            },
-            {
-                name: '380V电焊机(治理前)',
-                type: '电焊机',
-                whetherToGovern: '100A APF',
-                question: '5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '380V水泵机',
-                type: '电动机',
-                whetherToGovern: '否',
-                question: '所有指标均合格'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
     }
 })
 
 const tableRef = ref()
 provide('tableRef', tableRef)
-tableStore.table.params.type = ''
-tableStore.table.params.searchValue = ''
+tableStore.table.params.keywords = ''
 provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field == 'name') {
+    if (column.field == 'lineName') {
         console.log(row)
         OverLimitDetailsRef.value.open(row)
     }
diff --git a/src/components/cockpit/listOfMainMonitoringPoints/components/harmonicRatio‌.vue b/src/components/cockpit/listOfMainMonitoringPoints/components/harmonicRatio‌.vue
index 800b042..166ed96 100644
--- a/src/components/cockpit/listOfMainMonitoringPoints/components/harmonicRatio‌.vue
+++ b/src/components/cockpit/listOfMainMonitoringPoints/components/harmonicRatio‌.vue
@@ -7,27 +7,70 @@
                     <el-select
                         v-model="tableStore.table.params.searchValue"
                         placeholder="请选择谐波次数"
-                        style="width: 240px"
+                        style="width: 150px"
                     >
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                        <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="指标类型">
+                <el-form-item label="指标类型" v-show="!tableStore.table.params.checked">
                     <el-select
-                        v-model="tableStore.table.params.searchValue"
+                        v-model="tableStore.table.params.indicatorType"
                         placeholder="请选择指标类型"
-                        style="width: 240px"
+                        style="width: 150px"
                     >
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                        <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" />
     </el-dialog>
 </template>
 
@@ -55,16 +98,12 @@ const options = [
 ]
 
 const config = useConfig()
-const powerList: any = ref([
-    {
-        label: '三相总有功功率',
-        value: '1'
-    },
-    {
-        label: '三相总无功功率',
-        value: '2'
-    }
-])
+
+const harmonicOptions = Array.from({ length: 50 }, (_, i) => ({
+    value: String(i + 1),
+    label: `${i + 1}次谐波`
+}))
+
 const exceedingTheLimitList: any = ref([
     {
         label: '越限',
@@ -95,9 +134,8 @@ const indicatorList: any = ref([
 ])
 const echartList = ref({
     title: {
-        text: '35kV进线谐波含有率',
+        text: '谐波电压含有率'
     },
-
     xAxis: {
         type: 'time',
         axisLabel: {
@@ -108,7 +146,6 @@ const echartList = ref({
             }
         }
     },
-
     yAxis: [{}, {}],
     grid: {
         left: '10px',
@@ -117,51 +154,171 @@ const echartList = ref({
     options: {
         series: [
             {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '有功功率',
+                name: 'A相',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
                 data: [
-                    ['2025-10-16 07:00:00', 10],
-                    ['2025-10-16 07:15:00', 10],
-                    ['2025-10-16 07:30:00', 10],
-                    ['2025-10-16 07:45:00', 10],
-                    ['2025-10-16 08:00:00', 30],
-                    ['2025-10-16 08:15:00', 50],
-                    ['2025-10-16 08:30:00', 60],
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
+                    ['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]
                 ],
-                itemStyle: {
-                    normal: {
-                        //这里是颜色
-                        color: function (params: any) {
-                            if (params.value[1] == 0 || params.value[1] == 3.14159) {
-                                return '#ccc'
-                            } else {
-                                return config.layout.elementUiPrimary[0]
-                            }
-                        }
-                    }
-                },
                 yAxisIndex: 0
             },
             {
-                name: '谐波总畸变率',
+                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,
@@ -191,11 +348,45 @@ const echartList = ref({
                     ['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
@@ -219,6 +410,10 @@ 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(() => {
diff --git a/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue b/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue
index 547ede5..b7f5050 100644
--- a/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue
+++ b/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue
@@ -8,7 +8,7 @@
                         <el-select
                             v-model="tableStore.table.params.searchValue"
                             placeholder="请选择监测点名称"
-                            style="width: 240px"
+                            style="width: 150px"
                         >
                             <el-option
                                 v-for="item in options"
@@ -147,6 +147,7 @@ const open = async (row: any) => {
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
+    console.log(row, '1111')
     if (column.field != 'name' && column.field != 'time') {
         harmonicRatio‌Ref.value.openDialog(row)
     }
diff --git a/src/views/pqs/cockpit/homePage/index.vue b/src/views/pqs/cockpit/homePage/index.vue
index 415e1e0..cb50f76 100644
--- a/src/views/pqs/cockpit/homePage/index.vue
+++ b/src/views/pqs/cockpit/homePage/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader :showSearch="false" v-if="flag">
+        <TableHeader :showSearch="false" v-show="flag">
             <template v-slot:select>
                 <el-form-item label="日期">
                     <DatePicker ref="datePickerRef" :nextFlag="false" :theCurrentTime="true"  @change="handleDatePickerChange"></DatePicker>