From 0994a52699f272113b95514b7c8a7ae93398ca56 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 27 Dec 2024 08:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=B7=BB=E5=8A=A0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=A1=A8=E6=A0=BC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/echarts/rmsboxi.vue            |    8 +-
 src/components/echarts/shushiboxi.vue         |    8 +-
 src/components/echarts/waveForm.vue           |    1 -
 src/components/table/defaultAttribute.ts      |    1 +
 src/components/table/header/index.vue         |   12 +-
 src/components/table/index.vue                |   82 +-
 src/utils/tableMethod.ts                      |   35 +
 src/utils/tableStore.ts                       |   22 +
 .../area/TransientEventList/index.vue         |    2 +-
 .../area/onlinerate/index.vue                 |    2 +-
 .../detailed/alarmStatistics/index.vue        |    2 +-
 .../detailed/overLabelDetails/index.vue       |    2 +-
 .../detailed/regionalStatistics/index.vue     |    2 +-
 .../online/wentaishujufenxi/index.vue         |  111 +-
 .../online/wentaishujufenxi/index1.vue        | 1716 +++++++++++++++++
 .../reportForms/passing/index.vue             |    4 +-
 .../runManage/monitoringPoints/index.vue      |   20 +-
 .../quantitativeStatistics/index.vue          |  169 +-
 .../quantitativeStatistics/index2.vue         | 1147 +++++++++++
 .../runManage/terminalLedger/index.vue        |    6 +-
 .../components/undocumented/detail.vue        |   59 +-
 .../Region/transientList/index.vue            |    2 +-
 .../analyse/eventCorrelation/index.vue        |    2 +-
 .../voltageSags/analyse/impactscope/index.vue |    4 +-
 .../online/eventStudy/index.vue               |   29 +-
 .../TerminalOperation/index.vue               |    6 +-
 .../voltageSags/report/eventReports/index.vue |    8 +-
 types/table.d.ts                              |    2 +
 28 files changed, 3264 insertions(+), 200 deletions(-)
 create mode 100644 src/utils/tableMethod.ts
 create mode 100644 src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue
 create mode 100644 src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index2.vue

diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue
index 67e1ddf1..9420ddcc 100644
--- a/src/components/echarts/rmsboxi.vue
+++ b/src/components/echarts/rmsboxi.vue
@@ -1072,13 +1072,13 @@ export default {
             height: 13,
             start: 0,
             bottom: "20px",
-            end: 15,
+            end: 100,
           },
           {
             start: 0,
             height: 13,
             bottom: "20px",
-            end: 15,
+            end: 100,
           },
         ],
         series: [
@@ -1492,13 +1492,13 @@ export default {
             height: 13,
             start: 0,
             bottom: "20px",
-            end: 15,
+            end: 100,
           },
           {
             start: 0,
             height: 13,
             bottom: "20px",
-            end: 15,
+            end: 100,
           },
         ],
         series: [
diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index c243458c..2e389292 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -733,13 +733,13 @@ export default {
                         height: 13,
                         start: 0,
                         bottom: '20px',
-                        end: 15
+                        end: 100
                     },
                     {
                         start: 0,
                         height: 13,
                         bottom: '20px',
-                        end: 15
+                        end: 100
                     }
                 ],
                 series: [
@@ -1095,13 +1095,13 @@ export default {
                         height: 13,
                         start: 0,
                         bottom: '20px',
-                        end: 15
+                        end: 100
                     },
                     {
                         start: 0,
                         height: 13,
                         bottom: '20px',
-                        end: 15
+                        end: 100
                     }
                 ],
                 series: [
diff --git a/src/components/echarts/waveForm.vue b/src/components/echarts/waveForm.vue
index b99e888e..47b4cd18 100644
--- a/src/components/echarts/waveForm.vue
+++ b/src/components/echarts/waveForm.vue
@@ -122,7 +122,6 @@ const backbxlb = () => {
     wp.value = null
     if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
     if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-    console.log("🚀 ~ backbxlb ~ rmsboxiRef.value:", rmsboxiRef.value)
 
     emit('backbxlb')
 }
diff --git a/src/components/table/defaultAttribute.ts b/src/components/table/defaultAttribute.ts
index 006b8d86..eaf8144c 100644
--- a/src/components/table/defaultAttribute.ts
+++ b/src/components/table/defaultAttribute.ts
@@ -13,5 +13,6 @@ export const defaultAttribute: VxeTableProps = {
     treeConfig: {
         reserve: true
     },
+
     showOverflow: true
 }
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index 3765494f..172d3e54 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -21,6 +21,9 @@
                     :icon="Search">查询</el-button>
                 <el-button @click="onResetForm" v-if="showSearch  && showReset" :loading="tableStore.table.loading"
                     :icon="RefreshLeft">重置</el-button>
+                    <el-button @click="onExport" v-if="showExport" :loading="tableStore.table.loading" type="primary"
+                    icon="el-icon-Download">导出</el-button>
+               
             </template>
             <slot name="operation"></slot>
         </div>
@@ -55,6 +58,8 @@ interface Props {
     nextFlag?: boolean //控制时间是否可以往后推
     theCurrentTime?: boolean //控制时间前3天展示上个月时间
     showReset?: boolean //控制时间前3天展示上个月时间
+    showExport?: boolean //导出控制
+
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -63,7 +68,8 @@ const props = withDefaults(defineProps<Props>(), {
     showSearch: true,
     nextFlag: false,
     theCurrentTime: false,
-    showReset: true
+    showReset: true,
+    showExport:false
 })
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {
@@ -169,6 +175,10 @@ const onResetForm = () => {
 const setTheDate = (val: any) => {
     datePickerRef.value.setTheDate(val)
 }
+// 导出
+const onExport = () => {
+    tableStore.onTableAction('export', {showAllFlag:true})
+}
 
 defineExpose({ onComSearch, areaRef, setDatePicker, setTheDate, datePickerRef, showSelectChange })
 </script>
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 9174978d..883fabdc 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,41 +1,23 @@
 <template>
     <div :style="{ height: tableStore.table.height }">
-        <vxe-table
-            ref="tableRef"
-            height="auto"
-            :data="tableStore.table.data"
-            v-loading="tableStore.table.loading"
-            v-bind="Object.assign({}, defaultAttribute, $attrs)"
-            @checkbox-all="selectChangeEvent"
-            @checkbox-change="selectChangeEvent"
-            :showOverflow="showOverflow"
-        >
+        <vxe-table ref="tableRef" height="auto" :data="tableStore.table.data" v-loading="tableStore.table.loading"
+            v-bind="Object.assign({}, defaultAttribute, $attrs)" @checkbox-all="selectChangeEvent"
+            @checkbox-change="selectChangeEvent" :showOverflow="showOverflow">
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
                 <GroupColumn :column="tableStore.table.column" />
             </template>
             <template v-else>
-                <Column
-                    :attr="item"
-                    :key="key + '-column'"
-                    v-for="(item, key) in tableStore.table.column"
-                    :tree-node="item.treeNode"
-                >
+                <Column :attr="item" :key="key + '-column'" v-for="(item, key) in tableStore.table.column"
+                    :tree-node="item.treeNode">
                     <!-- tableStore 预设的列 render 方案 -->
                     <template v-if="item.render" #default="scope">
-                        <FieldRender
-                            :field="item"
-                            :row="scope.row"
-                            :column="scope.column"
-                            :index="scope.rowIndex"
-                            :key="
-                                key +
-                                '-' +
-                                item.render +
-                                '-' +
-                                (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            "
-                        />
+                        <FieldRender :field="item" :row="scope.row" :column="scope.column" :index="scope.rowIndex" :key="key +
+                            '-' +
+                            item.render +
+                            '-' +
+                            (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
+                            " />
                     </template>
                 </Column>
             </template>
@@ -44,16 +26,11 @@
     </div>
 
     <div v-if="tableStore.showPage" class="table-pagination">
-        <el-pagination
-            :currentPage="tableStore.table.params!.pageNum"
-            :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes"
-            background
+        <el-pagination :currentPage="tableStore.table.params!.pageNum" :page-size="tableStore.table.params!.pageSize"
+            :page-sizes="pageSizes" background
             :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
-            :total="tableStore.table.total"
-            @size-change="onTableSizeChange"
-            @current-change="onTableCurrentChange"
-        ></el-pagination>
+            :total="tableStore.table.total" @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"></el-pagination>
     </div>
     <slot name="footer"></slot>
 </template>
@@ -67,12 +44,13 @@ import Column from '@/components/table/column/index.vue'
 import GroupColumn from '@/components/table/column/groupColumn.vue'
 import { useConfig } from '@/stores/config'
 import type TableStoreClass from '@/utils/tableStore'
-
+import { useRouter } from 'vue-router'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 
 const config = useConfig()
 const tableRef = ref<VxeTableInstance>()
 const tableStore = inject('tableStore') as TableStoreClass
+const router = useRouter()
 
 interface Props extends /* @vue-ignore */ Partial<InstanceType<typeof ElTable>> {
     isGroup?: boolean
@@ -116,12 +94,38 @@ const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
 const getRef = () => {
     return tableRef.value
 }
+watch(
+    () => tableStore.table.allFlag,
+    newVal => {
+
+
+        if (tableStore.table.allFlag) {
+
+            tableRef.value?.exportData({
+                filename: document.querySelectorAll('.ba-nav-tab.active')[0].textContent || '', // 文件名字
+                sheetName: 'Sheet1',
+                type: 'xlsx', //导出文件类型 xlsx 和 csv
+                useStyle: true,
+                data: tableStore.table.allData, // 数据源 // 过滤那个字段导出
+                columnFilterMethod: function (column: any) {
+
+                    return !(column.column.title === undefined || column.column.title === '序号' || column.column.title === '操作')
+                }
+            })
+            tableStore.table.allFlag = false
+
+        }
+
+
+    }
+)
 watch(
     () => tableStore.table.data,
     newVal => {
         tableStore.onTableAction('selection-change', [])
     }
 )
+
 defineExpose({
     getRef
 })
diff --git a/src/utils/tableMethod.ts b/src/utils/tableMethod.ts
new file mode 100644
index 00000000..bbfc8c16
--- /dev/null
+++ b/src/utils/tableMethod.ts
@@ -0,0 +1,35 @@
+// 过滤表格导出数据
+export const filtration = (arr: Array<{ dealFlag?: number; fileFlag?: number; onlineEvaluate?: number }>) => {
+    const dealFlagMap: Record<number, string> = {
+        0: '未处理',
+        1: '已处理',
+        2: '已处理,无结果',
+        3: '计算失败'
+    }
+    const fileFlagMap: Record<number, string> = {
+        0: '不存在',
+        1: '存在'
+    }
+
+    arr.forEach((item: any) => {
+        if (item.dealFlag !== undefined) {
+            item.dealFlag = dealFlagMap[item.dealFlag] || ''
+        }
+        if (item.fileFlag !== undefined) {
+            item.fileFlag = fileFlagMap[item.fileFlag] || ''
+        }
+        if (item.onlineEvaluate !== undefined) {
+            if (item.onlineEvaluate == null) {
+            } else if (item.onlineEvaluate == 3.14159) {
+                item.onlineEvaluate = '/'
+            } else if (item.onlineEvaluate * 100 > 90) {
+                item.onlineEvaluate = '优'
+            } else if (item.onlineEvaluate * 100 > 60) {
+                item.onlineEvaluate = '良'
+            } else {
+                item.onlineEvaluate = '差'
+            }
+        }
+    })
+    return arr
+}
diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts
index e397f005..b7a46106 100644
--- a/src/utils/tableStore.ts
+++ b/src/utils/tableStore.ts
@@ -3,6 +3,7 @@ import createAxios from '@/utils/request'
 import { requestPayload } from '@/utils/request'
 import { Method } from 'axios'
 import { mainHeight } from '@/utils/layout'
+import { filtration } from './tableMethod'
 
 interface TableStoreParams {
     url: string // 请求地址
@@ -31,6 +32,8 @@ export default class TableStore {
         ref: null,
         selection: [],
         data: [],
+        allData: [],
+        allFlag: false,
         webPagingData: [],
         total: 0,
         params: {
@@ -175,6 +178,25 @@ export default class TableStore {
                 () => {
                     console.warn('No action defined')
                 }
+            ],
+            [
+                'export',
+                () => {
+                    // this.index()
+                    let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
+                    createAxios(
+                        Object.assign(
+                            {
+                                url: this.url,
+                                method: this.method
+                            },
+                            requestPayload(this.method, params, this.paramsPOST)
+                        )
+                    ).then(res => {
+                        this.table.allData = filtration(res.data.records || res.data)
+                        this.table.allFlag = data.showAllFlag || true
+                    })
+                }
             ]
         ])
         const action = actionFun.get(event) || actionFun.get('default')
diff --git a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
index cbf6baa4..3826abe9 100644
--- a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
         <div v-show="view">
-            <TableHeader datePicker area>
+            <TableHeader datePicker area showExport>
                 <template #select>
                     <el-form-item label="筛选">
                         <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" />
diff --git a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
index 161b77bf..a83fc2e0 100644
--- a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main online">
         <div class="online_header">
-            <TableHeader date-picker ref="tableHeaderRef">
+            <TableHeader date-picker ref="tableHeaderRef" >
                 <template #select>
                     <el-form-item label="统计类型:">
                         <el-select
diff --git a/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue
index a5fbc728..20642f99 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
 
-        <TableHeader date-picker area>
+        <TableHeader date-picker area showExport>
             <template #select>
                 <!-- <el-form-item label="统计类型:">
                     <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型" value-key="id">
diff --git a/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue b/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue
index f88558fb..b7a4daf1 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
 
-        <TableHeader datePicker area>
+        <TableHeader datePicker area showExport>
             <template #select>
                 <el-form-item label="统计类型:">
                     <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型" value-key="id">
diff --git a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
index 1f71be3b..818f4f4e 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
 
-        <TableHeader datePicker area>
+        <TableHeader datePicker area showExport>
             <template #select>
                 <el-form-item label="统计类型:">
                     <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型" value-key="id">
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
index b403867d..a1fd82ff 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
@@ -38,7 +38,7 @@
                 <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
             </el-form-item>
         </el-form>
-        <div style="flex: 1; overflow-y: scroll" class="mt10" v-loading="loading">
+        <div style="flex: 1; overflow-y: scroll" class="mt10">
             <my-echart :options="item.option" v-for="item in list" :style="height" />
         </div>
     </div>
@@ -52,7 +52,6 @@ import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { indexOptions, harmonicOptions, inharmonicOptions } from '@/utils/dictionary'
 import { getHistoryResult } from '@/api/harmonic-boot/harmonic'
 import { mainHeight } from '@/utils/layout'
-import { yMethod } from '@/utils/echartMethod'
 const datePickerRef = ref()
 const monitoringPoint = useMonitoringPoint()
 const checked = ref(monitoringPoint.state.showCheckBox)
@@ -76,7 +75,6 @@ const formData = reactive<{
     inHarmonic: 1,
     ptType: 0
 })
-const height: any = ref(mainHeight(200, 1))
 const options = ref({})
 const traceability = ref<any>([])
 const list = ref<any>([])
@@ -89,9 +87,9 @@ const typeOptions = ref([
     { label: 'cp95值', value: 4 }
 ])
 onMounted(() => {
-    datePickerRef.value.setTheDate(5)
     init()
 })
+const height: any = ref(mainHeight(200, 1))
 const checkChange = () => {
     if (checked.value) {
         monitoringPoint.setShowCheckBox(true)
@@ -120,15 +118,13 @@ const init = () => {
         }
         list.value = []
         shujuchuli(res)
-        loading.value = false
-    }).catch(() => { loading.value = false })
+    })
 }
 const shujuchuli = (res: any) => {
     let shujuData = res.data
     shujuData.forEach((item: any, i: number) => {
-        let [min, max] = yMethod([ ...(item.value.map(arr => arr.slice(1)).flat()),item.topLimit,,item.lowerLimit])
-      
         //判断是否存在暂降点
+
         if (item.eventDetail !== null || item.eventDetail.length === 0) {
             //向项别中添加暂降点
             let chufa = []
@@ -147,8 +143,8 @@ const shujuchuli = (res: any) => {
                         let cvalue = []
                         let topLimit = []
                         let lowerLimit = []
-                        item.maxValue = max
-                        item.minValue = min
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -213,8 +209,8 @@ const shujuchuli = (res: any) => {
                         let gvalue = []
                         let topLimit = []
                         let lowerLimit = []
-                        item.maxValue = max
-                        item.minValue = min
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -287,7 +283,7 @@ const shujuchuli = (res: any) => {
                         let bvalue = []
                         let cvalue = []
                         let topLimit = []
-                        item.maxValue = max
+                        item.maxValue = item.topLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -349,7 +345,7 @@ const shujuchuli = (res: any) => {
                     if (item.phaiscType.length == 3) {
                         let gvalue = []
                         let topLimit = []
-                        item.maxValue = max
+                        item.maxValue = item.topLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -415,7 +411,7 @@ const shujuchuli = (res: any) => {
                         let bvalue = []
                         let cvalue = []
                         let lowerLimit = []
-                        item.minValue = min
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -472,7 +468,7 @@ const shujuchuli = (res: any) => {
                     if (item.phaiscType.length == 3) {
                         let gvalue = []
                         let lowerLimit = []
-                        item.minValue = min
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -663,8 +659,8 @@ const shujuchuli = (res: any) => {
                         let cvalue = []
                         let topLimit = []
                         let lowerLimit = []
-                        item.maxValue = max
-                        item.minValue = min
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -717,8 +713,8 @@ const shujuchuli = (res: any) => {
                         let gvalue = []
                         let topLimit = []
                         let lowerLimit = []
-                        item.maxValue = max
-                        item.minValue = min
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -780,7 +776,7 @@ const shujuchuli = (res: any) => {
                         let bvalue = []
                         let cvalue = []
                         let topLimit = []
-                        item.maxValue = max
+                        item.maxValue = item.topLimit
                         // item.minValue=item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
@@ -831,7 +827,7 @@ const shujuchuli = (res: any) => {
                     if (item.phaiscType.length == 2) {
                         let gvalue = []
                         let topLimit = []
-                        item.maxValue = max
+                        item.maxValue = item.topLimit
                         // item.minValue=item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
@@ -892,7 +888,7 @@ const shujuchuli = (res: any) => {
                         let cvalue = []
                         let lowerLimit = []
                         // item.maxValue=item.topLimit
-                        item.minValue = min
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -943,7 +939,7 @@ const shujuchuli = (res: any) => {
                         let gvalue = []
                         let lowerLimit = []
                         // item.maxValue=item.topLimit
-                        item.minValue = min
+                        item.minValue = item.lowerLimit
                         //判断数据是否存在
                         if (item.value !== null) {
                             for (let j = 0; j < item.value.length; j++) {
@@ -1096,7 +1092,6 @@ const shujuchuli = (res: any) => {
 }
 const rendering = () => {
     height.value = mainHeight(200, list.value.length > 1 ? 2 : 1)
-
     list.value.forEach((item: any) => {
         let opitonserise: any[] = []
         item.legend.forEach((item2: any) => {
@@ -1125,7 +1120,7 @@ const rendering = () => {
                     smooth: true,
                     itemStyle: {
                         normal: {
-                            color: '#009900'
+                            color: '#339900'
                         }
                     },
 
@@ -1142,7 +1137,7 @@ const rendering = () => {
                     barWidth: 22,
                     itemStyle: {
                         normal: {
-                            color: '#CC0000'
+                            color: '#FF3300'
                         }
                     },
                     data: item.cvalue
@@ -1300,8 +1295,6 @@ const rendering = () => {
     getEcharts()
 }
 const getEcharts = () => {
-    console.log("🚀 ~ list.value.forEach ~  list.value:",  list.value)
-
     list.value.forEach((item: any, i: number) => {
         item.option = {
             backgroundColor: '#fff',
@@ -1325,7 +1318,7 @@ const getEcharts = () => {
                     opacity: 0.35,
                     fontSize: 14
                 },
-                backgroundColor: 'rgba(0,0,0,0.55)',
+                backgroundColor: 'rgba(0,0,0,0.35)',
 
                 formatter: function (params: any) {
                     let tips = ''
@@ -1398,7 +1391,8 @@ const getEcharts = () => {
                 }
             },
             legend: {
-                left: '140px',
+                left: '50px',
+                top: '25px',
                 verticalAlign: 'top',
                 enabled: true,
                 itemDistance: 5,
@@ -1412,6 +1406,9 @@ const getEcharts = () => {
                     padding: [0, 0, 0, 0] //[上、右、下、左]
                 }
             },
+            grid: {
+            top: '70px',
+        },
             xAxis: [
                 {
                     type: 'time',
@@ -1426,42 +1423,42 @@ const getEcharts = () => {
                     }
                 }
             ],
-            toolbox: {
-                show: true,
-                feature: {
-                    dataZoom: {
-                        // bottom: '10px',
-                        yAxisIndex: 'none'
-                    }
-                }
-            },
+            // toolbox: {
+            //     show: true,
+            //     feature: {
+            //         dataZoom: {
+            //             // bottom: '10px',
+            //             yAxisIndex: 'none'
+            //         }
+            //     }
+            // },
             yAxis: [
                 {
                     type: 'value',
 
-                    min: item.minValue,
-                    max: item.maxValue,
+                    // min: item.minValue,
                     name: item.valueName,
-                    axisLabel: {
-                        interval: 0,
-                        formatter: function (value: any) {
-                            return value.toFixed(3)
-                        },
-                        left: '20px'
-                    },
+                    minInterval: 1,
+                    // axisLabel: {
+                    //     interval: 0,
+                    //     // formatter: function (value: any) {
+                    //     //     return value.toFixed(0)
+                    //     // },
+                    //     left: '20px'
+                    // },
 
                     axisLine: {
                         show: true,
                         onZero: false, //-----------重点
                         lineStyle: {}
                     },
-                    splitLine: {
-                        lineStyle: {
-                            // 使用深浅的间隔色
-                            type: 'dashed',
-                            opacity: 0.5
-                        }
-                    }
+                    // splitLine: {
+                    //     lineStyle: {
+                    //         // 使用深浅的间隔色
+                    //         type: 'dashed',
+                    //         opacity: 0.5
+                    //     }
+                    // }
                 }
             ],
             series: item.serise
@@ -1555,7 +1552,7 @@ const getEcharts = () => {
                     symbolSize: 0,
                     itemStyle: {
                         normal: {
-                            color: '#CC0000'
+                            color: '#FF3300'
                         }
                     }
                 },
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue
new file mode 100644
index 00000000..b403867d
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue
@@ -0,0 +1,1716 @@
+<template>
+    <div style="display: flex; flex-direction: column; height: 100%">
+        <el-form :inline="true">
+            <el-form-item label="多监测点">
+                <el-checkbox v-model="checked" @change="checkChange" />
+            </el-form-item>
+            <el-form-item label="日期">
+                <DatePicker ref="datePickerRef"></DatePicker>
+            </el-form-item>
+            <el-form-item label="指标类型:">
+                <el-select v-model="formData.condition" multiple collapse-tags :multiple-limit="5" filterable
+                    placeholder="请选择指标" @change="conditionChange">
+                    <el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
+                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
+                            :value="item.value"></el-option>
+                    </el-option-group>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="数值类型:">
+                <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型">
+                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="谐波次数:" v-if="showXieBoCiShu">
+                <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
+                    <el-option v-for="item in harmonicOptions" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item v-if="showJianXieBoCiShu" label="间谐波次数:">
+                <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
+                    <el-option v-for="item in inharmonicOptions" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <div style="flex: 1; overflow-y: scroll" class="mt10" v-loading="loading">
+            <my-echart :options="item.option" v-for="item in list" :style="height" />
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { nextTick, onMounted, reactive, ref } from 'vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import { indexOptions, harmonicOptions, inharmonicOptions } from '@/utils/dictionary'
+import { getHistoryResult } from '@/api/harmonic-boot/harmonic'
+import { mainHeight } from '@/utils/layout'
+import { yMethod } from '@/utils/echartMethod'
+const datePickerRef = ref()
+const monitoringPoint = useMonitoringPoint()
+const checked = ref(monitoringPoint.state.showCheckBox)
+const loading = ref(true)
+const formData = reactive<{
+    lineId: string[]
+    searchBeginTime: string
+    searchEndTime: string
+    condition: string[]
+    valueType: number
+    harmonic: number
+    inHarmonic: number
+    ptType: number
+}>({
+    lineId: [],
+    searchBeginTime: '',
+    searchEndTime: '',
+    condition: ['10', '11', '12'],
+    valueType: 1,
+    harmonic: 2,
+    inHarmonic: 1,
+    ptType: 0
+})
+const height: any = ref(mainHeight(200, 1))
+const options = ref({})
+const traceability = ref<any>([])
+const list = ref<any>([])
+const showXieBoCiShu = ref(false)
+const showJianXieBoCiShu = ref(false)
+const typeOptions = ref([
+    { label: '平均值', value: 1 },
+    { label: '最小值', value: 2 },
+    { label: '最大值', value: 3 },
+    { label: 'cp95值', value: 4 }
+])
+onMounted(() => {
+    datePickerRef.value.setTheDate(5)
+    init()
+})
+const checkChange = () => {
+    if (checked.value) {
+        monitoringPoint.setShowCheckBox(true)
+    } else {
+        monitoringPoint.setShowCheckBox(false)
+        init()
+    }
+}
+const init = () => {
+    loading.value = true
+    formData.lineId = checked.value ? monitoringPoint.state.lineIds : [monitoringPoint.state.lineId]
+    formData.searchBeginTime = datePickerRef.value.timeValue[0]
+    formData.searchEndTime = datePickerRef.value.timeValue[1]
+    let directionValue = formData.condition.findIndex(item => {
+        if (item === '39') {
+            item = '50'
+            return true
+        } else {
+            return false
+        }
+    })
+    getHistoryResult(formData).then((res: any) => {
+        if (directionValue >= 0) {
+            res.data[directionValue].targetName = '谐波电流方向'
+            traceability.value = [(res.data as [])[directionValue]]
+        }
+        list.value = []
+        shujuchuli(res)
+        loading.value = false
+    }).catch(() => { loading.value = false })
+}
+const shujuchuli = (res: any) => {
+    let shujuData = res.data
+    shujuData.forEach((item: any, i: number) => {
+        let [min, max] = yMethod([ ...(item.value.map(arr => arr.slice(1)).flat()),item.topLimit,,item.lowerLimit])
+      
+        //判断是否存在暂降点
+        if (item.eventDetail !== null || item.eventDetail.length === 0) {
+            //向项别中添加暂降点
+            let chufa = []
+            item.phaiscType.push('暂态触发点')
+            //判断是否有限值(有上下限)
+            if (item.topLimit !== 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('上限')
+                item.phaiscType.push('下限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+
+                    //图列为A,B,C,暂降,上限,下限
+                    if (item.phaiscType.length == 6) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = max
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降,上限,下限
+                    if (item.phaiscType.length == 4) {
+                        let gvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = max
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有上限值
+            if (item.topLimit !== 0 && item.lowerLimit == 0) {
+                item.phaiscType.push('上限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,暂降,上限
+                    if (item.phaiscType.length == 5) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        item.maxValue = max
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降,上限
+                    if (item.phaiscType.length == 3) {
+                        let gvalue = []
+                        let topLimit = []
+                        item.maxValue = max
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有下限值
+            if (item.topLimit == 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('下限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,暂降,下限
+                    if (item.phaiscType.length == 5) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let lowerLimit = []
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降,下限
+                    if (item.phaiscType.length == 3) {
+                        let gvalue = []
+                        let lowerLimit = []
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //无限值
+            if (item.topLimit == 0 && item.lowerLimit == 0) {
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,暂降
+                    if (item.phaiscType.length == 4) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue > 1 ? (item.minValue - 0.5).toFixed(3) : item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降
+                    if (item.phaiscType.length == 2) {
+                        let gvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+        } else if (item.eventDetail == null) {
+            //判断是否有限值(有上下限)
+            if (item.topLimit !== 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('上限')
+                item.phaiscType.push('下限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,上限,下限
+                    if (item.phaiscType.length == 5) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = max
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,上限,下限
+                    if (item.phaiscType.length == 3) {
+                        let gvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = max
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit,
+                            chufa: []
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有上限值
+            if (item.topLimit !== 0 && item.lowerLimit == 0) {
+                item.phaiscType.push('上限')
+                if (item.minValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,上限
+                    if (item.phaiscType.length == 4) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        item.maxValue = max
+                        // item.minValue=item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,上限
+                    if (item.phaiscType.length == 2) {
+                        let gvalue = []
+                        let topLimit = []
+                        item.maxValue = max
+                        // item.minValue=item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有下限值
+            if (item.topLimit == 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('下限')
+                if (item.minValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,下限
+                    if (item.phaiscType.length == 4) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let lowerLimit = []
+                        // item.maxValue=item.topLimit
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            lowerLimit: lowerLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,下限
+                    if (item.phaiscType.length == 2) {
+                        let gvalue = []
+                        let lowerLimit = []
+                        // item.maxValue=item.topLimit
+                        item.minValue = min
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue,
+                            lowerLimit: lowerLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //无限值
+            if (item.topLimit == 0 && item.lowerLimit == 0) {
+                if (item.minValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C
+                    if (item.phaiscType.length == 3) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等
+                    if (item.phaiscType.length == 1) {
+                        let gvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            targetName: item.targetName,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        targetName: item.targetName,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+        }
+    })
+    rendering()
+}
+const rendering = () => {
+    height.value = mainHeight(200, list.value.length > 1 ? 2 : 1)
+
+    list.value.forEach((item: any) => {
+        let opitonserise: any[] = []
+        item.legend.forEach((item2: any) => {
+            if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#FFCC00'
+                        }
+                    },
+
+                    data: item.avalue
+                }
+                opitonserise.push(data)
+            } else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#009900'
+                        }
+                    },
+
+                    data: item.bvalue
+                }
+                opitonserise.push(data)
+            } else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#CC0000'
+                        }
+                    },
+                    data: item.cvalue
+                }
+                opitonserise.push(data)
+            } else if (item.topLimit !== undefined && item2 == '上限') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#FF33FF',
+                            lineStyle: {
+                                width: 2,
+                                color: '#FF33FF',
+                                type: 'dotted' //'dotted'虚线 'solid'实线
+                            }
+                        }
+                    },
+                    data: item.topLimit
+                }
+                opitonserise.push(data)
+            } else if (item.lowerLimit !== undefined && item2 == '下限') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#3399FF',
+                            lineStyle: {
+                                width: 2,
+                                color: '#3399FF',
+                                type: 'dotted' //'dotted'虚线 'solid'实线
+                            }
+                        }
+                    },
+                    data: item.lowerLimit
+                }
+                opitonserise.push(data)
+            } else if (item.chufa !== undefined && item2 == '暂态触发点') {
+                let data = {
+                    name: item2,
+                    type: 'scatter',
+                    symbol: `image://` + new URL('@/assets/point.png', import.meta.url).href,
+                    symbolSize: 16,
+                    itemStyle: {
+                        width: '22px',
+                        height: '22px'
+                    },
+                    data: item.chufa
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && item2 == '频率') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#990099',
+                            lineStyle: {
+                                width: 2,
+                                color: '#990099',
+                                type: 'solid' //'dotted'虚线 'solid'实线
+                            }
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && item2 == '负序电流') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#999933'
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && item2 == '三相电压不平衡度') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#FF6600'
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (
+                item.gvalue !== undefined &&
+                (item2 == '三相总有功功率' || item2 == '三相总无功功率' || item2 == '三相总视在功率')
+            ) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#0033ff'
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && (item2 == '总视在功率因数' || item2 == '总位移功率因数')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#00FF00'
+                        }
+                    },
+
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            }
+            // else {
+            //     opitonserise.push([])
+            // }
+        })
+        if (item.valueName == undefined) {
+            item.valueName = '无'
+        }
+        //console.log('渲染数据体',opitonserise)
+        item.serise = opitonserise
+    })
+    getEcharts()
+}
+const getEcharts = () => {
+    console.log("🚀 ~ list.value.forEach ~  list.value:",  list.value)
+
+    list.value.forEach((item: any, i: number) => {
+        item.option = {
+            backgroundColor: '#fff',
+            title: {
+                left: 'center',
+                text: item.title
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    //type: "shadow",
+                    type: 'cross', // 默认为直线，可选为：'line' | 'shadow'
+                    label: {
+                        color: '#fff',
+                        fontSize: 16
+                    }
+                },
+                textStyle: {
+                    color: '#fff',
+                    fontStyle: 'normal',
+                    opacity: 0.35,
+                    fontSize: 14
+                },
+                backgroundColor: 'rgba(0,0,0,0.55)',
+
+                formatter: function (params: any) {
+                    let tips = ''
+                    tips += '时刻:' + params[0].data[0] + '</br/>'
+                    for (let i = 0; i < params.length; i++) {
+                        if (params[i].seriesName == '暂态触发点') {
+                            tips += ''
+                            return tips
+                        }
+                        if (params[i].seriesName == 'A相谐波电流方向') {
+                            tips +=
+                                params[i].value[1] > 0
+                                    ? 'A相谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                        ? 'A相谐波电流方向:无<br/>'
+                                        : 'A相谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == 'B相谐波电流方向') {
+                            tips +=
+                                params[i].value[1] > 0
+                                    ? 'B相谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                        ? 'B相谐波电流方向:无<br/>'
+                                        : 'B相谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == 'C相谐波电流方向') {
+                            tips +=
+                                params[i].value[1] > 0
+                                    ? 'C相谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                        ? 'C相谐波电流方向:无<br/>'
+                                        : 'C相谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == '总谐波电流方向') {
+                            tips +=
+                                params[i].value[1] > 0
+                                    ? '总谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                        ? '总谐波电流方向:无<br/>'
+                                        : '总谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == '正序电压') {
+                            let str = (params[i].value[1] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips += params[i].seriesName + ':' + str1 + 'kV<br/>'
+                        } else if (params[i].seriesName == '零序电压' || params[i].seriesName == '负序电压') {
+                            let str = (params[i].value[1] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips += params[i].seriesName + ':' + str1 + 'V<br/>'
+                        } else if (params[i].seriesName !== '正序电压') {
+                            let str = (params[i].value[1] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips += params[i].seriesName + ':' + str1 + '<br/>'
+                        } else {
+                            let str = (params[i].value[2] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips += params[i].seriesName + ':' + str1 + '<br/>'
+
+                            let str2 = (params[i].value[3] * 1).toString()
+                            let reg2 = str2.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str12 = str.replace(reg2, '$1,')
+                            // if(params[i].seriesName){
+
+                            // }
+                            tips += params[i].seriesName + ':' + str12 + '<br/>'
+                        }
+                    }
+
+                    return tips
+                }
+            },
+            legend: {
+                left: '140px',
+                verticalAlign: 'top',
+                enabled: true,
+                itemDistance: 5,
+                textStyle: {
+                    rich: {
+                        a: {
+                            verticalAlign: 'middle'
+                        }
+                    },
+
+                    padding: [0, 0, 0, 0] //[上、右、下、左]
+                }
+            },
+            xAxis: [
+                {
+                    type: 'time',
+                    axisLine: {
+                        show: true,
+                        onZero: false
+                    },
+                    axisLabel: {
+                        textStyle: {
+                            fontFamily: 'dinproRegular'
+                        }
+                    }
+                }
+            ],
+            toolbox: {
+                show: true,
+                feature: {
+                    dataZoom: {
+                        // bottom: '10px',
+                        yAxisIndex: 'none'
+                    }
+                }
+            },
+            yAxis: [
+                {
+                    type: 'value',
+
+                    min: item.minValue,
+                    max: item.maxValue,
+                    name: item.valueName,
+                    axisLabel: {
+                        interval: 0,
+                        formatter: function (value: any) {
+                            return value.toFixed(3)
+                        },
+                        left: '20px'
+                    },
+
+                    axisLine: {
+                        show: true,
+                        onZero: false, //-----------重点
+                        lineStyle: {}
+                    },
+                    splitLine: {
+                        lineStyle: {
+                            // 使用深浅的间隔色
+                            type: 'dashed',
+                            opacity: 0.5
+                        }
+                    }
+                }
+            ],
+            series: item.serise
+        }
+        let aValues = []
+        let bValues = []
+        let CValues = []
+        let ZValues = []
+
+        if (
+            traceability.value.length > 0 &&
+            traceability.value[0].value != null &&
+            traceability.value[0].value.length > 0
+        ) {
+            for (let i = 0; i < traceability.value[0].value.length; i++) {
+                let T = traceability.value[0].value[i][0]
+                let A = traceability.value[0].value[i][1]
+                let B = traceability.value[0].value[i][2]
+                let C = traceability.value[0].value[i][3]
+                let Z = A + B + C
+                aValues.push([T, A > 0 ? 1 : A == 0 ? 0 : -1])
+                bValues.push([T, B > 0 ? 1 : B == 0 ? 0 : -1])
+                CValues.push([T, C > 0 ? 1 : C == 0 ? 0 : -1])
+                ZValues.push([T, Z > 0 ? 1 : Z == 0 ? 0 : -1])
+            }
+        }
+
+        if (item.targetName == '谐波电流方向') {
+            item.option.tooltip.axisPointer = null
+            item.option.yAxis[0] = {
+                type: 'value',
+                interval: 1,
+                min: -2, //最小值
+                max: 2,
+                axisLine: {
+                    show: true,
+                    onZero: false //-----------重点
+                },
+                splitLine: {
+                    lineStyle: {
+                        // 使用深浅的间隔色
+                        type: 'dashed',
+                        opacity: 0.5
+                    }
+                },
+                axisLabel: {
+                    formatter: function (value: any) {
+                        if (value == 0) {
+                            return '无'
+                        } else if (value == -1) {
+                            return '流出'
+                        } else if (value == 1) {
+                            return '流入'
+                        }
+                    }
+                }
+            }
+            item.option.series = [
+                {
+                    name: 'A相谐波电流方向',
+                    type: 'line',
+
+                    data: aValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#FFCC00'
+                        }
+                    }
+                },
+                {
+                    name: 'B相谐波电流方向',
+                    type: 'line',
+
+                    data: bValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#339900'
+                        }
+                    }
+                },
+                {
+                    name: 'C相谐波电流方向',
+                    type: 'line',
+
+                    data: CValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#CC0000'
+                        }
+                    }
+                },
+                {
+                    name: '总谐波电流方向',
+                    type: 'line',
+
+                    data: ZValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#0033ff'
+                        }
+                    }
+                }
+            ]
+        }
+    })
+}
+const conditionChange = () => {
+    //判断一个指标时
+    if (formData.condition.length == 1) {
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52') ||
+            formData.condition.includes('45')
+        ) {
+            showXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('46') ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49')
+        ) {
+            showJianXieBoCiShu.value = true
+        } else {
+            showJianXieBoCiShu.value = false
+        }
+    }
+    //判断2个指标时
+    if (formData.condition.length == 2) {
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            (formData.condition.includes('45') && formData.condition.includes('46')) ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52')
+        ) {
+            showXieBoCiShu.value = true
+            showJianXieBoCiShu.value = true
+        }
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            formData.condition.includes('45') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52')
+        ) {
+            showXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('46') ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49')
+        ) {
+            showJianXieBoCiShu.value = true
+        } else {
+            showJianXieBoCiShu.value = false
+        }
+    }
+    //判断3个指标时
+    if (formData.condition.length == 3) {
+        if (
+            (formData.condition.includes('40') ||
+                formData.condition.includes('43') ||
+                formData.condition.includes('44') ||
+                formData.condition.includes('50') ||
+                formData.condition.includes('39') ||
+                formData.condition.includes('51') ||
+                formData.condition.includes('52') ||
+                formData.condition.includes('45')) &&
+            (formData.condition.includes('46') ||
+                //formData.condition.includes('47') ||
+                // formData.condition.includes('48') ||
+                formData.condition.includes('49'))
+        ) {
+            showXieBoCiShu.value = true
+            showJianXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+            showJianXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('46') ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49')
+        ) {
+            showJianXieBoCiShu.value = true
+        } else {
+            showJianXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            formData.condition.includes('45') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52')
+        ) {
+            showXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+        }
+    }
+    //判断无指标时
+    if (formData.condition.length == 0) {
+        showJianXieBoCiShu.value = false
+        showXieBoCiShu.value = false
+    }
+    //根据指标判断值类型
+    if (formData.condition.includes('60') || formData.condition.includes('61') || formData.condition.includes('62')) {
+        typeOptions.value = [{ label: '平均值', value: 1 }]
+        formData.valueType = 1
+    } else {
+        typeOptions.value = [
+            { label: '平均值', value: 1 },
+            { label: '最小值', value: 2 },
+            { label: '最大值', value: 3 },
+            { label: 'cp95值', value: 4 }
+        ]
+    }
+}
+</script>
+<style></style>
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
index cf09df6c..f603095a 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
@@ -1,14 +1,14 @@
 <!--业务用户管理界面-->
 <template>
     <div class="default-main">
-        <TableHeader datePicker area>
+        <TableHeader datePicker area showExport>
             <template v-slot:select>
                 <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" clearable   maxlength="32" show-word-limit placeholder="筛选数据" />
                 </el-form-item>
             </template>
             <template v-slot:operation>
-                <el-button type="primary" @click="exportEvent" class="ml10" icon="el-icon-Download">导出</el-button>
+                <!-- <el-button type="primary" @click="exportEvent" class="ml10" icon="el-icon-Download">导出</el-button> -->
             </template>
         </TableHeader>
         <!--表格-->
diff --git a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue
index f3b696e5..848b20db 100644
--- a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue
+++ b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
 
-        <TableHeader area>
+        <TableHeader area showExport>
             <template #select>
                 <!-- <el-form-item label="统计类型:">
                     <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型" value-key="id">
@@ -99,8 +99,8 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'areaName', title: '区域' },
-        { field: 'gdName', title: '地级区' },
+        { field: 'areaName', title: '区域',minWidth: 100 },
+        { field: 'gdName', title: '地级区' ,minWidth: 100},
         {
             field: 'bdName',
             title: '供电公司',
@@ -114,7 +114,19 @@ const tableStore = new TableStore({
         { field: 'devName', title: '终端名称', minWidth: 80 },
         { field: 'ip', title: '网络参数' , minWidth: 100},
         { field: 'lineName', title: '监测点名称' , minWidth: 100},
-        { field: 'comFlag', title: '通讯状态' , minWidth: 100},
+        // { field: 'comFlag', title: '通讯状态' , minWidth: 100},
+        {
+            field: 'comFlag',
+            title: '通讯状态',
+            render: 'tag',
+            effect: 'dark',
+            custom: {
+                '正常': 'success',
+                '中断': 'danger',
+
+            },
+
+        },
         { field: 'loadType', title: '干扰源类型' , minWidth: 100},
        
        
diff --git a/src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index.vue b/src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index.vue
index 6cf4d772..213e2d4b 100644
--- a/src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index.vue
@@ -3,8 +3,8 @@
 
         <TableHeader area>
             <template #select>
- <el-form-item label="监测点性质:">
-                    <el-select v-model="tableStore.table.params.powerFlag" filterable multiple collapse-tags clearable
+                <el-form-item label="监测点性质:">
+                    <el-select v-model="tableStore.table.params.powerFlag" filterable  collapse-tags 
                         placeholder="请选择监测点性质">
                         <el-option v-for="item in terminalstatus" :key="item.value" :label="item.label"
                             :value="item.value">
@@ -18,7 +18,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-               
+
                 <el-form-item label="终端厂家:">
                     <el-select v-model="tableStore.table.params.manufacturer" filterable multiple collapse-tags
                         clearable placeholder="请选择终端厂家" value-key="id">
@@ -38,7 +38,7 @@
 
 
                 <el-form-item label="上报类型:">
-                    <el-select v-model="tableStore.table.params.monitorFlag" filterable multiple collapse-tags clearable
+                    <el-select v-model="tableStore.table.params.monitorFlag" 
                         placeholder="请选择上报类型">
                         <el-option v-for="item in communicationstatus" :key="item.value" :label="item.label"
                             :value="item.value">
@@ -50,7 +50,36 @@
             </template>
 
         </TableHeader>
-        <Table ref="tableRef" />
+        <div :style="{ height: tableStore.table.height }" v-loading="tableStore.table.loading">
+            <vxe-table  height="auto" auto-resize v-bind="defaultAttribute" :stripe='false' :scroll-y="{ enabled: false }"
+                :span-method="rowspanMethod" :data="tableData">
+                <vxe-column field="name1" title="区域">
+                </vxe-column>
+                <vxe-column field="name2" title="类型">
+                </vxe-column>
+                <vxe-column field="name3" title="分类型">
+                    <template #default="{ row }">
+                        <span>{{ Number.isFinite(row.name3-0)? row.name3+'kV':row.name3}}</span>
+                    </template>
+                </vxe-column>
+                <vxe-column field="subCount" title="变电站个数(个)">
+                     <template #default="{ row }">
+                        <span style="color: blue">{{ row.subCount }}</span>
+                    </template>
+                </vxe-column>
+                <vxe-column field="devCount" title="终端个数(个)">
+                    <template #default="{ row }">
+                        <span style="color: #006699">{{ row.devCount }}</span>
+                    </template>
+                </vxe-column>
+                <vxe-column field="lineCount" title="监测点个数(个)">
+                    <template #default="{ row }">
+                        <span style="color: green">{{ row.lineCount }}</span>
+                    </template>
+                </vxe-column>
+            </vxe-table>
+        </div>
+
 
 
 
@@ -62,17 +91,23 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import { useDictData } from '@/stores/dictData'
 import TableHeader from '@/components/table/header/index.vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import type { VxeTablePropTypes } from 'vxe-table'
+import XEUtils from 'xe-utils'
 const dictData = useDictData()
 defineOptions({
-    name: 'harmonic-boot/run/devicemessage'
+    name: 'harmonic-boot/run/terminalconts'
 })
-const view = ref(true)
+const treeData: any = ref([])
+const treeDataCopy: any = ref([])
+
 const classificationData = dictData.getBasicData('Statistical_Type', ["Report_Type"])
 const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
 const terminaloption = dictData.getBasicData('Dev_Manufacturers')
 const interfereoption = dictData.getBasicData('Interference_Source')
 //上报类型
 const communicationstatus = [
+
     { value: 2, label: "全部" },
     { value: 1, label: "灿能上报" },
     { value: 0, label: "非灿能上报" },
@@ -88,7 +123,7 @@ const terminalstatus = [
 const tableStore = new TableStore({
     url: '/device-boot/runManage/getTerminalLedger',
     method: 'POST',
-    isWebPaging: true,
+    showPage: false,
     column: [
         {
             field: 'index',
@@ -99,42 +134,108 @@ const tableStore = new TableStore({
             }
         },
         { field: 'areaName', title: '区域' },
-        { field: 'gdName', title: '地级区' },
-        {
-            field: 'bdName',
-            title: '供电公司',
-            minWidth: 100
-        },
-        { field: 'objName', title: '监测点对象名称', minWidth: 240 },
-        { field: 'manufacturer', title: '厂家', minWidth: 100 },
-        { field: 'scale', title: '电压等级', minWidth: 100 },
-        { field: 'businessType', title: '行业类型', minWidth: 100 },
-
-        { field: 'devName', title: '终端名称', minWidth: 80 },
-        { field: 'ip', title: '网络参数', minWidth: 100 },
-        { field: 'lineName', title: '监测点名称', minWidth: 100 },
-        { field: 'loadType', title: '干扰源类型', minWidth: 100 },
-
-
+        { field: 'gdName', title: '类型' },
+        { field: 'flx', title: '分类型' },
+        { field: 'gdName', title: '变电站个数(个)' },
+        { field: 'gdName', title: '终端个数(个)' },
+        { field: 'gdName', title: '监测点个数(个)' },
     ],
 
     loadCallback: () => {
-        tableStore.table.data.map((item: any) => {
-            item.onlineEvaluate == 3.14159 ? item.onlineEvaluate = '/' : item.onlineEvaluate <= 0.6 ? item.onlineEvaluate = '差' : item.onlineEvaluate <= 0.9 ? item.onlineEvaluate = '良' : item.onlineEvaluate <= 1 ? item.onlineEvaluate = '优' : '/'
-        })
+
+        treeData.value = tree2List(tableStore.table.data, Math.random() * 1000)
+
+        toColTreeData(XEUtils.toArrayTree(JSON.parse(JSON.stringify(treeData.value))))
+
     }
 })
 tableStore.table.params.statisticalType = classificationData[0]
 tableStore.table.params.serverName = "harmonic-boot"
 tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = '2'
-tableStore.table.params.evaluate = ''
 tableStore.table.params.powerFlag = 2
+tableStore.table.params.evaluate = ''
+
+
+tableStore.table.params.scale = voltageleveloption
+tableStore.table.params.manufacturer = terminaloption
+tableStore.table.params.loadType = interfereoption
+// 处理大数据卡顿
+const tree2List = (list: any, id: any) => {
+    //存储结果的数组
+    let arr: any = []
+    // 遍历 tree 数组
+    list.forEach((item: any) => {
+        item.parentId = id
+        item.id = (Math.random() * 1000)
+
+        // 判断item是否存在children
+        if (!item.list) return arr.push(item)
+        // 函数递归，对list数组进行tree2List的转换
+        const list = tree2List(item.list, item.id)
+        // 删除item的list属性
+        delete item.list
+        // 把item和list数组添加至结果数组
+        //..list: 意思是把list数组展开
+        arr.push(item, ...list)
+    })
+    // 返回结果数组
+    return arr
+}
+
+const toColTreeData = (treeData: any[]) => {
+    const options = { children: 'children' }
+    const list: any[] = []
+    const keyMap: any = {}
+    XEUtils.eachTree(treeData, (item, index, result, paths, parent) => {
+        keyMap[item.id] = item
+        item.keys = parent ? parent.keys.concat([item.id]) : [item.id]
+        if (!item.children || !item.children.length) {
+            const row: any = {}
+            // console.log("🚀 ~ item.keys.forEach ~ item:", item)
+
+            item.keys.forEach((key: any, index: number) => {
+                const level = index + 1
+                const obj = keyMap[key]
+
+                row[`id${level}`] = obj.id
+                row[`name${level}`] = obj.areaName || obj.name || obj.dicName
+                row[`subCount`] = obj.subCount
+                row[`devCount`] = obj.devCount
+                row[`lineCount`] = obj.lineCount
+            })
+            list.push(row)
+        }
+    }, options)
+
+    tableData.value = list
+}
+
+const tableData: any = ref([])
+
+// 通用行合并函数（将相同多列数据合并为一行）
+const rowspanMethod: VxeTablePropTypes.SpanMethod = ({ row, _rowIndex, column, visibleData }) => {
+    // console.log("🚀 ~ row:", row)
+    const fields = ['name1', 'name2', 'name3', 'name4', 'name5', 'name6']
+    const cellValue = row[column.field]
+    // console.log("🚀 ~ cellValue:", cellValue)
+    if (cellValue && fields.includes(column.field)) {
+        const prevRow = visibleData[_rowIndex - 1]
+        let nextRow = visibleData[_rowIndex + 1]
+        if (prevRow && prevRow[column.field] === cellValue) {
+            return { rowspan: 0, colspan: 0 }
+        } else {
+            let countRowspan = 1
+            while (nextRow && nextRow[column.field] === cellValue) {
+                nextRow = visibleData[++countRowspan + _rowIndex]
+            }
+            if (countRowspan > 1) {
+                return { rowspan: countRowspan, colspan: 1 }
+            }
+        }
+    }
+}
+
 
-tableStore.table.params.scale = []
-tableStore.table.params.manufacturer = []
-tableStore.table.params.loadType = []
-const wp = ref({})
 
 provide('tableStore', tableStore)
 onMounted(() => {
diff --git a/src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index2.vue b/src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index2.vue
new file mode 100644
index 00000000..a9049796
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index2.vue
@@ -0,0 +1,1147 @@
+<template>
+    <div>
+        <vxe-table border height="900" :scroll-y="{ enabled: false }" :span-method="rowspanMethod" :data="tableData">
+            <vxe-column field="name1" title="功能模块">
+            </vxe-column>
+            <vxe-column field="name2" title="详细功能">
+            </vxe-column>
+            <vxe-column field="name3" title="权限类型">
+            </vxe-column>
+            <vxe-column field="subCount" title="权限列表">
+            </vxe-column>
+            <vxe-column field="devCount" title="权限列表">
+            </vxe-column>
+            <vxe-column field="lineCount" title="权限列表">
+            </vxe-column>
+        </vxe-table>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import type { VxeTablePropTypes } from 'vxe-table'
+import XEUtils from 'xe-utils'
+
+
+const tableData = ref([])
+
+
+const getList = () => {
+    const list = [
+    {
+        "areaIndex": "db2ba5e64d77f8e94ea5e6bb267407a2",
+        "areaName": "江苏",
+        "parentId": 245.27872032628161,
+        "id": 134.62256558742314
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 134.62256558742314,
+        "id": 926.3176851075092
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": "ce5c16f5c409638e2f5682db25e5396b",
+        "dicName": "0.21",
+        "voltage": 0.21,
+        "parentId": 926.3176851075092,
+        "id": 708.7824913453129
+    },
+    {
+        "lineCount": 5,
+        "devCount": 4,
+        "subCount": 3,
+        "dicIndex": "3d68ceef26a579efe2fe0cdc654911b7",
+        "dicName": "0.38",
+        "voltage": 0.38,
+        "parentId": 926.3176851075092,
+        "id": 342.6613881772982
+    },
+    {
+        "lineCount": 135,
+        "devCount": 128,
+        "subCount": 124,
+        "dicIndex": "e3da890104e3c4ae1f005021411a1fd7",
+        "dicName": "10",
+        "voltage": 10,
+        "parentId": 926.3176851075092,
+        "id": 916.7109766996158
+    },
+    {
+        "lineCount": 13,
+        "devCount": 12,
+        "subCount": 12,
+        "dicIndex": "87065e15765e5899114a6d6b9e4fb3cb",
+        "dicName": "20",
+        "voltage": 20,
+        "parentId": 926.3176851075092,
+        "id": 376.2789802980606
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "8529cfa11356a0666afd3f9fa4da09a4",
+        "dicName": "35",
+        "voltage": 35,
+        "parentId": 926.3176851075092,
+        "id": 102.99236357187102
+    },
+    {
+        "lineCount": 5,
+        "devCount": 5,
+        "subCount": 4,
+        "dicIndex": "e96d74b79bd50ad0bc00a405246f1e1f",
+        "dicName": "110",
+        "voltage": 110,
+        "parentId": 926.3176851075092,
+        "id": 874.4325217932585
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "1b7b58ed8fcc2992b95334eaa9010c41",
+        "dicName": "220",
+        "voltage": 220,
+        "parentId": 926.3176851075092,
+        "id": 195.37376962236007
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 134.62256558742314,
+        "id": 515.2179859163743
+    },
+    {
+        "lineCount": 13,
+        "devCount": 13,
+        "subCount": 13,
+        "dicIndex": "02b791fee1eed8aa141129e2f9feb413",
+        "dicName": "电加热负荷",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 44.17072644588749
+    },
+    {
+        "lineCount": 77,
+        "devCount": 73,
+        "subCount": 71,
+        "dicIndex": "2185fb3c519edf9ff7c1e1e7450828c7",
+        "dicName": "变频调速设备",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 81.44052161261905
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "388275b68f82b1b33b112581298484fc",
+        "dicName": "轧机",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 225.62314864981238
+    },
+    {
+        "lineCount": 6,
+        "devCount": 6,
+        "subCount": 6,
+        "dicIndex": "4339d701719290d3bd7c8ef79539891b",
+        "dicName": "中频炉",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 478.179257106343
+    },
+    {
+        "lineCount": 7,
+        "devCount": 7,
+        "subCount": 7,
+        "dicIndex": "44884d33189cb3d50f4c21a6d37fe9ee",
+        "dicName": "精密加工",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 641.2426119274875
+    },
+    {
+        "lineCount": 28,
+        "devCount": 25,
+        "subCount": 23,
+        "dicIndex": "4dca0951e008f10fc398c8df0405122c",
+        "dicName": "商业/市政",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 665.0267189812844
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "5c3776c30c0f48ecd2dd7da7680ecdfe",
+        "dicName": "交直流逆变器",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 917.3798434461117
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "6e590e736c8a03dcab2556b3887ed65e",
+        "dicName": "冲击性负荷",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 196.77703954503679
+    },
+    {
+        "lineCount": 5,
+        "devCount": 5,
+        "subCount": 4,
+        "dicIndex": "7767b4a405fde0a73b16a3e5759c0ee2",
+        "dicName": "电焊负荷",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 524.3217194202134
+    },
+    {
+        "lineCount": 14,
+        "devCount": 13,
+        "subCount": 12,
+        "dicIndex": "ce4397cd6d37206897d6f978a6deedf0",
+        "dicName": "整流装置",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 774.8518522037291
+    },
+    {
+        "lineCount": 2,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "d5c70634f031ad571f092bc51ed84117",
+        "dicName": "医院",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 620.5484712138647
+    },
+    {
+        "lineCount": 3,
+        "devCount": 3,
+        "subCount": 2,
+        "dicIndex": "f7eccadbe45877b7cf2c48f98c3c68f1",
+        "dicName": "半导体制造",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 512.1056864036613
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "1a29fd407c23c1683fec99d920c24b27",
+        "dicName": "交通枢纽",
+        "voltage": null,
+        "parentId": 515.2179859163743,
+        "id": 454.69539316397413
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 134.62256558742314,
+        "id": 630.2699251802181
+    },
+    {
+        "lineCount": 162,
+        "devCount": 153,
+        "subCount": 145,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 630.2699251802181,
+        "id": 457.4269802072985
+    },
+    {
+        "name": "上报类型",
+        "parentId": 134.62256558742314,
+        "id": 111.68238932427421
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": null,
+        "dicName": "灿能上报",
+        "voltage": null,
+        "parentId": 111.68238932427421,
+        "id": 790.9938860402641
+    },
+    {
+        "lineCount": 161,
+        "devCount": 152,
+        "subCount": 144,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 111.68238932427421,
+        "id": 652.586632361174
+    },
+    {
+        "areaIndex": "e81ba9e784e1cbbd7f120bf570ac8ddd",
+        "areaName": "浙江",
+        "parentId": 245.27872032628161,
+        "id": 883.4021758955981
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 883.4021758955981,
+        "id": 234.13294500153125
+    },
+    {
+        "lineCount": 11,
+        "devCount": 10,
+        "subCount": 10,
+        "dicIndex": "3d68ceef26a579efe2fe0cdc654911b7",
+        "dicName": "0.38",
+        "voltage": 0.38,
+        "parentId": 234.13294500153125,
+        "id": 392.01423411919103
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "de3131cde4a9adec31c98af6037acd9a",
+        "dicName": "0.48",
+        "voltage": 0.48,
+        "parentId": 234.13294500153125,
+        "id": 383.3519506885934
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": "e3da890104e3c4ae1f005021411a1fd7",
+        "dicName": "10",
+        "voltage": 10,
+        "parentId": 234.13294500153125,
+        "id": 2.350571977090654
+    },
+    {
+        "lineCount": 21,
+        "devCount": 16,
+        "subCount": 16,
+        "dicIndex": "87065e15765e5899114a6d6b9e4fb3cb",
+        "dicName": "20",
+        "voltage": 20,
+        "parentId": 234.13294500153125,
+        "id": 450.3010595208894
+    },
+    {
+        "lineCount": 3,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "e96d74b79bd50ad0bc00a405246f1e1f",
+        "dicName": "110",
+        "voltage": 110,
+        "parentId": 234.13294500153125,
+        "id": 496.9428837857617
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "1b7b58ed8fcc2992b95334eaa9010c41",
+        "dicName": "220",
+        "voltage": 220,
+        "parentId": 234.13294500153125,
+        "id": 677.1817957824691
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 883.4021758955981,
+        "id": 948.3235034446267
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "02b791fee1eed8aa141129e2f9feb413",
+        "dicName": "电加热负荷",
+        "voltage": null,
+        "parentId": 948.3235034446267,
+        "id": 821.3797276171413
+    },
+    {
+        "lineCount": 6,
+        "devCount": 6,
+        "subCount": 6,
+        "dicIndex": "2185fb3c519edf9ff7c1e1e7450828c7",
+        "dicName": "变频调速设备",
+        "voltage": null,
+        "parentId": 948.3235034446267,
+        "id": 584.8971257135265
+    },
+    {
+        "lineCount": 8,
+        "devCount": 8,
+        "subCount": 8,
+        "dicIndex": "4dca0951e008f10fc398c8df0405122c",
+        "dicName": "商业/市政",
+        "voltage": null,
+        "parentId": 948.3235034446267,
+        "id": 151.90438978100508
+    },
+    {
+        "lineCount": 18,
+        "devCount": 16,
+        "subCount": 15,
+        "dicIndex": "5c3776c30c0f48ecd2dd7da7680ecdfe",
+        "dicName": "交直流逆变器",
+        "voltage": null,
+        "parentId": 948.3235034446267,
+        "id": 851.6470684502824
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "6e590e736c8a03dcab2556b3887ed65e",
+        "dicName": "冲击性负荷",
+        "voltage": null,
+        "parentId": 948.3235034446267,
+        "id": 47.212951323485356
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "7767b4a405fde0a73b16a3e5759c0ee2",
+        "dicName": "电焊负荷",
+        "voltage": null,
+        "parentId": 948.3235034446267,
+        "id": 88.34633257010948
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "ce4397cd6d37206897d6f978a6deedf0",
+        "dicName": "整流装置",
+        "voltage": null,
+        "parentId": 948.3235034446267,
+        "id": 253.32228574972905
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 883.4021758955981,
+        "id": 115.48117354027853
+    },
+    {
+        "lineCount": 39,
+        "devCount": 30,
+        "subCount": 28,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 115.48117354027853,
+        "id": 253.5697359713447
+    },
+    {
+        "name": "上报类型",
+        "parentId": 883.4021758955981,
+        "id": 431.2689542390755
+    },
+    {
+        "lineCount": 39,
+        "devCount": 30,
+        "subCount": 28,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 431.2689542390755,
+        "id": 743.4794385242905
+    },
+    {
+        "areaIndex": "fc3af8c91df24f8a7d307e68223c21fe",
+        "areaName": "江西",
+        "parentId": 245.27872032628161,
+        "id": 797.6236473813805
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 797.6236473813805,
+        "id": 776.2524731769633
+    },
+    {
+        "lineCount": 2,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "3d68ceef26a579efe2fe0cdc654911b7",
+        "dicName": "0.38",
+        "voltage": 0.38,
+        "parentId": 776.2524731769633,
+        "id": 151.20925579100563
+    },
+    {
+        "lineCount": 2,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "37b81bf8aa0fd54098716da3fc0ee433",
+        "dicName": "6",
+        "voltage": 6,
+        "parentId": 776.2524731769633,
+        "id": 294.56182354950334
+    },
+    {
+        "lineCount": 3,
+        "devCount": 3,
+        "subCount": 2,
+        "dicIndex": "e3da890104e3c4ae1f005021411a1fd7",
+        "dicName": "10",
+        "voltage": 10,
+        "parentId": 776.2524731769633,
+        "id": 725.8723769613364
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "8529cfa11356a0666afd3f9fa4da09a4",
+        "dicName": "35",
+        "voltage": 35,
+        "parentId": 776.2524731769633,
+        "id": 805.4557128498625
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "e96d74b79bd50ad0bc00a405246f1e1f",
+        "dicName": "110",
+        "voltage": 110,
+        "parentId": 776.2524731769633,
+        "id": 453.83215127911615
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 797.6236473813805,
+        "id": 786.1700595206964
+    },
+    {
+        "lineCount": 7,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": "2185fb3c519edf9ff7c1e1e7450828c7",
+        "dicName": "变频调速设备",
+        "voltage": null,
+        "parentId": 786.1700595206964,
+        "id": 905.516785866928
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": "4dca0951e008f10fc398c8df0405122c",
+        "dicName": "商业/市政",
+        "voltage": null,
+        "parentId": 786.1700595206964,
+        "id": 650.2004307660359
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 797.6236473813805,
+        "id": 433.35571107352445
+    },
+    {
+        "lineCount": 9,
+        "devCount": 4,
+        "subCount": 2,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 433.35571107352445,
+        "id": 109.51063993599574
+    },
+    {
+        "name": "上报类型",
+        "parentId": 797.6236473813805,
+        "id": 299.17278812748503
+    },
+    {
+        "lineCount": 9,
+        "devCount": 4,
+        "subCount": 2,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 299.17278812748503,
+        "id": 927.935569116833
+    },
+    {
+        "areaIndex": "eea6cde334c5e105580c1998ee03120a",
+        "areaName": "广东",
+        "parentId": 245.27872032628161,
+        "id": 511.22619387082534
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 511.22619387082534,
+        "id": 727.3231546341285
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "e3da890104e3c4ae1f005021411a1fd7",
+        "dicName": "10",
+        "voltage": 10,
+        "parentId": 727.3231546341285,
+        "id": 574.5622720441963
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 511.22619387082534,
+        "id": 550.8238841530683
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "2185fb3c519edf9ff7c1e1e7450828c7",
+        "dicName": "变频调速设备",
+        "voltage": null,
+        "parentId": 550.8238841530683,
+        "id": 102.75507175981046
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 511.22619387082534,
+        "id": 495.72752866395706
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 495.72752866395706,
+        "id": 259.29297822747685
+    },
+    {
+        "name": "上报类型",
+        "parentId": 511.22619387082534,
+        "id": 423.75568346624993
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 423.75568346624993,
+        "id": 790.1689877377449
+    },
+    {
+        "areaIndex": "a4ce53d14246cbd6eb2986edf7a3cd65",
+        "areaName": "安徽",
+        "parentId": 245.27872032628161,
+        "id": 328.8825685198562
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 328.8825685198562,
+        "id": 171.60006872395007
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": "e96d74b79bd50ad0bc00a405246f1e1f",
+        "dicName": "110",
+        "voltage": 110,
+        "parentId": 171.60006872395007,
+        "id": 57.31277814492341
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 328.8825685198562,
+        "id": 126.1820042070787
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": "02b791fee1eed8aa141129e2f9feb413",
+        "dicName": "电加热负荷",
+        "voltage": null,
+        "parentId": 126.1820042070787,
+        "id": 522.3176085127526
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 328.8825685198562,
+        "id": 595.8856630318883
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 595.8856630318883,
+        "id": 663.7692101387883
+    },
+    {
+        "name": "上报类型",
+        "parentId": 328.8825685198562,
+        "id": 59.98602427297284
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 1,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 59.98602427297284,
+        "id": 349.00176522120097
+    },
+    {
+        "areaIndex": "02d1b4e1680413eb72f3fa63d46c496c",
+        "areaName": "海南",
+        "parentId": 245.27872032628161,
+        "id": 422.0814975245792
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 422.0814975245792,
+        "id": 773.2386517587375
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "e3da890104e3c4ae1f005021411a1fd7",
+        "dicName": "10",
+        "voltage": 10,
+        "parentId": 773.2386517587375,
+        "id": 66.32396253860517
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 422.0814975245792,
+        "id": 491.9381928187878
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "0dc3526fad2c73d78275800edf6b8877",
+        "dicName": "电解负荷",
+        "voltage": null,
+        "parentId": 491.9381928187878,
+        "id": 816.9786614317316
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "ce4397cd6d37206897d6f978a6deedf0",
+        "dicName": "整流装置",
+        "voltage": null,
+        "parentId": 491.9381928187878,
+        "id": 978.3436463890696
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 422.0814975245792,
+        "id": 308.60392950403457
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 308.60392950403457,
+        "id": 842.0742018613938
+    },
+    {
+        "name": "上报类型",
+        "parentId": 422.0814975245792,
+        "id": 65.7760539406338
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 65.7760539406338,
+        "id": 103.365524298779
+    },
+    {
+        "areaIndex": "7cb84b9da4a31fbb2c68f5f70d923e05",
+        "areaName": "福建",
+        "parentId": 245.27872032628161,
+        "id": 738.1978884115381
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 738.1978884115381,
+        "id": 693.8942778797182
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "3d68ceef26a579efe2fe0cdc654911b7",
+        "dicName": "0.38",
+        "voltage": 0.38,
+        "parentId": 693.8942778797182,
+        "id": 774.4481317271999
+    },
+    {
+        "lineCount": 15,
+        "devCount": 15,
+        "subCount": 8,
+        "dicIndex": "e3da890104e3c4ae1f005021411a1fd7",
+        "dicName": "10",
+        "voltage": 10,
+        "parentId": 693.8942778797182,
+        "id": 246.16340217038803
+    },
+    {
+        "lineCount": 4,
+        "devCount": 4,
+        "subCount": 1,
+        "dicIndex": "87065e15765e5899114a6d6b9e4fb3cb",
+        "dicName": "20",
+        "voltage": 20,
+        "parentId": 693.8942778797182,
+        "id": 67.4788840126188
+    },
+    {
+        "lineCount": 4,
+        "devCount": 4,
+        "subCount": 1,
+        "dicIndex": "1b7b58ed8fcc2992b95334eaa9010c41",
+        "dicName": "220",
+        "voltage": 220,
+        "parentId": 693.8942778797182,
+        "id": 466.6957078653895
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 738.1978884115381,
+        "id": 923.8907744788594
+    },
+    {
+        "lineCount": 13,
+        "devCount": 13,
+        "subCount": 9,
+        "dicIndex": "2185fb3c519edf9ff7c1e1e7450828c7",
+        "dicName": "变频调速设备",
+        "voltage": null,
+        "parentId": 923.8907744788594,
+        "id": 619.4875265568129
+    },
+    {
+        "lineCount": 12,
+        "devCount": 12,
+        "subCount": 1,
+        "dicIndex": "44884d33189cb3d50f4c21a6d37fe9ee",
+        "dicName": "精密加工",
+        "voltage": null,
+        "parentId": 923.8907744788594,
+        "id": 54.467022366358584
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 738.1978884115381,
+        "id": 90.77829325228693
+    },
+    {
+        "lineCount": 25,
+        "devCount": 25,
+        "subCount": 10,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 90.77829325228693,
+        "id": 490.5915741616578
+    },
+    {
+        "name": "上报类型",
+        "parentId": 738.1978884115381,
+        "id": 128.98997016439816
+    },
+    {
+        "lineCount": 25,
+        "devCount": 25,
+        "subCount": 10,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 128.98997016439816,
+        "id": 686.2046659100682
+    },
+    {
+        "areaIndex": "7b6dd786f92b0cd1e761a566d963f179",
+        "areaName": "湖南",
+        "parentId": 245.27872032628161,
+        "id": 492.4735951874475
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 492.4735951874475,
+        "id": 787.4844186614563
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "3d68ceef26a579efe2fe0cdc654911b7",
+        "dicName": "0.38",
+        "voltage": 0.38,
+        "parentId": 787.4844186614563,
+        "id": 653.4717161041215
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "e3da890104e3c4ae1f005021411a1fd7",
+        "dicName": "10",
+        "voltage": 10,
+        "parentId": 787.4844186614563,
+        "id": 419.9010160226446
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 492.4735951874475,
+        "id": 145.11155014258725
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "4dca0951e008f10fc398c8df0405122c",
+        "dicName": "商业/市政",
+        "voltage": null,
+        "parentId": 145.11155014258725,
+        "id": 573.2459857112904
+    },
+    {
+        "lineCount": 1,
+        "devCount": 1,
+        "subCount": 1,
+        "dicIndex": "5c3776c30c0f48ecd2dd7da7680ecdfe",
+        "dicName": "交直流逆变器",
+        "voltage": null,
+        "parentId": 145.11155014258725,
+        "id": 367.5552504109476
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 492.4735951874475,
+        "id": 879.7493194852016
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 879.7493194852016,
+        "id": 273.6796108672182
+    },
+    {
+        "name": "上报类型",
+        "parentId": 492.4735951874475,
+        "id": 167.1013301236799
+    },
+    {
+        "lineCount": 2,
+        "devCount": 2,
+        "subCount": 2,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 167.1013301236799,
+        "id": 777.019222329669
+    },
+    {
+        "areaIndex": "aae4021324c16b989d73709ee0c29d15",
+        "areaName": "四川",
+        "parentId": 245.27872032628161,
+        "id": 22.76574540533516
+    },
+    {
+        "name": "标准电压等级",
+        "parentId": 22.76574540533516,
+        "id": 674.0378661572616
+    },
+    {
+        "lineCount": 103,
+        "devCount": 103,
+        "subCount": 1,
+        "dicIndex": "3d68ceef26a579efe2fe0cdc654911b7",
+        "dicName": "0.38",
+        "voltage": 0.38,
+        "parentId": 674.0378661572616,
+        "id": 656.7311292776277
+    },
+    {
+        "name": "干扰源类型",
+        "parentId": 22.76574540533516,
+        "id": 135.55790769505148
+    },
+    {
+        "lineCount": 7,
+        "devCount": 7,
+        "subCount": 1,
+        "dicIndex": "4dca0951e008f10fc398c8df0405122c",
+        "dicName": "商业/市政",
+        "voltage": null,
+        "parentId": 135.55790769505148,
+        "id": 459.17677838720937
+    },
+    {
+        "lineCount": 96,
+        "devCount": 96,
+        "subCount": 1,
+        "dicIndex": "d498a06543915dfa5d2d529526ebcf74",
+        "dicName": "城市负荷",
+        "voltage": null,
+        "parentId": 135.55790769505148,
+        "id": 902.4525509312107
+    },
+    {
+        "name": "制造厂商",
+        "parentId": 22.76574540533516,
+        "id": 921.8698113479253
+    },
+    {
+        "lineCount": 103,
+        "devCount": 103,
+        "subCount": 1,
+        "dicIndex": "8fa73802c9e1abab973adcbeb0d58567",
+        "dicName": "南京灿能",
+        "voltage": null,
+        "parentId": 921.8698113479253,
+        "id": 804.2093222468787
+    },
+    {
+        "name": "上报类型",
+        "parentId": 22.76574540533516,
+        "id": 743.8760513645908
+    },
+    {
+        "lineCount": 103,
+        "devCount": 103,
+        "subCount": 1,
+        "dicIndex": null,
+        "dicName": "非灿能上报",
+        "voltage": null,
+        "parentId": 743.8760513645908,
+        "id": 571.3028767183814
+    }
+]
+    //     const list = [
+    //     { id: '10000', parentId: null, name: '账号管理' },
+    //     { id: '11000', parentId: '10000', name: '用户管理' },
+    //     { id: '11100', parentId: '11000', name: '查看' },
+    //     { id: '11110', parentId: '11100', name: '用户列表' },
+    //     { id: '11200', parentId: '11000', name: '编辑' },
+    //     { id: '11210', parentId: '11200', name: '用户列表' },
+    //     { id: '11220', parentId: '11200', name: '新增用户' },
+    //     { id: '11300', parentId: '11000', name: '操作' },
+    //     { id: '11310', parentId: '11300', name: '新增' },
+    //     { id: '11320', parentId: '11300', name: '删除' },
+    //     { id: '11330', parentId: '11300', name: '修改' },
+    //     { id: '12000', parentId: '10000', name: '角色管理' },
+    //     { id: '12100', parentId: '12000', name: '查看' },
+    //     { id: '12110', parentId: '12100', name: '角色列表' },
+    //     { id: '12200', parentId: '12000', name: '编辑' },
+    //     { id: '122100', parentId: '12200', name: '角色列表' },
+    //     { id: '12220', parentId: '12200', name: '新增角色' },
+    //     { id: '12300', parentId: '12000', name: '操作' },
+    //     { id: '12310', parentId: '12300', name: '新增' },
+    //     { id: '12320', parentId: '12300', name: '删除' },
+    //     { id: '12330', parentId: '12300', name: '修改' },
+    //     { id: '20000', parentId: null, name: '个人中心' },
+    //     { id: '21000', parentId: '20000', name: '个性化设置' },
+    //     { id: '21100', parentId: '21000', name: '查看' },
+    //     { id: '21110', parentId: '21100', name: '信息列表' },
+    //     { id: '21200', parentId: '21000', name: '操作' },
+    //     { id: '21210', parentId: '21200', name: '重置信息' },
+    //     { id: '22000', parentId: '20000', name: '账户管理' },
+    //     { id: '22100', parentId: '22000', name: '查看' },
+    //     { id: '22110', parentId: '22100', name: '账户余额' },
+    //     { id: '22120', parentId: '22100', name: '帐变记录' }
+    //   ]
+    return list
+}
+
+// 将普通树结构转换为横向树列表
+const toColTreeData = (treeData: any[]) => {
+    const options = { children: 'children' }
+    const list: any[] = []
+    const keyMap: any = {}
+    XEUtils.eachTree(treeData, (item, index, result, paths, parent) => {
+        keyMap[item.id] = item
+        item.keys = parent ? parent.keys.concat([item.id]) : [item.id]
+        if (!item.children || !item.children.length) {
+            const row: any = {}
+            console.log("🚀 ~ item.keys.forEach ~ item:", item)
+
+            item.keys.forEach((key: any, index: number) => {
+                const level = index + 1
+                const obj = keyMap[key]
+
+                row[`id${level}`] = obj.id
+                row[`name${level}`] = obj.areaName || obj.name || obj.dicName
+                row[`subCount`] = obj.subCount
+                row[`devCount`] = obj.devCount
+                row[`lineCount`] = obj.lineCount
+            })
+            list.push(row)
+        }
+    }, options)
+    console.log("🚀 ~ toColTreeData ~ list:", list)
+
+    tableData.value = list
+}
+
+// 通用行合并函数（将相同多列数据合并为一行）
+const rowspanMethod: VxeTablePropTypes.SpanMethod = ({ row, _rowIndex, column, visibleData }) => {
+    // console.log("🚀 ~ row:", row)
+    const fields = ['name1', 'name2', 'name3', 'name4', 'name5', 'name6']
+    const cellValue = row[column.field]
+    // console.log("🚀 ~ cellValue:", cellValue)
+    if (cellValue && fields.includes(column.field)) {
+        const prevRow = visibleData[_rowIndex - 1]
+        let nextRow = visibleData[_rowIndex + 1]
+        if (prevRow && prevRow[column.field] === cellValue) {
+            return { rowspan: 0, colspan: 0 }
+        } else {
+            let countRowspan = 1
+            while (nextRow && nextRow[column.field] === cellValue) {
+                nextRow = visibleData[++countRowspan + _rowIndex]
+            }
+            if (countRowspan > 1) {
+                return { rowspan: countRowspan, colspan: 1 }
+            }
+        }
+    }
+}
+
+const treeData = XEUtils.toArrayTree(getList())
+toColTreeData(treeData)
+</script>
\ No newline at end of file
diff --git a/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue b/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue
index 07f96267..9cc38d89 100644
--- a/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue
+++ b/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
 
-        <TableHeader area>
+        <TableHeader area showExport>
             <template #select>
                 <!-- <el-form-item label="统计类型:">
                     <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型" value-key="id">
@@ -100,8 +100,8 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'areaName', title: '区域' },
-        { field: 'gdName', title: '地级区' },
+        { field: 'areaName', title: '区域', minWidth: 100},
+        { field: 'gdName', title: '地级区' ,minWidth: 100},
         {
             field: 'bdName',
             title: '供电公司',
diff --git a/src/views/pqs/supervise_jb/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise_jb/interfere/components/undocumented/detail.vue
index 560f6aa7..ec6ff8c3 100644
--- a/src/views/pqs/supervise_jb/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise_jb/interfere/components/undocumented/detail.vue
@@ -66,11 +66,11 @@
                     detailData.userType == '5'
                 "
             >
-                {{ proviteData.nonlinearLoadType }}
+                {{ proviteData?.nonlinearLoadType ||''}}
             </el-descriptions-item>
             <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData.needGovernance == 0 ? '否' : '是' }}
+                    {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
                 </span>
                 <span
                     v-if="
@@ -80,13 +80,13 @@
                         detailData.userType == 5
                     "
                 >
-                    {{ proviteData.needGovernance == 0 ? '否' : '是' }}
+                    {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
                 </span>
-                <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
+                <span v-if="detailData.userType == 6">{{ proviteData?.needGovernance == 1 ? '是' : '否' }}</span>
             </el-descriptions-item>
             <el-descriptions-item label="是否开展背景测试">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
                 </span>
                 <span
                     v-if="
@@ -96,10 +96,10 @@
                         detailData.userType == 5
                     "
                 >
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
                 </span>
                 <span v-if="detailData.userType == 6">
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
                 </span>
             </el-descriptions-item>
 
@@ -117,14 +117,14 @@
 
             <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
                 <span>
-                    {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
+                    {{ proviteData.antiInterferenceTest == 1 ? '是' : '否' }}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item
                 label="用户协议容量（MVA）"
                 v-if="detailData.userType == 0 || detailData.userType == 1"
             >
-                {{ proviteData.agreementCapacity }}
+                {{ proviteData?.agreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item
                 label="PCC供电终端容量（MVA）"
@@ -135,7 +135,7 @@
                     detailData.userType == '5'
                 "
             >
-                {{ proviteData.pccEquipmentCapacity }}
+                {{ proviteData?.pccEquipmentCapacity }}
             </el-descriptions-item>
             <el-descriptions-item
                 label="基准短路容量（MVA）"
@@ -146,7 +146,7 @@
                     detailData.userType == '5'
                 "
             >
-                {{ proviteData.baseShortCircuitCapacity }}
+                {{ proviteData?.baseShortCircuitCapacity }}
             </el-descriptions-item>
             <el-descriptions-item
                 label="系统最小短路容量（MVA）"
@@ -225,8 +225,8 @@
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                         <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                     </el-icon>
-                    <a target="_blank" :href="proviteData.feasibilityReport?.url" rel="nofollow">
-                        {{ proviteData.feasibilityReport?.name }}
+                    <a target="_blank" :href="proviteData?.feasibilityReport?.url" rel="nofollow">
+                        {{ proviteData?.feasibilityReport?.name }}
                     </a>
                 </span>
                 <span
@@ -240,16 +240,16 @@
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                         <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                     </el-icon>
-                    <a target="_blank" :href="proviteData.feasibilityReport?.url">
-                        {{ proviteData.feasibilityReport?.name }}
+                    <a target="_blank" :href="proviteData?.feasibilityReport?.url">
+                        {{ proviteData?.feasibilityReport?.name }}
                     </a>
                 </span>
                 <span v-if="detailData.userType == 6">
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                         <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                     </el-icon>
-                    <a target="_blank" :href="proviteData.feasibilityReport?.url">
-                        {{ proviteData.feasibilityReport?.name }}
+                    <a target="_blank" :href="proviteData?.feasibilityReport?.url">
+                        {{ proviteData?.feasibilityReport?.name }}
                     </a>
                 </span>
             </el-descriptions-item>
@@ -656,54 +656,59 @@ const getProviteData = async () => {
     ) {
         proviteData.value = detailData.value.userReportSubstationPO
         //查询非线性负荷类型
-        await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => {
+       
+
+        if(proviteData.value?.nonlinearLoadType !=undefined){
+            await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => {
             proviteData.value.nonlinearLoadType = res.data?.name
         })
+        }
+       
     } else {
         proviteData.value = detailData.value.userReportSensitivePO
     }
     //可研报告
-    if (proviteData.value.feasibilityReport) {
+    if (proviteData.value?.feasibilityReport  !=undefined) {
         await getFileNamePath(proviteData.value.feasibilityReport, 'feasibilityReport')
     }
     //项目初步设计说明书
-    if (proviteData.value.preliminaryDesignDescription) {
+    if (proviteData.value?.preliminaryDesignDescription  !=undefined) {
         await getFileNamePath(proviteData.value.preliminaryDesignDescription, 'preliminaryDesignDescription')
     }
     //预测评估报告
-    if (proviteData.value.predictionEvaluationReport) {
+    if (proviteData.value?.predictionEvaluationReport !=undefined) {
         await getFileNamePath(proviteData.value.predictionEvaluationReport, 'predictionEvaluationReport')
     }
 
     //预测评估评审意见报告
-    if (proviteData.value.predictionEvaluationReviewOpinions) {
+    if (proviteData.value?.predictionEvaluationReviewOpinions  !=undefined) {
         await getFileNamePath(
             proviteData.value.predictionEvaluationReviewOpinions,
             'predictionEvaluationReviewOpinions'
         )
     }
     //用户接入变电站主接线示意图
-    if (proviteData.value.substationMainWiringDiagram) {
+    if (proviteData.value?.substationMainWiringDiagram  !=undefined) {
         await getFileNamePath(proviteData.value.substationMainWiringDiagram, 'substationMainWiringDiagram')
     }
 
     //主要敏感终端清单
-    if (proviteData.value.sensitiveDevices) {
+    if (proviteData.value?.sensitiveDevices !=undefined) {
         await getFileNamePath(proviteData.value.sensitiveDevices, 'sensitiveDevices')
     }
 
     //抗扰度测试报告
-    if (proviteData.value.antiInterferenceReport) {
+    if (proviteData.value?.antiInterferenceReport!=undefined) {
         await getFileNamePath(proviteData.value.antiInterferenceReport, 'antiInterferenceReport')
     }
 
     //背景电能质量测试报告
-    if (proviteData.value.powerQualityReport) {
+    if (proviteData.value?.powerQualityReport!=undefined) {
         await getFileNamePath(proviteData.value.powerQualityReport, 'powerQualityReport')
     }
 
     //其他附件
-    if (proviteData.value.additionalAttachments) {
+    if (proviteData.value?.additionalAttachments!=undefined) {
         getFileNamePath(proviteData.value.additionalAttachments, 'additionalAttachments')
     }
 
diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue
index f744e8f2..1e2676da 100644
--- a/src/views/pqs/voltageSags/Region/transientList/index.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
         <div v-show="view">
-            <TableHeader datePicker>
+            <TableHeader datePicker showExport>
                 <template #select>
                     <el-form-item label="统计类型:">
                         <el-radio-group v-model="tableStore.table.params.isType">
diff --git a/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue b/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
index f74771be..18a96546 100644
--- a/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
+++ b/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
         <div v-show="view">
-            <TableHeader datePicker ref="TableHeaderRef">
+            <TableHeader datePicker :showReset="false" showExport ref="TableHeaderRef">
                 <template #select>
 <!--                    <el-form-item label="筛选">-->
 <!--                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" />-->
diff --git a/src/views/pqs/voltageSags/analyse/impactscope/index.vue b/src/views/pqs/voltageSags/analyse/impactscope/index.vue
index 9b5d7e4b..06025849 100644
--- a/src/views/pqs/voltageSags/analyse/impactscope/index.vue
+++ b/src/views/pqs/voltageSags/analyse/impactscope/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
         <div v-show="view">
-            <TableHeader datePicker ref="TableHeaderRef">
+            <TableHeader datePicker ref="TableHeaderRef" showExport>
                 <template #select>
                     <el-form-item label="关键字">
                         <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入事件关联分析描述"
@@ -174,7 +174,7 @@ onMounted(() => {
     ])
 })
 const cellClassName = ({ row, rowIndex }) => {
-    console.log("🚀 ~ cellClassName ~ rowIndex:", rowIndex)
+  
     if (rowIndex === 0) {
         return 'highlight-first-row';
     }
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
index 5691dfc8..51981671 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
@@ -2,7 +2,7 @@
     <div>
         <div v-show="view">
             <!-- 表头 -->
-            <TableHeader date-picker>
+            <TableHeader date-picker showExport>
                 <template v-slot:operation>
                     <el-button :icon='Download' type='primary' @click='download'>波形下载</el-button>
                 </template>
@@ -12,7 +12,7 @@
 
         </div>
         <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
-            <waveForm ref="waveFormRef" senior  @backbxlb="backbxlb" />
+            <waveForm ref="waveFormRef" senior @backbxlb="backbxlb" />
         </div>
     </div>
 </template>
@@ -43,9 +43,11 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { width: '60', type: 'checkbox' },
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
+        {
+            title: '序号', width: 80, formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
         { title: '变电站名称', field: 'subName', minWidth: '130' },
         { title: '监测点名称', field: 'lineName', minWidth: '130' },
         { title: '网络参数', field: 'ip', minWidth: '130' },
@@ -53,8 +55,16 @@ const tableStore = new TableStore({
         { title: '暂降发生时刻', field: 'startTime', width: '200' },
         { title: '暂降类型', field: 'advanceType', minWidth: '130' },
         { title: '暂降原因', field: 'advanceReason', minWidth: '130' },
-        { title: '触发类型', field: 'eventTypeName', minWidth: '80' },
-        { title: '暂降(骤升)幅值(%)', field: 'featureAmplitude', minWidth: '80' },
+        {
+            title: '触发类型', field: 'eventType', minWidth: '80', formatter: (row: any) => {
+                return eventTypeOptions.find(item => item.id === row.cellValue)?.name || '/'
+            }
+        },
+        {
+            title: '暂降(骤升)幅值(%)', field: 'featureAmplitude', minWidth: '80', formatter: (row: any) => {
+                return (row.cellValue * 100).toFixed(0)
+            }
+        },
         { title: '持续时间(s)', field: 'duration', minWidth: '80' },
         { title: '严重度', field: 'severity', minWidth: '80' },
         {
@@ -105,10 +115,7 @@ const tableStore = new TableStore({
         console.log('beforeSearchFun')
     },
     loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.eventTypeName = eventTypeOptions.find(item2 => item2.id === item.eventType)?.name
-            item.featureAmplitude = (item.featureAmplitude * 100).toFixed(0)
-        })
+
     }
 })
 provide('tableStore', tableStore)
diff --git a/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue b/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue
index 2491cab8..df1ca568 100644
--- a/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue
+++ b/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker area>
+        <TableHeader date-picker area showExport>
             <template v-slot:select>
                 <el-form-item label="终端状态">
                     <el-select
@@ -99,6 +99,10 @@ const tableStore = new TableStore({
             customRender: props => {
                 if (props.renderValue == null) {
                     return <span></span>
+                }else  if (props.renderValue == 3.14159) {
+                    return <el-tag effect="dark" type="info">
+                            /
+                        </el-tag>
                 } else if (props.renderValue * 100 > 90) {
                     return (
                         <el-tag effect="dark" type="success">
diff --git a/src/views/pqs/voltageSags/report/eventReports/index.vue b/src/views/pqs/voltageSags/report/eventReports/index.vue
index ec4ca9c8..2518044c 100644
--- a/src/views/pqs/voltageSags/report/eventReports/index.vue
+++ b/src/views/pqs/voltageSags/report/eventReports/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker area>
+        <TableHeader date-picker area showExport>
             <template v-slot:select>
                 <el-form-item label="统计类型">
                     <el-radio-group v-model="tableStore.table.params.comFlag">
@@ -28,7 +28,7 @@
                 </el-form-item>
             </template>
             <template #operation>
-                <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
+                <!-- <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button> -->
             </template>
         </TableHeader>
         <Table ref="tableRef" />
@@ -94,7 +94,9 @@ const tableStore = new TableStore({
         {
             field: 'featureAmplitude',
             title: '暂降(骤升)幅值(%)',
-            width: '140'
+            width: '140',formatter: (row: any) => {
+                return (row.cellValue * 100).toFixed(0)
+            }
         },
         {
             field: 'duration',
diff --git a/types/table.d.ts b/types/table.d.ts
index cfdffbb3..3f369402 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -8,6 +8,8 @@ declare global {
     interface CnTable {
         ref: VxeTableInstance | null
         data: TableRow[] | any
+        allData: TableRow[] | any
+        allFlag: Boolean
         // 前端分页数据
         webPagingData: TableRow[][]
         // 表格加载状态