敏感用户管理加单位

.env.ypt

@@ -0,0 +1,3 @@
+# 云平台
+NODE_ENV = ypt
+VITE_NAME="ypt"

.env.zl

@@ -1,2 +1,3 @@
+# 治理
 NODE_ENV = zl
 VITE_NAME="zl"

package.json

@@ -6,8 +6,10 @@
     "scripts": {
         "dev": "vite",
         "dev:zl": "vite --mode zl",
+        "dev:ypt": "vite --mode ypt",
         "build": "vite build",
         "build:zl": "vite build --mode zl",
+        "build:ypt": "vite build --mode ypt",
         "preview": "vite preview"
     },
     "dependencies": {

src/api/cs-device-boot/sensitiveLoadMange.ts

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 新增敏感用户
+export function saveUser(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/pqSensitiveUser/save',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改敏感用户
+export function updateUser(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/pqSensitiveUser/update',
+        method: 'post',
+        data: data
+    })
+}
+
+// 删除敏感用户
+export function deleteUser(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/pqSensitiveUser/delete',
+        method: 'post',
+        data: data
+    })
+}

src/api/harmonic-boot/cockpit/cockpit.ts

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 主要监测点列表查询>>分页
 export function mainLineList(data: any) {
     return request({
-        url: '/harmonic-boot/mainLine/list',
+        url: '/cs-harmonic-boot/mainLine/list',
         method: 'post',
         data: data
     })
@@ -11,7 +11,7 @@ export function mainLineList(data: any) {
 // 主要监测点指标越限详情
 export function statLimitRateDetails(data: any) {
     return request({
-        url: '/harmonic-boot/mainLine/statLimitRateDetails',
+        url: '/cs-harmonic-boot/mainLine/statLimitRateDetails',
         method: 'post',
         data: data
     })
@@ -38,7 +38,7 @@ export function trendData(data: any) {
 // 每日越限占比统计
 export function totalLimitStatisticsDetails(data: any) {
     return request({
-        url: '/harmonic-boot/totalLimitStatistics/details',
+        url: '/cs-harmonic-boot/totalLimitStatistics/details',
         method: 'post',
         data: data
     })
@@ -47,7 +47,7 @@ export function totalLimitStatisticsDetails(data: any) {
 // 总体指标越限统计列表
 export function totalLimitStatisticsList(data: any) {
     return request({
-        url: '/harmonic-boot/totalLimitStatistics/list',
+        url: '/cs-harmonic-boot/totalLimitStatistics/list',
         method: 'post',
         data: data
     })
@@ -56,7 +56,7 @@ export function totalLimitStatisticsList(data: any) {
 // 总体指标越限统计数据
 export function totalLimitStatisticsData(data: any) {
     return request({
-        url: '/harmonic-boot/totalLimitStatistics/data',
+        url: '/cs-harmonic-boot/totalLimitStatistics/data',
         method: 'post',
         data: data
     })
@@ -65,7 +65,7 @@ export function totalLimitStatisticsData(data: any) {
 // 指标越限程度数据
 export function limitExtentData(data: any) {
     return request({
-        url: '/harmonic-boot/limitRateDetailD/limitExtentData',
+        url: '/cs-harmonic-boot/limitRateDetailD/limitExtentData',
         method: 'post',
         data: data
     })
@@ -73,7 +73,7 @@ export function limitExtentData(data: any) {
 // 指标日趋势图数据
 export function limitExtentDayData(data: any) {
     return request({
-        url: '/harmonic-boot/limitRateDetailD/limitExtentDayData',
+        url: '/cs-harmonic-boot/limitRateDetailD/limitExtentDayData',
         method: 'post',
         data: data
     })
@@ -82,11 +82,183 @@ export function limitExtentDayData(data: any) {
 // 指标越限明细日历数据
 export function limitCalendarData(data: any) {
     return request({
-        url: '/harmonic-boot/limitRateDetailD/limitCalendarData',
+        url: '/cs-harmonic-boot/limitRateDetailD/limitCalendarData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标拟合图数据
+export function fittingData(data: any) {
+    return request({
+        url: '/cs-device-boot/csGroup/fittingData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标越限时间概率分布
+export function limitTimeProbabilityData(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/limitRateDetailD/limitTimeProbabilityData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标越限程度概率分布
+export function limitProbabilityData(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/limitRateDetailD/limitProbabilityData',
         method: 'post',
         data: data
     })
 }
 
 
+// 电网侧指标越限统计列表
+export function gridSideLimitStatisticsList(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/gridSideLimitStatistics/list',
+        method: 'post',
+        data: data
+    })
+}
+
+// 电网侧指标越限统计数据
+export function gridSideLimitStatisticsData(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/gridSideLimitStatistics/data',
+        method: 'post',
+        data: data
+    })
+}
+
+// 敏感负荷用户监测点列表
+export function governLineList(data: any) {
+    return request({
+        url: '/cs-device-boot/csline/getSensitiveUserLineList',
+        method: 'post',
+        data: data
+    })
+}
+
+// 根据id集合获取敏感负荷用户列表
+export function getListByIds(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/pqSensitiveUser/getListByIds',
+        method: 'post',
+        data: data
+    })
+}
+
+
+// 上传治理报告
+export function uploadReport(data: any) {
+    return request({
+        url: '/cs-device-boot/csline/uploadReport',
+        method: 'post',
+        data: data
+    })
+}
+
+// 获取治理报告链接
+export function getReportUrl(data: any) {
+    return request({
+        url: '/cs-device-boot/csline/getReportUrl',
+        method: 'post',
+        params: data
+    })
+}
+
+// 查询监测对象电网侧和负载侧监测点指标趋势对比数据
+export function sensitiveUserTrendData(data: any) {
+    return request({
+        url: '/cs-device-boot/csGroup/sensitiveUserTrendData',
+        method: 'post',
+        data: data
+    })
+}
+
+// 获取敏感负荷用户列表
+export function getList(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/pqSensitiveUser/getList',
+        method: 'post',
+        data: data
+    })
+}
+
+// F47曲线
+export function f47Curve(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/csevent/f47Curve',
+        method: 'post',
+        data: data
+    })
+}
+
+// 获取电压暂态表及密度坐标图
+export function getEventCoords(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/csevent/getEventCoords',
+        method: 'post',
+        data: data
+    })
+}
+
+// 日历暂降事件详情
+export function getEventDate(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/csevent/getEventDate',
+        method: 'post',
+        data: data
+    })
+}
+
+// 暂降类型分类统计Echart
+export function netEventEcharts(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/csevent/netEventEcharts',
+        method: 'post',
+        data: data
+    })
+}
+
+// 暂降类型分类统计表格
+export function netEventTable(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/csevent/netEventTable',
+        method: 'post',
+        data: data
+    })
+}
+
+// 分页查询暂降事件
+export function pageEvent(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/event/pageEvent',
+        method: 'post',
+        data: data
+    })
+}
+
+// 暂态事件波形分析
+export function analyseWave(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/event/analyseWave',
+        method: 'get',
+        params: data
+    })
+}
+
+// 暂态监测点下拉框接口
+export function getSimpleLine() {
+    return request({
+        url: '/cs-device-boot/csline/getSimpleLine',
+        method: 'get'
+    })
+}
+
+
 

src/api/harmonic-boot/luckyexcel.ts

@@ -3,14 +3,15 @@ import createAxios from '@/utils/request'
 // 获取参数指标
 export function getIndex() {
     return createAxios({
-        url: '/harmonic-boot/customReport/reportChooseTree',
+        // url: '/harmonic-boot/customReport/reportChooseTree',
+        url: '/cs-harmonic-boot/customReport/reportChooseTree',
         method: 'get'
     })
 }
 //、查询数据激活报表模板
 export function updateTemplateActive(data) {
     return createAxios({
-        url: '/harmonic-boot/customReport/updateTemplateActive',
+        url: '/cs-harmonic-boot/customReport/updateTemplateActive',
         method: 'post',
         data
     })
@@ -19,7 +20,8 @@ export function updateTemplateActive(data) {
 //获取报表模板 //部门树查询
 export function getTemplateList(data:any) {
     return createAxios({
-        url: '/harmonic-boot/customReport/getTemplateList',
+        // url: '/harmonic-boot/customReport/getTemplateList',
+        url: '/cs-harmonic-boot/customReport/getTemplateList',
         // url:'/api3/harmonic-boot/customReport/getTemplateList',
         method: 'post',
         data
@@ -28,7 +30,7 @@ export function getTemplateList(data:any) {
 //删除报表模板
 export function delTemplate(data:any) {
     return createAxios({
-        url: '/harmonic-boot/customReport/delTemplate',
+        url: '/cs-harmonic-boot/customReport/delTemplate',
         method: 'post',
         data
     })
@@ -37,7 +39,7 @@ export function delTemplate(data:any) {
 //修改获取数据
 export function getCustomReportTemplateById(params) {
     return createAxios({
-        url: '/harmonic-boot/customReport/getCustomReportTemplateById',
+        url: '/cs-harmonic-boot/customReport/getCustomReportTemplateById',
         method: 'get',
         params
     })
@@ -46,7 +48,7 @@ export function getCustomReportTemplateById(params) {
 //修改获取数据
 export function viewCustomReportTemplateById(params) {
     return createAxios({
-        url: '/harmonic-boot/customReport/viewCustomReportTemplateById',
+        url: '/cs-harmonic-boot/customReport/viewCustomReportTemplateById',
         method: 'get',
         params
     })
@@ -54,16 +56,17 @@ export function viewCustomReportTemplateById(params) {
 //修改模板
 export function dateTemplateup(data) {
     return createAxios({
-        url: '/harmonic-boot/customReport/updateTemplate',
+        url: '/cs-harmonic-boot/customReport/updateTemplate',
         method: 'POST',
         data
     })
 }
 
 //新增报表模板
-export function addTemplate(data) {
+export function addTemplate(data:any) {
     return createAxios({
-        url: '/harmonic-boot/customReport/addTemplate',
+        // url: '/harmonic-boot/customReport/addTemplate',
+         url: '/cs-harmonic-boot/customReport/addTemplate',
         method: 'post',
         data: data
     })
@@ -71,7 +74,7 @@ export function addTemplate(data) {
 //模板对应指标替换
 export function getCustomReport(data: any) {
     return createAxios({
-        url: '/harmonic-boot/customReport/getCustomReport',
+        url: '/cs-harmonic-boot/customReport/getCustomReport',
         method: 'POST',
         data
     })
@@ -79,7 +82,7 @@ export function getCustomReport(data: any) {
 //绑定模板
 export function updateBindTemplate(data) {
     return createAxios({
-        url: '/harmonic-boot/customReport/updateBindTemplate',
+        url: '/cs-harmonic-boot/customReport/updateBindTemplate',
         method: 'post',
         data
     })
@@ -87,7 +90,7 @@ export function updateBindTemplate(data) {
 //根据模板ID查询数据
 export function getDataByTempId(params) {
     return createAxios({
-        url: '/harmonic-boot/customReport/getDataByTempId',
+        url: '/cs-harmonic-boot/customReport/getDataByTempId',
         method: 'get',
         params
     })
@@ -95,7 +98,7 @@ export function getDataByTempId(params) {
 //根据部门查询模板
 export function getTemplateByDept(params) {
     return createAxios({
-        url: '/harmonic-boot/customReport/getTemplateByDept',
+        url: '/cs-harmonic-boot/customReport/getTemplateByDept',
         method: 'get',
         params
     })
@@ -144,7 +147,7 @@ export function updateFile(data) {
 //合格率报告
 export function pageTable(data) {
     return createAxios({
-        url: '/harmonic-boot/qualifiedReport/pageTable',
+        url: '/cs-harmonic-boot/qualifiedReport/pageTable',
         method: 'post',
         data
     })
@@ -152,14 +155,16 @@ export function pageTable(data) {
 //合格率报告
 export function targetLimitChooseTree() {
     return createAxios({
-        url: '/harmonic-boot/customReport/targetLimitChooseTree',
+        // url: '/harmonic-boot/customReport/targetLimitChooseTree',
+         url: '/cs-harmonic-boot/customReport/targetLimitChooseTree',
         method: 'get'
     })
 }
 //监测点指标
 export function terminalChooseTree() {
     return createAxios({
-        url: '/harmonic-boot/customReport/terminalChooseTree',
+        // url: '/harmonic-boot/customReport/terminalChooseTree',
+         url: '/cs-harmonic-boot/customReport/terminalChooseTree',
         method: 'get'
     })
 }

src/api/system-boot/dictTree.ts

@@ -88,8 +88,9 @@ export const updateStatistical = (data: any) => {
 // 单位绑定
 export function codeDicTree(data: any) {
     return createAxios({
-        url: '/system-boot/dictTree/codeDicTree',
+        // url: '/system-boot/dictTree/codeDicTree',
-        method: 'get',
+        url: '/system-boot/dictTree/queryByCodeList',
+        method: 'post',
         params: data
     })
 }

src/components/cockpit/F47Curve/index.vue

@@ -9,6 +9,7 @@
             <el-descriptions-item align="center" label="不可容忍">{{ data.bkrr }}</el-descriptions-item>
         </el-descriptions>
         <my-echart
+            v-loading="tableStore.table.loading"
             ref="chartRef"
             class="tall"
             :options="echartList"
@@ -18,10 +19,10 @@
             }"
             @chart-click="handleChartClick"
         />
-        <el-dialog v-model="isWaveCharts" draggable title="瞬时/RMS波形" append-to-body width="70%">
+        <el-dialog v-model="isWaveCharts" v-if="isWaveCharts" draggable :title="dialogTitle" append-to-body width="70%">
             <waveFormAnalysis
                 v-loading="loading"
-                v-if="isWaveCharts"
+              
                 ref="waveFormAnalysisRef"
                 @handleHideCharts="isWaveCharts = false"
                 :wp="wp"
@@ -33,14 +34,10 @@
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 import { analyseWave } from '@/api/common'
-
+import { ElMessage } from 'element-plus'
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
@@ -52,9 +49,7 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
+const dialogTitle = ref('波形分析')
-const timeCacheStore = useTimeCacheStore()
-
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -77,7 +72,7 @@ const fullscreen = computed(() => {
     }
 })
 
-const echartList = ref({})
+const echartList = ref()
 
 const chartRef = ref()
 // 波形
@@ -98,7 +93,7 @@ const data = reactive({
     bkrr: 0
 })
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/f47Curve',
     method: 'POST',
 
     showPage: false,
@@ -109,22 +104,15 @@ const tableStore: any = new TableStore({
         tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
     },
     loadCallback: () => {
-        let res = {
+        const gongData = gongfunction(tableStore.table.data)
-            data: { totalNumberOfEvents: 0, voltageToleranceCurveDataList: [] }
+        data.gs = tableStore.table.data.length
-        }
-
-        const gongData = gongfunction(res.data.voltageToleranceCurveDataList)
-        data.gs = res.data.voltageToleranceCurveDataList.length
         data.krr = gongData.pointI.length
         data.bkrr = gongData.pointIun.length
-        console.log(gongData)
         echartList.value = {
-            // backgroundColor: "#f9f9f9", //地图背景色深蓝
             title: {
                 text: `F47曲线`
             },
             legend: {
-                // data: ['上限', '下限', '可容忍事件', '不可容忍事件'],
                 data: ['可容忍事件', '不可容忍事件'],
                 itemWidth: 10,
                 itemHeight: 10,
@@ -206,11 +194,11 @@ const tableStore: any = new TableStore({
                         type: 'scatter',
                         symbol: 'circle',
                         symbolSize: 8,
-                        // data: gongData.pointF,
+                        data: gongData.pointF,
-                        data: [
+                        // data: [
-                            [0.2, 10, '2023-01-01 10:00:00'],
+                        //     [0.2, 10, '2023-01-01 10:00:00'],
-                            [0.4, 50, '2023-01-01 11:00:00']
+                        //     [0.4, 50, '2023-01-01 11:00:00']
-                        ],
+                        // ],
                         legendSymbol: 'circle',
                         emphasis: {
                             focus: 'series',
@@ -235,7 +223,7 @@ const tableStore: any = new TableStore({
                     {
                         name: '不可容忍事件',
                         type: 'scatter',
-                        symbol: 'rect',
+                        symbol: 'circle',
                         symbolSize: 8,
                         data: gongData.pointFun,
                         legendSymbol: 'rect'
@@ -269,8 +257,9 @@ function gongfunction(arr: any) {
             let yy = arr[i].eventValue
             let time = arr[i].time
             let eventId = arr[i].eventId
+            let lineName = arr[i].lineName
             // let index =arr[i].eventDetailIndex;
-            point = [xx, yy, time, eventId]
+            point = [xx, yy, time, eventId, lineName]
 
             if (xx <= 0.003) {
                 let line = 0
@@ -419,33 +408,45 @@ onMounted(() => {
 const handleChartClick = (params: any) => {
     if (params.seriesName === '可容忍事件') {
         // 处理可容忍事件点击
-        ElMessage.info(`点击了可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
+        dialogTitle.value = '可容忍事件波形分析'
         handleTolerableEventClick(params)
     } else if (params.seriesName === '不可容忍事件') {
+        dialogTitle.value = '不可容忍事件波形分析'
         // 处理不可容忍事件点击
-        ElMessage.info(`点击了不可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
+        // ElMessage.info(`点击了不可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
-        handleIntolerableEventClick(params)
+        handleTolerableEventClick(params)
     }
 }
 
 // 可容忍事件点击处理函数
 const handleTolerableEventClick = async (row: any) => {
-    console.log('可容忍事件详情:', row)
-    isWaveCharts.value = true
     loading.value = true
-    isWaveCharts.value = true
+    nextTick(() => {
-    await analyseWave(row.id)
+        if (waveFormAnalysisRef.value) {
+            //waveFormAnalysisRef.value.setHeight(false, 360)
+            waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
+        }
+    })
+   const messageInstance = ElMessage.info(`正在加载，请稍等...`)
+    await analyseWave(row.value[3]) //eventId
         .then(res => {
             row.loading1 = false
             if (res != undefined) {
-                boxoList.value = row
+                boxoList.value = {
-                boxoList.value.featureAmplitude = row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
+                    persistTime: row.value[0], //持续时间
-                boxoList.value.systemType = 'WX'
+                    featureAmplitude: (row.value[1] / 100).toFixed(2), //残余电压
+                    startTime: row.value[2], //时间
+                    lineName: row.value[4] //监测点名称
+                }
+                boxoList.value.systemType = 'YPT'
                 wp.value = res.data
             }
+
+            isWaveCharts.value = true
             loading.value = false
         })
         .catch(() => {
+            messageInstance.close()
             row.loading1 = false
             loading.value = false
         })

src/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue

@@ -2,7 +2,7 @@
     <!-- 指标日趋势图 -->
     <el-dialog draggable :title="dialogTitle" v-model="dialogVisible" append-to-body width="70%">
         <div :style="pageHeight">
-            <my-echart class="tall" :options="echartList" style="width: 98%" />
+            <my-echart class="tall" :options="echartList" style="width: 100%" />
         </div>
     </el-dialog>
 </template>
@@ -13,7 +13,7 @@ import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
 import { mainHeight } from '@/utils/layout'
 import { limitExtentDayData } from '@/api/harmonic-boot/cockpit/cockpit'
-
+import { yMethod } from '@/utils/echartMethod'
 const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
@@ -21,7 +21,7 @@ const prop = defineProps({
     timeValue: { type: Object }
 })
 
-const pageHeight = ref(mainHeight(332))
+const pageHeight = mainHeight(0, 2)
 
 const dialogVisible: any = ref(false)
 
@@ -36,57 +36,45 @@ const echartList = ref()
 const init = () => {
     echartList.value = {
         title: {
-            text: dialogText.value,
+            text: dialogText.value
-            textStyle: {
-                fontSize: 14,
-                rich: {
-                    lineName: {
-                        color: '#333',
-                        fontSize: 14
         },
-                    timeLabel: {
+        legend: {
-                        color: '#333',
+            itemWidth: 20,
-                        fontSize: 14,
+            itemHeight: 20,
-                        padding: [0, 0, 0, 10]
+            itemStyle: { opacity: 0 }, //去圆点
+            right: 70
         },
-                    name: {
+        tooltip: {
-                        color: '#333',
+            trigger: 'axis',
-                        fontSize: 14,
+            formatter: (params: any) => {
-                        padding: [0, 0, 0, 10]
+                if (!params || params.length === 0) return ''
-                    }
+
-                }
+                // 使用第一个项目的轴标签作为时间标题
+                let tooltipText = params[0].axisValueLabel + '<br/>'
+
+                // 遍历所有项目并累加到tooltipText中
+                params.forEach((item: any) => {
+                    // 将数值格式化为保留两位小数
+                    const formattedValue = Math.round(item.value[1] * 100) / 100
+                    tooltipText += `${item.marker} ${item.seriesName}: ${formattedValue}<br/>`
+                })
+
+                return tooltipText
             }
         },
         xAxis: {
-            type: 'category',
+            type: 'time',
-            data: []
+            axisLabel: {
-        },
+                formatter: {
-        yAxis: {
+                    day: '{MM}-{dd}',
-            type: 'value',
+                    month: '{MM}',
-            name: '数值'
+                    year: '{yyyy}'
-        },
-        grid: {
-            left: '1%',
-            right: '45px',
-            bottom: '40px',
-            top: '15%',
-            containLabel: true
-        },
-        dataZoom: [
-            {
-                type: 'inside',
-                height: 13,
-                start: 0,
-                bottom: '20px',
-                end: 100
-            },
-            {
-                start: 0,
-                height: 13,
-                bottom: '20px',
-                end: 100
                 }
-        ],
+            }
+        },
+
+        yAxis: {},
+
         options: {
             series: []
         }
@@ -98,6 +86,7 @@ const initData = async (row: any) => {
         if (res.data && res.data.length > 0) {
             // 重新初始化图表
             init()
+            let [min, max] = yMethod(res.data.map((item: any) => item.value.split(',')).flat())
 
             // 从第一条数据中提取时间作为x轴数据
             const firstItem = res.data[0]
@@ -112,12 +101,17 @@ const initData = async (row: any) => {
 
             // 处理每条相位数据
             const seriesData = res.data.map((item: any) => {
-                const values = item.value.split(',').map((v: string) => parseFloat(v) || 0)
+                const values = xAxisData.map((time: string, index: number) => {
+                    // 将传入的日期与时间拼接成完整的时间字符串
+                    const fullTime = `${row.time} ${time}`
+                    const value = parseFloat(item.value.split(',')[index]) || 0
+                    return [fullTime, value]
+                })
 
                 return {
                     name: `${item.phasic}相`,
                     type: 'line',
-                    showSymbol: true,
+                    showSymbol: false,
                     smooth: true,
                     data: values,
                     itemStyle: {
@@ -128,20 +122,20 @@ const initData = async (row: any) => {
                     }
                 }
             })
-
+            echartList.value.yAxis.max = max
+            echartList.value.yAxis.min = min
             // 更新图表配置
-            echartList.value.xAxis.data = xAxisData
             echartList.value.options.series = seriesData
+            // 注意：使用时间轴时不需要设置 xAxis.data
         }
     })
 }
-
 onMounted(() => {})
 
 const open = async (row: any) => {
     dialogVisible.value = true
     dialogTitle.value = row.name + '日趋势图'
-    dialogText.value = `{lineName|${row.lineName}}{timeLabel|${row.time}}{name|${row.name}日趋势图}`
+    dialogText.value = `监测点名称:${row.lineName}_越限时间:${row.time}_指标名称:${row.name}`
     nextTick(() => {
         initData(row)
     })

src/components/cockpit/exceedanceLevel/index.vue

@@ -14,7 +14,7 @@
             isGroup
         ></Table>
         <!-- 指标日趋势图 -->
-        <DailyTrendChart ref="dailyTrendChartRef" />
+        <DailyTrendChart v-if="dialogTrendChart" ref="dailyTrendChartRef" @close="dialogTrendChart = false" />
     </div>
 </template>
 <script setup lang="ts">
@@ -39,8 +39,7 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
+const dialogTrendChart = ref(false)
-const timeCacheStore = useTimeCacheStore()
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
@@ -67,7 +66,7 @@ const echartList = ref()
 
 const dailyTrendChartRef = ref()
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/limitRateDetailD/limitExtentData',
+    url: '/cs-harmonic-boot/limitRateDetailD/limitExtentData',
     method: 'POST',
 
     showPage: false,
@@ -120,7 +119,7 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '发生日期',
+            title: '越限时间',
             field: 'time',
             minWidth: '60',
             render: 'customTemplate',
@@ -200,8 +199,11 @@ provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
+    dialogTrendChart.value = true
     if (column.field == 'maxValue' && row.lineId) {
+        nextTick(() => {
             dailyTrendChartRef.value.open(row)
+        })
     }
 }
 

src/components/cockpit/governanceReport/index.vue

@@ -3,19 +3,14 @@
         <!--治理效果报表 -->
         <TableHeader :showReset="false" datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
-                <el-form-item label="治理对象">
+                <el-form-item label="报表模板">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.tempId" placeholder="请选择报表模板" clearable>
-                        v-model="tableStore.table.params.power"
+                        <el-option v-for="item in templateList" :key="item.id" :label="item.name" :value="item.id" />
-                        placeholder="请选择治理对象"
+                    </el-select>
-                        clearable
+                </el-form-item>
-                        style="width: 130px"
+                <el-form-item label="监测对象">
-                    >
+                    <el-select v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
-                        <el-option
+                        <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
-                            v-for="item in powerList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
             </template>
@@ -35,15 +30,13 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h, computed } from 'vue'
+import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import { exportExcel } from '@/views/govern/reportForms/export.js'
 import TableHeader from '@/components/table/header/index.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { getTemplateList } from '@/api/harmonic-boot/luckyexcel'
-import { useConfig } from '@/stores/config'
+import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
 import Json from './index.json'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -53,61 +46,48 @@ const prop = defineProps({
     timeKey: { type: [String, Number] },
     timeValue: { type: Object }
 })
-const config = useConfig()
+
-const powerList: any = ref([
+// 报表模板列表
-    {
+const templateList = ref()
-        label: '1#变压器',
+
-        value: '1'
+// 监测对象
-    },
+const idList = ref()
-    {
+
-        label: '2#变压器',
+// 监测对象
-        value: '2'
+const initListByIds = () => {
+    getListByIds({}).then((res: any) => {
+        if (res.data.length > 0) {
+            idList.value = res.data
+
+            if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
+                tableStore.table.params.sensitiveUserId = idList.value[0].id
+            }
+            templateListData()
         }
-])
-
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
-
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
-
-    showPage: false,
-    exportName: '主要监测点列表',
-    column: [],
-     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
-    },
-    loadCallback: () => {}
     })
+}
 
-const tableRef = ref()
+const templateListData = () => {
-provide('tableRef', tableRef)
+    getTemplateList({}).then(res => {
-tableStore.table.params.power = '1'
+        templateList.value = res.data
-
+        if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
-provide('tableStore', tableStore)
+            tableStore.table.params.tempId = templateList.value[0].id
+        }
+        nextTick(() => {
+            tableStore.index()
+        })
+    })
+}
 // 下载表格
 const downloadExcel = () => {
     exportExcel(luckysheet.getAllSheets(), '治理效果报表')
 }
-onMounted(() => {
-    luckysheet.create({
-        container: 'luckysheet',
-        title: '', // 表 头名
-        lang: 'zh', // 中文
-        showtoolbar: false, // 是否显示工具栏
-        showinfobar: false, // 是否显示顶部信息栏
-        showsheetbar: true, // 是否显示底部sheet按钮
-        allowEdit: false, // 禁止所有编辑操作（必填）
-        data: Json
-    })
 
-    tableStore.index()
+onMounted(() => {
+    initListByIds()
 })
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-
     if (datePickerValue && datePickerValue.timeValue) {
         // 更新时间参数
         tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
@@ -126,6 +106,42 @@ const fullscreen = computed(() => {
         return false
     }
 })
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/customReport/getSensitiveUserReport',
+    method: 'POST',
+    showPage: false,
+    exportName: '治理效果报表',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
+        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
+            tableStore.table.params.sensitiveUserId = idList.value[0].id
+        }
+        if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
+            tableStore.table.params.tempId = templateList.value[0].id
+        }
+    },
+    loadCallback: () => {
+        luckysheet.create({
+            container: 'luckysheet',
+            title: '', // 表 头名
+            lang: 'zh', // 中文
+            showtoolbar: false, // 是否显示工具栏
+            showinfobar: false, // 是否显示顶部信息栏
+            showsheetbar: true, // 是否显示底部sheet按钮
+            allowEdit: false, // 禁止所有编辑操作（必填）
+            data: tableStore.table.data
+        })
+    }
+})
+
+const tableRef = ref()
+provide('tableRef', tableRef)
+
+provide('tableStore', tableStore)
+
 watch(
     () => prop.timeKey,
     val => {
@@ -146,11 +162,9 @@ watch(
         deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
-:deep(.el-select) {
+// :deep(.el-select) {
-    min-width: 80px;
+//     min-width: 80px;
-}
+// }
 </style>

src/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue

@@ -0,0 +1,705 @@
+<template>
+    <el-dialog draggable title="趋势图" v-model="dialogVisible" append-to-body width="70%">
+        <!-- 总体指标占比详情谐波含有率 -->
+        <div>
+            <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
+                <template v-slot:select>
+                    <el-form-item>
+                        <DatePicker ref="datePickerRef"></DatePicker>
+                    </el-form-item>
+                    <el-form-item label="统计指标" label-width="80px">
+                        <el-select
+                            multiple
+                            :multiple-limit="2"
+                            collapse-tags
+                            collapse-tags-tooltip
+                            v-model="searchForm.index"
+                            placeholder="请选择统计指标"
+                            @change="onIndexChange($event)"
+                        >
+                            <el-option
+                                v-for="item in indexOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-radio-group v-model="searchForm.dataLevel" @change="init()">
+                            <el-radio-button label="一次值" value="Primary" />
+                            <el-radio-button label="二次值" value="Secondary" />
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="统计类型">
+                        <el-select
+                            style="min-width: 120px !important"
+                            placeholder="请选择"
+                            v-model="searchForm.valueType"
+                        >
+                            <el-option value="max" label="最大值"></el-option>
+                            <el-option value="min" label="最小值"></el-option>
+                            <el-option value="avg" label="平均值"></el-option>
+                            <el-option value="cp95" label="cp95"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <div
+                            class="history_count"
+                            v-for="(item, index) in countData"
+                            :key="index"
+                            v-show="item.countOptions.length != 0"
+                        >
+                            <span class="mr12">
+                                {{ item.name.includes('次数') ? item.name : item.name + '谐波次数' }}
+                            </span>
+                            <el-select
+                                v-model="item.count"
+                                @change="onCountChange($event, index)"
+                                placeholder="请选择谐波次数"
+                                style="width: 100px"
+                                class="mr20"
+                            >
+                                <el-option
+                                    v-for="vv in item.countOptions"
+                                    :key="vv"
+                                    :label="vv"
+                                    :value="vv"
+                                ></el-option>
+                            </el-select>
+                        </div>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button type="primary" icon="el-icon-Search" @click="init()">查询</el-button>
+                    <el-button :type="timeControl ? 'primary' : ''" icon="el-icon-Sort" @click="setTimeControl">
+                        缺失数据
+                    </el-button>
+                </template>
+            </TableHeader>
+        </div>
+        <div class="history_chart" :style="pageHeight" v-loading="loading">
+            <MyEchart
+                ref="historyChart"
+                :options="echartsData"
+                v-if="showEchart"
+            />
+            <el-empty :style="pageHeight" v-else description="暂无数据" />
+        </div>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { mainHeight } from '@/utils/layout'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { ref, onMounted, watch } from 'vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useDictData } from '@/stores/dictData'
+import { queryStatistical } from '@/api/system-boot/csstatisticalset'
+import { yMethod, exportCSV, completeTimeSeries } from '@/utils/echartMethod'
+import TableHeader from '@/components/table/header/index.vue'
+import { trendData } from '@/api/harmonic-boot/cockpit/cockpit'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import { color } from '@/components/echarts/color'
+import { ElMessage } from 'element-plus'
+const dictData = useDictData()
+defineOptions({
+    // name: 'govern/device/control'
+})
+const props = defineProps({
+    TrendList: {
+        type: Array
+    }
+})
+
+const dialogVisible: any = ref(false)
+// console.log("🚀 ~ props:", props.TrendList)
+const showEchart = ref(true)
+const num = ref(0)
+const timeControl = ref(false)
+//值类型
+const pageHeight = ref(mainHeight(57 * 1.6, 1.6))
+const loading = ref(true)
+const searchForm: any = ref({})
+const tableHeaderRef = ref()
+const typeOptions = [
+    {
+        name: '平均值',
+        id: 'avg'
+    },
+    {
+        name: '最大值',
+        id: 'max'
+    },
+    {
+        name: '最小值',
+        id: 'min'
+    },
+    {
+        name: 'CP95值',
+        id: 'cp95'
+    }
+]
+searchForm.value = {
+    index: [],
+    type: typeOptions[0].id,
+    count: '',
+    searchBeginTime: '',
+    searchEndTime: '',
+    dataLevel: 'Primary',
+    valueType: 'avg'
+}
+//统计指标
+const indexOptions: any = ref([])
+//谐波次数
+const countOptions: any = ref([])
+// Harmonic_Type
+// portable-harmonic
+const legendDictList: any = ref([])
+
+const initCode = (field: string, title: string) => {
+    queryByCode('steady_state_limit_trend').then(res => {
+        queryCsDictTree(res.data.id).then(item => {
+            //排序
+            indexOptions.value = item.data.sort((a: any, b: any) => {
+                return a.sort - b.sort
+            })
+            const titleMap: Record<string, number> = {
+                flickerOvertime: 0,
+                uaberranceOvertime: 3,
+                ubalanceOvertime: 4,
+                freqDevOvertime: 5
+            }
+
+            let defaultIndex = 0 // 默认值
+
+            if (field in titleMap) {
+                defaultIndex = titleMap[field]
+            } else if (field.includes('uharm')) {
+                defaultIndex = 1
+            } else if (field.includes('iharm')) {
+                defaultIndex = 2
+            }
+
+            searchForm.value.index[0] = indexOptions.value[defaultIndex].id
+        })
+        queryStatistical(res.data.id).then(vv => {
+            legendDictList.value = vv.data
+            indexOptions.value.map((item: any, index: any) => {
+                if (!countDataCopy.value[index]) {
+                    countDataCopy.value[index] = {
+                        index: item.id,
+                        countOptions: [],
+                        count: [],
+                        name: indexOptions.value.find((vv: any) => {
+                            return vv.id == item.id
+                        })?.name
+                    }
+                }
+                legendDictList.value?.selectedList?.map((vv: any, vvs: any) => {
+                    //查找相等的指标
+                    if (item.id == vv.dataType) {
+                        vv.eleEpdPqdVOS.map((kk: any, kks: any) => {
+                            if (kk.harmStart && kk.harmEnd) {
+                                range(0, 0, 0)
+
+                                if (kk.showName == '间谐波电压含有率') {
+                                    countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
+                                        (item: any) => {
+                                            return item - 0.5
+                                        }
+                                    )
+                                } else {
+                                    countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
+                                }
+                                if (title && countDataCopy.value[index].countOptions.includes(Number(title))) {
+                                    countDataCopy.value[index].count = Number(title)
+                                } else if (title && countDataCopy.value[index].countOptions.includes(title)) {
+                                    countDataCopy.value[index].count = title
+                                } else if (
+                                    !countDataCopy.value[index].count ||
+                                    countDataCopy.value[index].count.length == 0
+                                ) {
+                                    // 只有当count为空时才设置默认值
+                                    countDataCopy.value[index].count = countDataCopy.value[index].countOptions[0]
+                                }
+                            }
+                        })
+                    }
+                })
+            })
+            nextTick(() => {
+                formatCountOptions()
+            })
+            init()
+        })
+    })
+}
+
+const chartsList = ref<any>([])
+const chartTitle: any = ref('')
+const echartsData = ref<any>(null)
+//加载echarts图表
+//历史趋势数据
+const historyDataList: any = ref([])
+const range = (start: any, end: any, step: any) => {
+    return Array.from({ length: (end - start) / step + 1 }, (_, i) => start + i * step)
+}
+//获取请求趋势数据参数
+const trendRequestData = ref()
+const getTrendRequest = (val: any) => {
+    trendRequestData.value = val
+    // init()
+}
+//初始化趋势图
+const headerRef = ref()
+const datePickerRef = ref()
+const lineStyle = [{ type: 'solid' }, { type: 'dashed' }, { type: 'dotted' }]
+const init = async () => {
+    loading.value = true
+    // 选择指标的时候切换legend内容和data数据
+    let list: any = []
+    legendDictList.value?.selectedList?.map((item: any) => {
+        searchForm.value.index.map((vv: any) => {
+            if (item.dataType == vv) {
+                list.push(item.eleEpdPqdVOS)
+            }
+        })
+    })
+
+    //颜色数组
+    const colorList = color
+    //选择的指标使用方法处理
+    formatCountOptions()
+    //查询历史趋势
+    historyDataList.value = []
+    chartTitle.value = ''
+
+    searchForm.value.index.map((item: any, indexs: any) => {
+        indexOptions.value.map((vv: any) => {
+            if (vv.id == item) {
+                chartTitle.value += indexs == searchForm.value.index.length - 1 ? vv.name : vv.name + '/'
+            }
+        })
+    })
+    let lists: any = []
+    let frequencys: any = null
+    countData.value.map((item: any, index: any) => {
+        if (item.name.includes('谐波含有率')) {
+            frequencys = item.count
+        } else {
+            frequencys = ''
+        }
+        lists[index] = {
+            statisticalId: item.index,
+             frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : ''
+        }
+    })
+    let obj = {
+        //...trendRequestData.value,
+        lineId: trendRequestData.value.lineId,
+        list: lists,
+        dataLevel: searchForm.value.dataLevel,
+        valueType: searchForm.value.valueType,
+        searchBeginTime: datePickerRef.value && datePickerRef.value.timeValue[0],
+        searchEndTime: datePickerRef.value && datePickerRef.value.timeValue[1]
+    }
+    if (searchForm.value.index.length == 0) {
+        ElMessage.warning('请选择统计指标')
+        loading.value = false
+        return
+    }
+    if (obj.list.length != 0) {
+        try {
+            showEchart.value = true
+            await trendData(obj)
+                .then((res: any) => {
+                    if (res.code == 'A0000') {
+                        if (res.data.length == 0) {
+                            loading.value = false
+                            showEchart.value = false
+                            return
+                        }
+                        historyDataList.value = res.data
+                        chartsList.value = JSON.parse(JSON.stringify(res.data))
+                        loading.value = false
+                        setEchart()
+                    }
+                })
+                .catch(error => {
+                    loading.value = false
+                })
+        } catch (error) {
+            loading.value = false
+        }
+    }
+}
+const setEchart = () => {
+    loading.value = true
+    echartsData.value = {}
+    //icon图标替换legend图例
+
+    // y轴单位数组
+    let unitList: any = []
+
+    let groupedData = chartsList.value.reduce((acc: any, item: any) => {
+        let key = ''
+        if (item.phase == null) {
+            key = item.unit
+        } else {
+            key = item.anotherName
+        }
+
+        if (!acc[key]) {
+            acc[key] = []
+        }
+        acc[key].push(item)
+        return acc
+    }, {})
+    let result = Object.values(groupedData)
+    if (chartsList.value.length > 0) {
+        unitList = result.map((item: any) => {
+            return item[0].unit
+        })
+    }
+
+    echartsData.value = {
+        legend: {
+            itemWidth: 20,
+            itemHeight: 20,
+            itemStyle: { opacity: 0 }, //去圆点
+            type: 'scroll', // 开启滚动分页
+            // orient: 'vertical', // 垂直排列
+            top: 5,
+            right: 70
+            // width: 550,
+            // height: 50
+        },
+        grid: {
+            top: '80px'
+        },
+        tooltip: {
+            axisPointer: {
+                type: 'cross',
+                label: {
+                    color: '#fff',
+                    fontSize: 16
+                }
+            },
+            textStyle: {
+                color: '#fff',
+                fontStyle: 'normal',
+                opacity: 0.35,
+                fontSize: 14
+            },
+            backgroundColor: 'rgba(0,0,0,0.55)',
+            borderWidth: 0,
+            formatter(params: any) {
+                const xname = params[0].value[0]
+                let str = `${xname}<br>`
+                params.forEach((el: any, index: any) => {
+                    let marker = ''
+
+                    if (el.value[3] == 'dashed') {
+                        for (let i = 0; i < 3; i++) {
+                            marker += `<span style="display:inline-block;border: 2px ${el.color} solid;margin-right:5px;width:10px;height:0px;background-color:#ffffff00;"></span>`
+                        }
+                    } else {
+                        marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
+                    }
+                    let unit = el.value[2] ? el.value[2] : ''
+                    str += `${marker}${el.seriesName.split('(')[0]}：${el.value[1]}${unit}
+                                            <br>`
+                })
+                return str
+            }
+        },
+        color: ['#DAA520', '#2E8B57', '#A52a2a', ...color],
+        xAxis: {
+            type: 'time',
+            axisLabel: {
+                formatter: {
+                    day: '{MM}-{dd}',
+                    month: '{MM}',
+                    year: '{yyyy}'
+                }
+            }
+        },
+        yAxis: [{}],
+        toolbox: {
+            featureProps: {
+                myTool1: {
+                    show: true,
+                    title: '下载csv',
+                    icon: 'path://M588.8 551.253333V512H352v39.253333h236.373333z m0 78.933334v-39.253334H352v39.253334h236.373333z m136.533333 78.933333V334.933333l-157.866666-157.866666H273.066667A59.306667 59.306667 0 0 0 213.333333 236.373333v551.253334a59.306667 59.306667 0 0 0 59.306667 59.306666h274.773333v42.666667H853.333333v-180.48zM568.746667 234.666667l100.266666 100.693333h-81.066666a20.053333 20.053333 0 0 1-19.626667-20.053333z m-20.48 573.013333H273.066667a19.2 19.2 0 0 1-17.493334-19.626667V236.373333a19.2 19.2 0 0 1 19.626667-19.626666h256v98.133333a58.88 58.88 0 0 0 58.88 59.306667h96.426667v334.933333h-98.133334v-39.68H352v39.68h196.266667z m100.266666 23.04a37.973333 37.973333 0 0 1-32 15.786667 38.826667 38.826667 0 0 1-32.426666-15.786667 53.76 53.76 0 0 1-10.24-32.853333 42.666667 42.666667 0 0 1 42.666666-47.786667 35.84 35.84 0 0 1 37.546667 29.866667h-12.8a23.893333 23.893333 0 0 0-24.746667-19.2c-17.066667 0-29.013333 14.08-29.013333 35.84s11.52 37.546667 28.586667 37.546666a26.453333 26.453333 0 0 0 26.453333-25.6h12.8a39.253333 39.253333 0 0 1-7.253333 22.186667z m59.733334 15.786667a35.84 35.84 0 0 1-40.106667-34.56H682.666667a23.893333 23.893333 0 0 0 26.88 23.04c12.8 0 22.613333-6.4 22.613333-15.786667s-4.266667-11.52-14.506667-13.653333l-21.333333-5.12c-17.066667-4.266667-24.32-11.52-24.32-23.893334s12.8-26.453333 34.133333-26.453333a31.573333 31.573333 0 0 1 35.413334 30.293333h-13.653334a19.626667 19.626667 0 0 0-22.613333-18.773333c-12.8 0-20.48 5.12-20.48 12.8s5.12 11.093333 17.066667 13.653333l14.933333 2.986667a42.666667 42.666667 0 0 1 20.906667 8.96 23.893333 23.893333 0 0 1 7.68 17.92c-0.426667 17.066667-14.506667 28.16-37.12 28.16z m88.746666 0h-14.506666l-32.426667-92.16h14.08l19.626667 59.733333 6.4 20.053333c0-9.386667 3.413333-12.8 5.546666-20.053333l19.2-59.733333h14.08z',
+                    onclick: e => {
+                        // console.log("🚀 ~ init ~ echartsData.value:", echartsData.value.options.series.map(item => item.data))
+
+                        let list = echartsData.value.options.series?.map((item: any) => item.data)
+                        let dataList = list[0]?.map((item: any, index: any) => {
+                            let value = [item[0], item[1]]
+                            list.forEach((item1: any, index1: any) => {
+                                if (index1 > 0) {
+                                    value.push(item1 && item1[index] ? item1[index][1] : null)
+                                }
+                            })
+
+                            return value
+                        })
+                        exportCSV(
+                            echartsData.value.options.series.map((item: any) => item.name),
+                            dataList,
+                            '监测点指标趋势.csv'
+                        )
+                    }
+                }
+            }
+        },
+        options: {
+            series: []
+        }
+    }
+    // console.log("🚀 ~ unitList.forEach ~ unitList:", unitList)
+
+    if (chartsList.value.length > 0) {
+        let yData: any = []
+        echartsData.value.yAxis = []
+        let setList = [...new Set(unitList)]
+
+        setList.forEach((item: any, index: any) => {
+            if (index > 2) {
+                echartsData.value.grid.right = (index - 1) * 80
+            }
+            yData.push([])
+            let right = {
+                position: 'right',
+                offset: (index - 1) * 80
+            }
+            // console.log("🚀 ~ unitList.forEach ~ right.index:", index)
+            echartsData.value.yAxis.push({
+                name: item,
+                yAxisIndex: index,
+                splitNumber: 5,
+                minInterval: 1,
+                splitLine: {
+                    show: false
+                },
+                ...(index > 0 ? right : null)
+            })
+        })
+        // console.log("🚀 ~ result.forEach ~ result:", result)
+        // '电压负序分量', '电压正序分量', '电压零序分量'
+        let ABCName = [
+            ...new Set(
+                chartsList.value.map((item: any) => {
+                    return item.anotherName == '电压负序分量'
+                        ? '电压不平衡'
+                        : item.anotherName == '电压正序分量'
+                        ? '电压不平衡'
+                        : item.anotherName == '电压零序分量'
+                        ? '电压不平衡'
+                        : item.anotherName
+                })
+            )
+        ]
+        // console.log("🚀 ~ .then ~ ABCName:", ABCName)
+        result.forEach((item: any, index: any) => {
+            let yMethodList: any = []
+
+            let ABCList = Object.values(
+                item.reduce((acc, item) => {
+                    let key = ''
+                    if (item.phase == null) {
+                        key = item.anotherName
+                    } else {
+                        key = item.phase
+                    }
+
+                    if (!acc[key]) {
+                        acc[key] = []
+                    }
+                    acc[key].push(item)
+                    return acc
+                }, {})
+            )
+            // console.log("🚀 ~ ABCList.forEach ~ ABCList:", ABCList)
+
+            ABCList.forEach((kk: any) => {
+                let colorName = kk[0].phase?.charAt(0).toUpperCase()
+                let lineS = ABCName.findIndex(
+                    item =>
+                        item ===
+                        (kk[0].anotherName == '电压负序分量'
+                            ? '电压不平衡'
+                            : kk[0].anotherName == '电压正序分量'
+                            ? '电压不平衡'
+                            : kk[0].anotherName == '电压零序分量'
+                            ? '电压不平衡'
+                            : kk[0].anotherName)
+                )
+
+                let seriesList: any = []
+                kk.forEach((cc: any) => {
+                    if (cc.statisticalData !== null) {
+                        yData[setList.indexOf(kk[0].unit)].push(cc.statisticalData?.toFixed(2))
+                    }
+
+                    seriesList.push([cc.time, cc.statisticalData?.toFixed(2), cc.unit, lineStyle[lineS].type])
+                })
+                // console.log(kk);
+
+                echartsData.value.options.series.push({
+                    name: kk[0].phase ? kk[0].phase + '相' + kk[0].anotherName : kk[0].anotherName,
+                    type: 'line',
+                    smooth: true,
+                    color:
+                        colorName == 'A' ? '#DAA520' : colorName == 'B' ? '#2E8B57' : colorName == 'C' ? '#A52a2a' : '',
+                    symbol: 'none',
+                    // data: seriesList,
+                    data: timeControl.value ? completeTimeSeries(seriesList) : seriesList,
+                    lineStyle: lineStyle[lineS],
+                    yAxisIndex: setList.indexOf(kk[0].unit)
+                })
+            })
+        })
+        yData.forEach((item: any, index: any) => {
+            let [min, max] = yMethod(item)
+            echartsData.value.yAxis[index].min = min
+            echartsData.value.yAxis[index].max = max
+        })
+        // console.log("🚀 ~ result.forEach ~ echartsData.value:", echartsData.value)
+    }
+    loading.value = false
+}
+const setTimeControl = () => {
+    timeControl.value = !timeControl.value
+    setEchart()
+}
+
+const selectChange = (flag: boolean, height: any) => {
+    pageHeight.value = mainHeight(height * 1.6, 1.6)
+}
+//导出
+const historyChart = ref()
+
+const countData: any = ref([])
+const countDataCopy: any = ref([])
+
+//根据选择的指标处理谐波次数
+const formatCountOptions = () => {
+    countData.value = []
+    if (searchForm.value.index.length != 0) {
+        searchForm.value.index.forEach((item: any, index: any) => {
+            countDataCopy.value.forEach((vv: any, vvs: any) => {
+                if (vv.index == item) {
+                    countData.value.push(vv)
+                }
+            })
+        })
+
+        countData.value.map((item: any, key: any) => {
+            if (item.name == '谐波电流有效值') {
+                item.name = '谐波电流次数'
+            } else if (item.name == '谐波电压含有率') {
+                item.name = '谐波电压次数'
+            } else if (item.name == '间谐波电压含有率') {
+                item.name = '间谐波电压次数'
+            }
+        })
+    }
+    // setTimeout(() => {
+    //     tableHeaderRef.value.computedSearchRow()
+    // }, 500)
+}
+// 判断下拉框是否存在
+const onCountChange = (val: any, index: any) => {
+    if (val.length == 0) {
+        countData.value[index].count = countData.value[index].countOptions[0]
+    }
+}
+const flag = ref(true)
+const onIndexChange = (val: any) => {
+    num.value += 1
+    let pp: any = []
+    indexOptions.value.forEach((item: any) => {
+        const filteredResult = val.filter(vv => item.id == vv)
+        if (filteredResult.length > 0) {
+            pp.push(filteredResult[0])
+        }
+    })
+    searchForm.value.index = pp
+    flag.value = true
+    formatCountOptions()
+}
+watch(
+    () => searchForm.value.index,
+    (val: any, oldval: any) => {},
+    {
+        deep: true,
+        immediate: true
+    }
+)
+
+const openDialog = async (row: any, field: any, title: any) => {
+    dialogVisible.value = true
+    trendRequestData.value = row
+
+    nextTick(() => {
+        // 默认当天
+        datePickerRef.value.setInterval(5)
+        datePickerRef.value.timeValue = [row.time, row.time]
+        initCode(field, title)
+    })
+}
+
+defineExpose({ getTrendRequest, openDialog })
+</script>
+
+<style lang="scss" scoped>
+.history_header {
+    display: flex;
+
+    // flex-wrap: wrap;
+    #history_select {
+        width: 100%;
+        display: flex;
+        // justify-content: flex-start;
+        // overflow-x: auto;
+        height: auto;
+        flex-wrap: wrap;
+
+        .el-form-item {
+            flex: none !important;
+            // max-width: 380px;
+        }
+
+        .el-select {
+            margin-right: 10px;
+        }
+    }
+
+    // #history_select::-webkit-scrollbar {
+    //     width: 0 !important;
+    //     display: none !important;
+    // }
+
+    .history_searchBtn {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 3px;
+    }
+}
+
+.history_chart {
+    width: 100%;
+
+    // flex: 1;
+    margin-top: 10px;
+}
+
+.history_count {
+    .el-select {
+        min-width: 100px;
+    }
+}
+</style>

src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue

@@ -23,7 +23,7 @@
             <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
         </el-dialog>
         <!-- 谐波电流、谐波电压占有率 -->
-        <HarmonicRatio‌ ref="harmonicRatio‌Ref" @close="onHarmonicRatioClose" :TrendList="TrendList" />
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" />
     </div>
 </template>
 <script setup lang="ts">
@@ -32,7 +32,7 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
-import HarmonicRatio‌ from '@/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue'
+import HarmonicRatio‌ from '@/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue'
 import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
 
 const dialogVisible: any = ref(false)
@@ -41,7 +41,7 @@ const harmonicRatio‌Ref: any = ref(null)
 const options = ref()
 const height = mainHeight(0, 2).height as any
 const tableHeaderRef = ref()
-const TrendList = ref([{lineType:1}])
+const dialogFlag = ref(false)
 const loop50 = (key: string) => {
     let list: any[] = []
     for (let i = 2; i < 26; i++) {
@@ -58,11 +58,11 @@ const loop50 = (key: string) => {
     return list
 }
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/mainLine/statLimitRateDetails',
+    url: '/cs-harmonic-boot/totalLimitStatistics/details',
     method: 'POST',
     publicHeight: 30,
     showPage: false,
-    exportName: '主要监测点列表',
+    exportName: '每日越限占比统计',
     column: [
         {
             field: 'index',
@@ -84,7 +84,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(分钟)',
+            title: '闪变越限(%)',
             field: 'flickerOvertime',
             width: '80',
             render: 'customTemplate',
@@ -93,15 +93,15 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '谐波电压越限(分钟)',
+            title: '谐波电压越限(%)',
             children: loop50('uharm')
         },
         {
-            title: '谐波电流越限(分钟)',
+            title: '谐波电流越限(%)',
             children: loop50('iharm')
         },
         {
-            title: '三相不平衡度越限(分钟)',
+            title: '三相不平衡度越限(%)',
             field: 'ubalanceOvertime',
             width: '100',
             render: 'customTemplate',
@@ -110,8 +110,8 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '电压偏差越限(分钟)',
+            title: '电压偏差越限(%)',
-            field: 'uaberranceOvertime',
+            field: 'voltageDevOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {
@@ -119,7 +119,7 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '频率偏差越限(分钟)',
+            title: '频率偏差越限(%)',
             field: 'freqDevOvertime',
             width: '100',
             render: 'customTemplate',
@@ -155,17 +155,18 @@ const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name' && column.field != 'time') {
+        dialogFlag.value = true
         dialogVisible.value = false
-        // if(column.title && column.title=='闪变越限(分钟)'){
+        nextTick(() => {
-        //     column.title = '1次'
-        // }
-        // harmonicRatio‌Ref.value.openDialog(row,column.title.replace(/次/g, ""))
             harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        })
+
     }
 }
 
 // 谐波弹窗关闭时的回调
 const onHarmonicRatioClose = () => {
+     dialogFlag.value = false
     // 重新打开指标越限详情弹窗
     nextTick(() => {
         dialogVisible.value = true

src/components/cockpit/gridSideStatistics/index.vue

@@ -7,13 +7,13 @@
             :options="echartList"
             :style="{
                 width: prop.width,
-                height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+                height: `calc(${prop.height} / 2 )`
             }"
         />
         <Table
             ref="tableRef"
             @cell-click="cellClickEvent"
-            :height="`calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`"
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"
             isGroup
         ></Table>
         <!-- 指标越限详情 -->
@@ -24,12 +24,12 @@
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import OverLimitDetails from '@/components/cockpit/gridSideStatistics/components/overLimitDetails.vue'
 import TableHeader from '@/components/table/header/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import OverLimitDetails from '@/components/cockpit/gridSideStatistics/components/overLimitDetails.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
+import { gridSideLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -42,8 +42,7 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
+const echartList = ref({})
-const timeCacheStore = useTimeCacheStore()
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
@@ -66,7 +65,14 @@ const fullscreen = computed(() => {
         return false
     }
 })
-const echartList = ref({
+
+const initEcharts = () => {
+    gridSideLimitStatisticsData({
+        searchBeginTime: tableStore.table.params.searchBeginTime,
+        searchEndTime: tableStore.table.params.searchEndTime
+    }).then((res: any) => {
+        const dataArray = [res.data.flicker, res.data.uharm, res.data.iharm, res.data.voltageDev, res.data.ubalance]
+        echartList.value = {
             title: {
                 text: '指标越限占比'
             },
@@ -90,7 +96,7 @@ const echartList = ref({
                         //   name: '暂降次数',
                         type: 'bar',
                         name: '越限占比',
-                data: [0, 45, 22, 0, 70],
+                        data: dataArray,
                         barMaxWidth: 30
 
                         // label: {
@@ -105,10 +111,13 @@ const echartList = ref({
                     }
                 ]
             }
+        }
     })
+}
+
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/gridSideLimitStatistics/list',
     method: 'POST',
 
     showPage: false,
@@ -124,7 +133,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '名称',
-            field: 'name',
+            field: 'lineName',
             minWidth: '90'
         },
         {
@@ -132,47 +141,47 @@ const tableStore: any = new TableStore({
             children: [
                 {
                     title: '闪变',
-                    field: 'type',
+                    field: 'flicker',
                     minWidth: '70',
                     render: 'customTemplate',
                     customTemplate: (row: any) => {
-                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.type}</span>`
+                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.flicker}</span>`
                     }
                 },
                 {
                     title: '谐波电压',
-                    field: 'type1',
+                    field: 'uharm',
                     minWidth: '80',
                     render: 'customTemplate',
                     customTemplate: (row: any) => {
-                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.type1}</span>`
+                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.uharm}</span>`
                     }
                 },
                 {
                     title: '谐波电流',
-                    field: 'type2',
+                    field: 'iharm',
                     minWidth: '80',
                     render: 'customTemplate',
                     customTemplate: (row: any) => {
-                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.type2}</span>`
+                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.iharm}</span>`
                     }
                 },
                 {
                     title: '电压偏差',
-                    field: 'type3',
+                    field: 'voltageDev',
                     minWidth: '80',
                     render: 'customTemplate',
                     customTemplate: (row: any) => {
-                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.type3}</span>`
+                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.voltageDev}</span>`
                     }
                 },
                 {
                     title: '三相不平衡',
-                    field: 'type4',
+                    field: 'ubalance',
                     minWidth: '90',
                     render: 'customTemplate',
                     customTemplate: (row: any) => {
-                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.type4}</span>`
+                        return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalance}</span>`
                     }
                 }
             ]
@@ -183,18 +192,8 @@ const tableStore: any = new TableStore({
         tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '1#变压器电网侧',
-                type: '0',
-                type1: '45',
-                type2: '22',
-                type3: '0',
-                type4: '70'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
+        initEcharts()
     }
 })
 
@@ -206,8 +205,11 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
+        OverLimitDetailsRef.value.open(
-        OverLimitDetailsRef.value.open(row)
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
     }
 }
 
@@ -218,6 +220,7 @@ watch(
     () => prop.timeKey,
     val => {
         tableStore.index()
+        initEcharts()
     }
 )
 watch(

src/components/cockpit/indicatorDetails/index.vue

@@ -1,16 +1,30 @@
 <template>
     <div>
         <!--指标越限明细 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+            :timeCacheFlag="false"
+        ></TableHeader>
         <el-calendar
             v-model="value"
             :style="{
                 height: `calc(${prop.height}  - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`,
                 overflow: 'auto'
             }"
+            v-loading="tableStore.table.loading"
         >
             <template #date-cell="{ data }">
-                <div style="height: 100%; padding: 8px" :style="{ background: setBackground(data.day) }">
+                <div
+                    style="padding: 8px"
+                    :style="{
+                        background: setBackground(data.day),
+                        height: `calc((${prop.height} - 100px - ${headerHeight}px + ${fullscreen ? 0 : 56}px) / 5 )`
+                    }"
+                >
                     <p :class="data.isSelected ? 'is-selected' : ''">
                         {{ data.day.split('-').slice(2).join('-') }}
                     </p>
@@ -18,13 +32,7 @@
                         <template #content>
                             <span v-html="getTextForDate(data.day)"></span>
                         </template>
-                        <div
+                        <div class="details" v-html="getTextForDate(data.day)"></div>
-                            :style="{
-                                height: `calc((${prop.height} - 57px) / 5) `,
-                                overflow: 'auto'
-                            }"
-                            v-html="getTextForDate(data.day)"
-                        ></div>
                     </el-tooltip>
                 </div>
             </template>
@@ -50,6 +58,8 @@ const headerHeight = ref(57)
 
 const list = ref()
 
+const TableHeaderRef = ref()
+
 dayjs.en.weekStart = 1 //设置日历的周起始日为星期一
 const value = ref(new Date())
 
@@ -81,45 +91,18 @@ const getTextForDate = (date: string) => {
 }
 
 const tableStore: any = new TableStore({
-    // url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-harmonic-boot/limitRateDetailD/limitCalendarData',
-    url: '/harmonic-boot/limitRateDetailD/limitCalendarData',
     method: 'POST',
     showPage: false,
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
+        if (!fullscreen.value && prop.timeValue && Array.isArray(prop.timeValue)) {
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
     },
     loadCallback: () => {
-        // 将后端返回的数据整合到 list 中
+        value.value = tableStore.table.params.searchBeginTime
-        //     tableStore.table.data = [
-        //     {
-        //         "time": "2025-11-13",
-        //         "items": [
-        //             "闪变越限",
-        //             "谐波电流越限"
-        //         ],
-        //         "status": 1
-        //     },
-        //     {
-        //         "time": "2025-11-14",
-        //         "items": [
-        //             "频率偏差越限",
-        //             "三相电压不平衡越限",
-        //             "谐波电压越限",
-        //             "谐波电流越限",
-        //              "频率偏差越限",
-        //             "三相电压不平衡越限",
-        //             "谐波电压越限",
-        //             "谐波电流越限",
-        //              "频率偏差越限",
-        //             "三相电压不平衡越限",
-        //             "谐波电压越限",
-        //             "谐波电流越限"
-        //         ],
-        //         "status": 2
-        //     }
-        // ]
         if (tableStore.table.data && tableStore.table.data.length > 0) {
             list.value = tableStore.table.data.map((item: any) => {
                 // 将 items 数组转换为带换行的文本
@@ -160,8 +143,16 @@ const setBackground = (value: string) => {
 provide('tableStore', tableStore)
 
 onMounted(() => {
+    nextTick(() => {
+        if (TableHeaderRef.value && typeof TableHeaderRef.value.setDatePicker === 'function') {
+            TableHeaderRef.value.setDatePicker([{ label: '月份', value: 3 }])
+        }
+        if (fullscreen.value) {
+            TableHeaderRef.value.setInterval(3)
+        }
         tableStore.index()
     })
+})
 watch(
     () => prop.timeKey,
     val => {
@@ -170,37 +161,44 @@ watch(
 )
 watch(
     () => prop.timeValue,
-    (newVal, oldVal) => {
+    // (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
+    //     // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
+    //     if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
+    //         tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
+    //         tableStore.table.params.searchEndTime = newVal[1]
+    //         tableStore.index()
+    //     }
+    // },
+    val => {
         tableStore.index()
-        }
     },
+
     {
         deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
 :deep(.el-calendar) {
-    .el-calendar__header {
+    .el-calendar__button-group {
         display: none;
     }
     .el-calendar__body {
         padding: 0px !important;
-        height: 100%;
+        height: calc(100% - 46px);
         .el-calendar-table {
             height: 100%;
         }
     }
     .el-calendar-day {
+        // height: calc(912px / 5 );
         height: 100%;
         padding: 0px;
         overflow: hidden;
+        .details {
+            height: calc(100% - 20px);
+            overflow-y: auto;
+        }
     }
     .el-calendar-table__row {
         .next {

src/components/cockpit/indicatorDistribution/index.vue

@@ -3,13 +3,19 @@
         <!--指标越限概率分布 -->
         <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen">
             <template v-slot:select>
-                <el-form-item>
+                <el-form-item label="监测点">
-                    <el-select size="small" v-model="tableStore.table.params.searchValue">
+                    <el-select size="small" v-model="tableStore.table.params.lineId">
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                        <el-option
+                            v-for="item in lineList"
+                            :key="item.lineId"
+                            :label="item.name"
+                            :value="item.lineId"
+                        />
                     </el-select>
                 </el-form-item>
             </template>
         </TableHeader>
+        <div v-loading="tableStore.table.loading">
             <my-echart
                 class="tall"
                 :options="echartList"
@@ -27,15 +33,14 @@
                 }"
             />
         </div>
+    </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { limitProbabilityData, cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -46,18 +51,12 @@ const prop = defineProps({
     timeValue: { type: Object }
 })
 
-const options = [
+// const options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
-    {
+
-        value: '1',
+const lineList = ref()
-        label: '35V进线'
-    }
-]
 
 const headerHeight = ref(57)
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
-
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -80,143 +79,68 @@ const fullscreen = computed(() => {
     }
 })
 
-// const echartList = ref({
+const echartList = ref()
-//     options: {
-//         xAxis: null,
-//         yAxis: null,
-//         dataZoom: null,
-//         backgroundColor: '#fff',
-//         tooltip: {
-//             // trigger: 'axis'
-//             textStyle: {
-//                 color: '#fff',
-//                 fontStyle: 'normal',
-//                 opacity: 0.35,
-//                 fontSize: 14
-//             },
-//             backgroundColor: 'rgba(0,0,0,0.55)',
-//             borderWidth: 0,
-//             formatter: function (params: any) {
-//                 console.log(params)
-//                 var tips = ''
-//                 for (var i = 0; i < params.length; i++) {
-//                     tips += params[i].name + '</br/>'
-//                     tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
-//                 }
-//                 return tips
-//             }
-//         },
-//         title: {
-//             text: '指标越限概率分布',
-//             x: 'center'
-//         },
 
-//         visualMap: {
+const echartList1 = ref()
-//             max: 20,
-//             show: false,
-//             inRange: {
-//                 color: ['#313695', '#00BB00', '#ff8000', '#a50026']
-//             }
-//         },
-//         xAxis3D: {
-//             type: 'category',
-//             name: '指标越限',
-//             data: ['0-10', '10-20', '20-30', '30-40', '40-50'],
-//             axisLine: {
-//                 lineStyle: {
-//                     color: '#111'
-//                 }
-//             },
-//             axisLabel: {
-//                 color: '#111'
-//             }
-//         },
-//         yAxis3D: {
-//             type: 'category',
-//             name: '指标类型',
-//             data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'],
-//             nameTextStyle: {
-//                 color: '#111'
-//             },
-//             axisLine: {
-//                 show: true,
-//                 lineStyle: {
-//                     color: '#111'
-//                 }
-//             },
-//             axisLabel: {
-//                 color: '#111'
-//             },
-//             splitLine: {
-//                 lineStyle: {
-//                     // 使用深浅的间隔色
-//                     color: ['#111'],
-//                     type: 'dashed',
-//                     opacity: 0.5
-//                 }
-//             }
-//         },
-//         zAxis3D: {
-//             type: 'value',
-//             splitNumber: 10,
-//             minInterval: 10,
-//             name: '越限占比'
-//         },
-//         grid3D: {
-//             viewControl: {
-//                 projection: 'perspective',
-//                 distance: 250
-//             },
-//             boxWidth: 200,
-//             boxDepth: 80,
-//             light: {
-//                 main: {
-//                     intensity: 1.2
-//                 },
-//                 ambient: {
-//                     intensity: 0.3
-//                 }
-//             }
-//         },
-//         series: [
-//             {
-//                 type: 'bar3D',
-//                 data: [
-//                     [0, 0, 1],
-//                     [0, 1, 1],
-//                     [0.2, 1]
-//                 ],
-//                 shading: 'realistic',
-//                 label: {
-//                     show: false,
-//                     textStyle: {
-//                         fontSize: 16,
-//                         borderWidth: 1
-//                     }
-//                 },
 
-//                 itemStyle: {
+const probabilityData = ref()
-//                     opacity: 1
-//                 },
-//                 emphasis: {
-//                     label: {
-//                         textStyle: {
-//                             fontSize: 20,
-//                             color: '#900'
-//                         }
-//                     },
-//                     itemStyle: {
-//                         color: '#900'
-//                     }
-//                 }
-//             }
-//         ]
-//     }
-// })
 
-var yAxisData = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+const initLineList = async () => {
+    cslineList({}).then(res => {
+        lineList.value = res.data
+        tableStore.table.params.lineId = lineList.value[0].lineId
+        tableStore.index()
+    })
+}
 
-const echartList = ref({
+// 越限程度概率分布
+const initProbabilityData = () => {
+    // 只有当 lineList 已加载且有数据时才设置默认 lineId
+    if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
+        tableStore.table.params.lineId = lineList.value[0].lineId
+    }
+    const params = {
+        searchBeginTime: tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+        searchEndTime: tableStore.table.params.searchEndTime || prop.timeValue?.[1],
+        lineId: tableStore.table.params.lineId
+    }
+    limitProbabilityData(params).then((res: any) => {
+        probabilityData.value = res.data
+
+        // 处理接口返回的数据，转换为图表所需格式
+        if (res.data && Array.isArray(res.data)) {
+            // 定义指标类型顺序
+            const indicatorOrder = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差']
+            // 按照指定顺序排序数据
+            const sortedData = [...res.data].sort((a, b) => {
+                return indicatorOrder.indexOf(a.indexName) - indicatorOrder.indexOf(b.indexName)
+            })
+
+            // 构造 series 数据
+            const seriesData: any = []
+            let maxValue: any = 0 // 用于存储数据中的最大值
+            // 遍历每个越限程度区间（0-20%, 20-40%, 40-60%, 60-80%, 80-100%）
+            for (let xIndex = 0; xIndex < 5; xIndex++) {
+                // 遍历每个指标类型
+                sortedData.forEach((item, yIndex) => {
+                    // 从 extentGrades 中获取对应区间的值
+                    const extentGrade = item.extentGrades[xIndex]
+                    const value = extentGrade ? (Object.values(extentGrade)[0] as number) : 0
+                    seriesData.push([xIndex, yIndex, value])
+
+                    // 更新最大值
+                    if (value > maxValue) {
+                        maxValue = value
+                    }
+                })
+            }
+
+            // 计算 z 轴最大值（最大值加 5）
+            const zAxisMax = Math.ceil(maxValue) + 5
+            // 构造 yAxis 数据（指标类型名称）
+            const yAxisData = sortedData.map(item => item.indexName)
+
+            echartList.value = {
                 options: {
                     backgroundColor: '#fff',
                     tooltip: {
@@ -229,14 +153,11 @@ const echartList = ref({
                         backgroundColor: 'rgba(0,0,0,0.55)',
                         borderWidth: 0,
                         formatter: function (params: any) {
-                console.log(params, '33344')
                             var yIndex = params.value[1] //获取y轴索引
                             var tips = ''
-                // tips += '指标类型: ' + params.name + '</br>'
                             tips += '指标类型: ' + yAxisData[yIndex] + '</br>'
                             tips += '越限程度: ' + params.seriesName + '</br>'
-                // tips += '越限占比: ' + params.value + '%</br>'
+                            tips += '越限次数: ' + params.value[2] + '</br>'
-                tips += '越限占比: ' + params.value[2] + '%</br>'
                             return tips
                         }
                     },
@@ -248,28 +169,19 @@ const echartList = ref({
                             fontWeight: 'normal'
                         }
                     },
+                    // 移除或隐藏 visualMap 组件
                     visualMap: {
-            max: 100,
+                        show: false, // 设置为 false 隐藏右侧颜色条
-            show: true,
+                        min: 0,
+                        // max: 100,
+                        max: zAxisMax, // 使用计算出的最大值加5
                         inRange: {
-                color: [
+                            color: ['#313695', '#00BB00', '#ff8000', '#d73027', '#a50026']
-                    '#313695',
-                    '#4575b4',
-                    '#74add1',
-                    '#abd9e9',
-                    '#e0f3f8',
-                    '#ffffbf',
-                    '#fee090',
-                    '#fdae61',
-                    '#f46d43',
-                    '#d73027',
-                    '#a50026'
-                ]
                         }
-            // calculable: true,
+                    },
-            // orient: 'horizontal',
+                    // 添加 legend 配置并设置为不显示
-            // left: 'center',
+                    legend: {
-            // bottom: '5%'
+                        show: false // 隐藏图例
                     },
                     xAxis3D: {
                         type: 'category',
@@ -295,7 +207,6 @@ const echartList = ref({
                         name: '指标类型',
                         nameLocation: 'middle',
                         nameGap: 30,
-            // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'],
                         data: yAxisData,
                         nameTextStyle: {
                             color: '#111'
@@ -320,7 +231,7 @@ const echartList = ref({
                     },
                     zAxis3D: {
                         type: 'value',
-            name: '越限占比(%)',
+                        name: '越限次数',
                         nameLocation: 'middle',
                         nameGap: 30,
                         nameTextStyle: {
@@ -335,7 +246,8 @@ const echartList = ref({
                             color: '#111'
                         },
                         min: 0,
-            max: 100
+                        max: zAxisMax // 使用计算出的最大值加5
+                        // max: 100
                     },
                     grid3D: {
                         viewControl: {
@@ -360,14 +272,7 @@ const echartList = ref({
                         {
                             type: 'bar3D',
                             name: '0-20%',
-                data: [
+                            data: seriesData.filter((item: any) => item[0] === 0),
-                    // [xIndex, yIndex, value]
-                    [0, 0, 5], // 闪变 - 0-20%
-                    [0, 1, 10], // 谐波电压 - 0-20%
-                    [0, 2, 8], // 谐波电流 - 0-20%
-                    [0, 3, 15], // 电压偏差 - 0-20%
-                    [0, 4, 12] // 三相不平衡 - 0-20%
-                ],
                             shading: 'realistic',
                             label: {
                                 show: false
@@ -391,18 +296,7 @@ const echartList = ref({
                         {
                             type: 'bar3D',
                             name: '20-40%',
-                //   data: chartData.map(function (item) {
+                            data: seriesData.filter((item: any) => item[0] === 1),
-                // 				return {
-                // 					value: [item[1], item[0], item[2]]
-                // 				};
-                // }),
-                data: [
-                    [1, 0, 10], // 闪变 - 20-40%
-                    [1, 1, 20], // 谐波电压 - 20-40%
-                    [1, 2, 15], // 谐波电流 - 20-40%
-                    [1, 3, 25], // 电压偏差 - 20-40%
-                    [1, 4, 18] // 三相不平衡 - 20-40%
-                ],
                             shading: 'realistic',
                             label: {
                                 show: false
@@ -426,13 +320,7 @@ const echartList = ref({
                         {
                             type: 'bar3D',
                             name: '40-60%',
-                data: [
+                            data: seriesData.filter((item: any) => item[0] === 2),
-                    [2, 0, 15], // 闪变 - 40-60%
-                    [2, 1, 25], // 谐波电压 - 40-60%
-                    [2, 2, 30], // 谐波电流 - 40-60%
-                    [2, 3, 35], // 电压偏差 - 40-60%
-                    [2, 4, 28] // 三相不平衡 - 40-60%
-                ],
                             shading: 'realistic',
                             label: {
                                 show: false
@@ -456,13 +344,7 @@ const echartList = ref({
                         {
                             type: 'bar3D',
                             name: '60-80%',
-                data: [
+                            data: seriesData.filter((item: any) => item[0] === 3),
-                    [3, 0, 20], // 闪变 - 60-80%
-                    [3, 1, 30], // 谐波电压 - 60-80%
-                    [3, 2, 35], // 谐波电流 - 60-80%
-                    [3, 3, 40], // 电压偏差 - 60-80%
-                    [3, 4, 35] // 三相不平衡 - 60-80%
-                ],
                             shading: 'realistic',
                             label: {
                                 show: false
@@ -486,13 +368,7 @@ const echartList = ref({
                         {
                             type: 'bar3D',
                             name: '80-100%',
-                data: [
+                            data: seriesData.filter((item: any) => item[0] === 4),
-                    [4, 0, 25], // 闪变 - 80-100%
-                    [4, 1, 35], // 谐波电压 - 80-100%
-                    [4, 2, 40], // 谐波电流 - 80-100%
-                    [4, 3, 45], // 电压偏差 - 80-100%
-                    [4, 4, 42] // 三相不平衡 - 80-100%
-                ],
                             shading: 'realistic',
                             label: {
                                 show: false
@@ -515,220 +391,69 @@ const echartList = ref({
                         }
                     ]
                 }
-})
-
-const echartList1 = ref({
-    title: {
-        text: '越限时间概率分布'
-    },
-
-    xAxis: {
-        // name: '时间',
-        // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-        type: 'time',
-        axisLabel: {
-            formatter: {
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
             }
         }
-    },
-
-    yAxis: {
-        name: '次' // 给X轴加单位
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                name: '闪变',
-                data: [
-                    ['2025-10-16 07:00:00', 10],
-                    ['2025-10-16 07:15:00', 10],
-                    ['2025-10-16 07:30:00', 10],
-                    ['2025-10-16 07:45:00', 10],
-                    ['2025-10-16 08:00:00', 30],
-                    ['2025-10-16 08:15:00', 50],
-                    ['2025-10-16 08:30:00', 60],
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
-                ]
-            },
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                name: '谐波电压',
-                data: [
-                    ['2025-10-16 07:00:00', 1],
-                    ['2025-10-16 07:15:00', 1],
-                    ['2025-10-16 07:30:00', 1],
-                    ['2025-10-16 07:45:00', 1],
-                    ['2025-10-16 08:00:00', 3],
-                    ['2025-10-16 08:15:00', 5],
-                    ['2025-10-16 08:30:00', 6],
-                    ['2025-10-16 08:45:00', 7],
-                    ['2025-10-16 09:00:00', 10],
-                    ['2025-10-16 09:15:00', 12],
-                    ['2025-10-16 09:30:00', 13],
-                    ['2025-10-16 09:45:00', 14],
-                    ['2025-10-16 10:00:00', 16],
-                    ['2025-10-16 10:15:00', 16],
-                    ['2025-10-16 10:30:00', 13],
-                    ['2025-10-16 10:45:00', 12],
-                    ['2025-10-16 11:00:00', 14],
-                    ['2025-10-16 11:15:00', 8],
-                    ['2025-10-16 11:30:00', 7],
-                    ['2025-10-16 11:45:00', 9],
-                    ['2025-10-16 12:00:00', 6],
-                    ['2025-10-16 12:15:00', 6],
-                    ['2025-10-16 12:30:00', 6],
-                    ['2025-10-16 12:45:00', 6]
-                ]
-            },
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                name: '谐波电流',
-                data: [
-                    ['2025-10-16 07:00:00', 19],
-                    ['2025-10-16 07:15:00', 19],
-                    ['2025-10-16 07:30:00', 19],
-                    ['2025-10-16 07:45:00', 19],
-                    ['2025-10-16 08:00:00', 39],
-                    ['2025-10-16 08:15:00', 59],
-                    ['2025-10-16 08:30:00', 69],
-                    ['2025-10-16 08:45:00', 79],
-                    ['2025-10-16 09:00:00', 109],
-                    ['2025-10-16 09:15:00', 129],
-                    ['2025-10-16 09:30:00', 139],
-                    ['2025-10-16 09:45:00', 149],
-                    ['2025-10-16 10:00:00', 169],
-                    ['2025-10-16 10:15:00', 169],
-                    ['2025-10-16 10:30:00', 139],
-                    ['2025-10-16 10:45:00', 129],
-                    ['2025-10-16 11:00:00', 149],
-                    ['2025-10-16 11:15:00', 89],
-                    ['2025-10-16 11:30:00', 79],
-                    ['2025-10-16 11:45:00', 99],
-                    ['2025-10-16 12:00:00', 69],
-                    ['2025-10-16 12:15:00', 69],
-                    ['2025-10-16 12:30:00', 69],
-                    ['2025-10-16 12:45:00', 69]
-                ]
-            },
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                name: '电压偏差',
-                data: [
-                    ['2025-10-16 07:00:00', 12],
-                    ['2025-10-16 07:15:00', 12],
-                    ['2025-10-16 07:30:00', 12],
-                    ['2025-10-16 07:45:00', 12],
-                    ['2025-10-16 08:00:00', 32],
-                    ['2025-10-16 08:15:00', 52],
-                    ['2025-10-16 08:30:00', 62],
-                    ['2025-10-16 08:45:00', 72],
-                    ['2025-10-16 09:00:00', 112],
-                    ['2025-10-16 09:15:00', 122],
-                    ['2025-10-16 09:30:00', 122],
-                    ['2025-10-16 09:45:00', 152],
-                    ['2025-10-16 10:00:00', 122],
-                    ['2025-10-16 10:15:00', 112],
-                    ['2025-10-16 10:30:00', 132],
-                    ['2025-10-16 10:45:00', 122],
-                    ['2025-10-16 11:00:00', 142],
-                    ['2025-10-16 11:15:00', 82],
-                    ['2025-10-16 11:30:00', 72],
-                    ['2025-10-16 11:45:00', 92],
-                    ['2025-10-16 12:00:00', 62],
-                    ['2025-10-16 12:15:00', 62],
-                    ['2025-10-16 12:30:00', 62],
-                    ['2025-10-16 12:45:00', 62]
-                ]
-            },
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                name: '三相不平衡',
-                data: [
-                    ['2025-10-16 07:00:00', 10],
-                    ['2025-10-16 07:15:00', 10],
-                    ['2025-10-16 07:30:00', 10],
-                    ['2025-10-16 07:45:00', 10],
-                    ['2025-10-16 08:00:00', 30],
-                    ['2025-10-16 08:15:00', 50],
-                    ['2025-10-16 08:30:00', 60],
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
-                ]
-            }
-        ]
-    }
     })
+}
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/limitRateDetailD/limitTimeProbabilityData',
     method: 'POST',
     showPage: false,
     column: [],
     beforeSearchFun: () => {
         tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
         tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        // 只有当 lineList 已加载且有数据时才设置默认 lineId
+        if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
+            tableStore.table.params.lineId = lineList.value[0].lineId
+        }
     },
     loadCallback: () => {
-        tableStore.table.data = []
+        // 处理返回的数据，将其转换为图表所需格式
+        const indexNames: any = [...new Set(tableStore.table.data.map((item: any) => item.indexName))]
+        const timePeriods = [...new Set(tableStore.table.data.map((item: any) => item.timePeriod))]
+
+        // 构建系列数据
+        const seriesData = indexNames.map((indexName: string) => {
+            const dataIndex = tableStore.table.data.filter((item: any) => item.indexName === indexName)
+            return {
+                name: indexName,
+                type: 'line',
+                symbol: 'none',
+                data: dataIndex.map((item: any) => [item.timePeriod, item.times])
             }
         })
 
-const tableRef = ref()
+        echartList1.value = {
-tableStore.table.params.searchValue = '1'
+            title: {
-provide('tableRef', tableRef)
+                text: '越限时间概率分布'
+            },
+            tooltip: {
+                trigger: 'axis'
+            },
+            legend: {
+                data: indexNames
+            },
+            xAxis: {
+                type: 'category',
+                name: '时间段',
+                data: timePeriods
+            },
+            yAxis: {
+                type: 'value'
+                // name: '次数'
+            },
+            series: seriesData
+        }
+        initProbabilityData()
+    }
+})
 
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
+    initLineList()
 })
 watch(
     () => prop.timeKey,

src/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue

@@ -157,7 +157,7 @@ const countOptions: any = ref([])
 const legendDictList: any = ref([])
 
 const initCode = (field: string, title: string) => {
-    queryByCode('steady_state_power_quality').then(res => {
+    queryByCode('steady_state_limit_trend').then(res => {
         queryCsDictTree(res.data.id).then(item => {
             //排序
             indexOptions.value = item.data.sort((a: any, b: any) => {

src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue

@@ -63,7 +63,7 @@ const loop50 = (key: string) => {
     return list
 }
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/mainLine/statLimitRateDetails',
+    url: '/cs-harmonic-boot/mainLine/statLimitRateDetails',
     method: 'POST',
     publicHeight: 30,
     showPage: false,

src/components/cockpit/indicatorFittingChart/index.vue

@@ -67,7 +67,7 @@ const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
 }
 
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/mainLine/list',
+    url: '/cs-harmonic-boot/mainLine/list',
     method: 'POST',
     showPage: fullscreen.value ? true : false,
     exportName: '主要监测点列表',

src/components/cockpit/listOfMainMonitoringPoints/index.vue

@@ -1,15 +1,10 @@
 <template>
     <div>
         <!--指标拟合图 -->
-        <TableHeader :showReset="false" datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
                 <el-form-item label="监测点">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点" clearable>
-                        v-model="tableStore.table.params.lineId"
-                        placeholder="请选择监测点"
-                        clearable
-                        style="width: 130px"
-                    >
                         <el-option
                             v-for="item in lineList"
                             :key="item.lineId"
@@ -19,52 +14,47 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="用户功率">
+                    <el-select v-model="tableStore.table.params.power" placeholder="请选择用户功率" clearable>
+                        <el-option v-for="item in powerList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="统计类型">
                     <el-select
-                        v-model="tableStore.table.params.power"
+                        style="min-width: 120px !important"
-                        placeholder="请选择用户功率"
+                        placeholder="请选择"
-                        clearable
+                        v-model="tableStore.table.params.valueType"
-                        style="width: 130px"
                     >
-                        <el-option
+                        <el-option value="max" label="最大值"></el-option>
-                            v-for="item in powerList"
+                        <el-option value="min" label="最小值"></el-option>
-                            :key="item.value"
+                        <el-option value="avg" label="平均值"></el-option>
-                            :label="item.label"
+                        <el-option value="cp95" label="cp95"></el-option>
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="电能质量指标">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.indicator" placeholder="请选择电能质量指标" clearable>
-                        v-model="tableStore.table.params.indicator"
+                        <el-option v-for="item in indicatorList" :key="item.id" :label="item.name" :value="item.id" />
-                        placeholder="请选择电能质量指标"
-                        clearable
-                        style="width: 130px"
-                    >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="越限情况">
+                <el-form-item>
+                    <div v-if="shouldShowHarmonicCount()" style="display: flex; color: var(--el-text-color-regular)">
+                        <span style="width: 160px">{{ getHarmonicTypeName() }}谐波次数</span>
                         <el-select
-                        v-model="tableStore.table.params.exceedingTheLimit"
+                            v-model="tableStore.table.params.harmonicCount"
-                        placeholder="请选择越限情况"
+                            placeholder="请选择谐波次数"
-                        clearable
+                            style="min-width: 80px !important"
-                        style="width: 90px"
                         >
                             <el-option
-                            v-for="item in exceedingTheLimitList"
+                                v-for="num in harmonicCountOptions"
-                            :key="item.value"
+                                :key="num"
-                            :label="item.label"
+                                :label="num"
-                            :value="item.value"
+                                :value="num"
-                        />
+                            ></el-option>
                         </el-select>
+                    </div>
                 </el-form-item>
             </template>
         </TableHeader>
+        <div v-loading="tableStore.table.loading">
             <my-echart
                 class="tall"
                 :options="echartList"
@@ -74,20 +64,17 @@
                 }"
             />
         </div>
+    </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h, computed } from 'vue'
+import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
-import { useRoute } from 'vue-router'
+import { cslineList, fittingData } from '@/api/harmonic-boot/cockpit/cockpit'
-import { useTimeCacheStore } from '@/stores/timeCache'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
-import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+import { ElMessage } from 'element-plus'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -98,28 +85,21 @@ const prop = defineProps({
     timeValue: { type: Object }
 })
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
 const config = useConfig()
 
 const lineList: any = ref()
 
-const powerList: any = ref([
+const powerList: any = ref()
-    {
+
-        label: '三相总有功功率',
+const countData: any = ref([])
-        value: '1'
+
-    },
+const chartsList = ref<any>([])
-    {
+
-        label: '三相总无功功率',
-        value: '2'
-    }
-])
 // 计算是否全屏展示
 const fullscreen = computed(() => {
     const w = Number(prop.w)
     const h = Number(prop.h)
     if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
-        initLineList()
         // 执行相应逻辑
         return true
     } else {
@@ -136,39 +116,39 @@ const exceedingTheLimitList: any = ref([
         value: '0'
     }
 ])
-const indicatorList: any = ref([
+
-    {
+const indicatorList = ref()
-        label: '谐波电压总畸变率',
-        value: '1'
-    },
-    {
-        label: '各次谐波电压',
-        value: '2'
-    },
-    {
-        label: '各次谐波电压',
-        value: '3'
-    },
-    {
-        label: '三相电压不平衡',
-        value: '4'
-    }
-])
 
 const initLineList = async () => {
     cslineList({}).then(res => {
         lineList.value = res.data
-        if (lineList.value && lineList.value.length > 0) {
         tableStore.table.params.lineId = lineList.value[0].lineId
-        }
     })
 }
 
-const echartList = ref({
+const echartList = ref()
-    title: {
-        text: '谐波电压总畸变率越限与功率负荷曲线拟合图'
-    },
 
+const headerHeight = ref(57)
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+
+    if (datePickerValue && datePickerValue.timeValue) {
+        // 更新时间参数
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    }
+}
+
+const setEchart = () => {
+    // 获取当前选择的功率和指标名称
+    const powerName = powerList.value?.find((item: any) => item.id === tableStore.table.params.power)?.name || '功率'
+    const indicatorName =
+        indicatorList.value?.find((item: any) => item.id === tableStore.table.params.indicator)?.name || '电能质量指标'
+
+    echartList.value = {
+        title: {
+            text: `${indicatorName}与${powerName}负荷曲线拟合图`
+        },
         xAxis: {
             type: 'time',
             axisLabel: {
@@ -179,7 +159,6 @@ const echartList = ref({
                 }
             }
         },
-
         yAxis: [{}, {}],
         grid: {
             left: '10px',
@@ -188,38 +167,11 @@ const echartList = ref({
         options: {
             series: [
                 {
-                //   name: '暂降次数',
                     type: 'bar',
-                name: '有功功率',
+                    name: powerName, // 动态设置功率名称
-                data: [
+                    data: [],
-                    ['2025-10-16 07:00:00', 10],
-                    ['2025-10-16 07:15:00', 10],
-                    ['2025-10-16 07:30:00', 10],
-                    ['2025-10-16 07:45:00', 10],
-                    ['2025-10-16 08:00:00', 30],
-                    ['2025-10-16 08:15:00', 50],
-                    ['2025-10-16 08:30:00', 60],
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
-                ],
                     itemStyle: {
                         normal: {
-                        //这里是颜色
                             color: function (params: any) {
                                 if (params.value[1] == 0 || params.value[1] == 3.14159) {
                                     return '#ccc'
@@ -232,86 +184,198 @@ const echartList = ref({
                     yAxisIndex: 0
                 },
                 {
-                name: '谐波总畸变率',
+                    name: indicatorName, // 动态设置指标名称
                     type: 'line',
                     showSymbol: false,
-                smooth: true,
+                    // smooth: true,
-                data: [
+                    data: [],
-                    ['2025-10-16 07:00:00', 0],
-                    ['2025-10-16 07:15:00', 0],
-                    ['2025-10-16 07:30:00', 0],
-                    ['2025-10-16 07:45:00', 0],
-                    ['2025-10-16 08:00:00', 0],
-                    ['2025-10-16 08:15:00', 0.1],
-                    ['2025-10-16 08:30:00', 0.1],
-                    ['2025-10-16 08:45:00', 0.1],
-                    ['2025-10-16 09:00:00', 1],
-                    ['2025-10-16 09:15:00', 1],
-                    ['2025-10-16 09:30:00', 1],
-                    ['2025-10-16 09:45:00', 1],
-                    ['2025-10-16 10:00:00', 0.8],
-                    ['2025-10-16 10:15:00', 0.8],
-                    ['2025-10-16 10:30:00', 0.8],
-                    ['2025-10-16 10:45:00', 0.8],
-                    ['2025-10-16 11:00:00', 0.8],
-                    ['2025-10-16 11:15:00', 0.1],
-                    ['2025-10-16 11:30:00', 0.1],
-                    ['2025-10-16 11:45:00', 0.1],
-                    ['2025-10-16 12:00:00', 0],
-                    ['2025-10-16 12:15:00', 0],
-                    ['2025-10-16 12:30:00', 0],
-                    ['2025-10-16 12:45:00', 0]
-                ],
                     yAxisIndex: 1
                 }
             ]
         }
-})
-const headerHeight = ref(57)
-const selectChange = (showSelect: any, height: any) => {
-    headerHeight.value = height
     }
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
 
+    try {
+        // 用户功率数据和电能质量数据
+        let powerData: any[] = []
+        let qualityData: any[] = []
+
+        chartsList.value.forEach((item: any) => {
+            // 根据统计项ID判断是功率数据还是电能质量数据
+            if (item.statisticalIndex === tableStore.table.params.power) {
+                powerData.push(item)
+            } else if (item.statisticalIndex === tableStore.table.params.indicator) {
+                qualityData.push(item)
+            }
+        })
+
+        // 处理功率数据
+        const processedPowerData = powerData.map((item: any) => {
+            return [
+                item.time,
+                item.statisticalData !== null && item.statisticalData !== undefined
+                    ? parseFloat(item.statisticalData.toFixed(2))
+                    : null
+            ]
+        })
+
+        // 处理电能质量数据
+        const processedQualityData = qualityData.map((item: any) => {
+            return [
+                item.time,
+                item.statisticalData !== null && item.statisticalData !== undefined
+                    ? parseFloat(item.statisticalData.toFixed(2))
+                    : null
+            ]
+        })
+
+        // 检查是否有有效数据
+        const hasPowerData = processedPowerData.length > 0 && processedPowerData.some(item => item[1] !== null)
+        const hasQualityData = processedQualityData.length > 0 && processedQualityData.some(item => item[1] !== null)
+
+        // 更新图表配置
+        echartList.value.options.series[0].data = processedPowerData
+        echartList.value.options.series[1].data = processedQualityData
+    } catch (error) {
+        console.error('处理图表数据时出错:', error)
+    }
+}
+
+const initCode = () => {
+    queryByCode('steady_state_limit_fitting').then(res => {
+        queryCsDictTree(res.data.id).then(item => {
+            powerList.value = item.data.filter((item: any) => {
+                return item.name == '三相总无功功率' || item.name == '三相总有功功率'
+            })
+
+            indicatorList.value = item.data.filter((item: any) => {
+                return item.name != '三相总无功功率' && item.name != '三相总有功功率'
+            })
+
+            tableStore.table.params.power = powerList.value[0].id
+            tableStore.table.params.indicator = indicatorList.value[0].id
+            nextTick(() => {
+                tableStore.index()
+            })
+        })
+    })
+}
+
+const tableStore: any = new TableStore({
+    url: '/cs-device-boot/csGroup/fittingData',
+    method: 'POST',
     showPage: false,
     exportName: '主要监测点列表',
     column: [],
     beforeSearchFun: () => {
-        // 尝试从缓存获取时间值
+        // 设置时间参数
-        let beginTime, endTime
+        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
+        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
 
-        if (fullscreen.value) {
+        // 只有当 lineList 已加载且有数据时才设置默认 lineId
-            const cached = timeCacheStore.getCache(route.path)
-            if (cached && cached.timeValue) {
-                beginTime = cached.timeValue[0]
-                endTime = cached.timeValue[1]
-            }
-        }
-
-        // 如果缓存中没有则使用默认值
-        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1]
         if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
             tableStore.table.params.lineId = lineList.value[0].lineId
         }
+
+        // 构建请求参数 lists
+        let lists: any = []
+
+        // 处理用户功率指标
+        const selectedPower = powerList.value?.find((item: any) => item.id === tableStore.table.params.power)
+        if (selectedPower) {
+            lists.push({
+                statisticalId: tableStore.table.params.power,
+                valueType: tableStore.table.params.valueType
+            })
+        }
+
+        // 处理电能质量指标
+        const selectedIndicator = indicatorList.value?.find(
+            (item: any) => item.id === tableStore.table.params.indicator
+        )
+        if (selectedIndicator) {
+            let frequencys = ''
+            if (selectedIndicator.name.includes('谐波含有率')) {
+                frequencys = tableStore.table.params.harmonicCount
+            }
+
+            lists.push({
+                statisticalId: tableStore.table.params.indicator,
+                frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : ''
+            })
+        }
+
+        // 将 lists 添加到请求参数中
+        tableStore.table.params.list = lists
+        tableStore.table.params.dataLevel = 'Primary'
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
+        // 数据加载完成后的处理
+        if (tableStore.table.data) {
+            chartsList.value = JSON.parse(JSON.stringify(tableStore.table.data))
+            setEchart()
+        }
     }
 })
 
 const tableRef = ref()
 provide('tableRef', tableRef)
-tableStore.table.params.power = '1'
 tableStore.table.params.indicator = '1'
 tableStore.table.params.exceedingTheLimit = '1'
+tableStore.table.params.valueType = 'avg'
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
+// 添加谐波次数选项（2-50）
+const harmonicCountOptions = ref(Array.from({ length: 49 }, (_, i) => i + 2))
+
+// 判断是否应该显示谐波次数选择框
+const shouldShowHarmonicCount = () => {
+    if (!tableStore.table.params.indicator || !indicatorList.value) return false
+
+    const currentIndicator = indicatorList.value.find((item: any) => item.id === tableStore.table.params.indicator)
+
+    return (
+        currentIndicator &&
+        (currentIndicator.name.includes('电压谐波含有率') || currentIndicator.name.includes('电流谐波含有率'))
+    )
+}
+
+// 获取谐波类型名称
+const getHarmonicTypeName = () => {
+    const currentIndicator = indicatorList.value.find((item: any) => item.id === tableStore.table.params.indicator)
+
+    if (currentIndicator) {
+        if (currentIndicator.name.includes('电压谐波含有率')) {
+            return '电压'
+        } else if (currentIndicator.name.includes('电流谐波含有率')) {
+            return '电流'
+        }
+    }
+    return ''
+}
+
+// 监听指标变化，当指标变化时重置谐波次数
+watch(
+    () => tableStore.table.params.indicator,
+    newVal => {
+        if (shouldShowHarmonicCount()) {
+            // 如果之前没有设置过谐波次数，则默认设置为2
+            if (!tableStore.table.params.harmonicCount) {
+                tableStore.table.params.harmonicCount = 2
+            }
+        } else {
+            // 如果不是谐波含有率指标，则清除谐波次数设置
+            tableStore.table.params.harmonicCount = ''
+        }
+    }
+)
+
 onMounted(() => {
-    tableStore.index()
+    initLineList().then(() => {
+        initCode()
+    })
 })
 watch(
     () => prop.timeKey,
@@ -320,19 +384,24 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
+        // 当外部时间值变化时，更新表格的时间参数
+        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
+            tableStore.table.params.searchBeginTime = newVal[0]
+            tableStore.table.params.searchEndTime = newVal[1]
             tableStore.index()
+        }
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 
 const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
-:deep(.el-select) {
+// :deep(.el-select) {
-    min-width: 80px;
+//     min-width: 80px;
-}
+// }
 </style>

src/components/cockpit/monitoringPointList/components/overLimitDetails.vue

@@ -23,7 +23,7 @@
             <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
         </el-dialog>
         <!-- 谐波电流、谐波电压占有率 -->
-        <HarmonicRatio‌ ref="harmonicRatio‌Ref" @close="onHarmonicRatioClose" :TrendList="TrendList" />
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" />
     </div>
 </template>
 <script setup lang="ts">
@@ -32,7 +32,7 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
-import HarmonicRatio‌ from '@/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue'
+import HarmonicRatio‌ from '@/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue'
 import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
 
 const dialogVisible: any = ref(false)
@@ -41,7 +41,7 @@ const harmonicRatio‌Ref: any = ref(null)
 const options = ref()
 const height = mainHeight(0, 2).height as any
 const tableHeaderRef = ref()
-const TrendList = ref([{lineType:1}])
+const dialogFlag = ref(false)
 const loop50 = (key: string) => {
     let list: any[] = []
     for (let i = 2; i < 26; i++) {
@@ -58,11 +58,11 @@ const loop50 = (key: string) => {
     return list
 }
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/mainLine/statLimitRateDetails',
+    url: '/cs-harmonic-boot/totalLimitStatistics/details',
     method: 'POST',
     publicHeight: 30,
     showPage: false,
-    exportName: '主要监测点列表',
+    exportName: '每日越限占比统计',
     column: [
         {
             field: 'index',
@@ -84,7 +84,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(分钟)',
+            title: '闪变越限(%)',
             field: 'flickerOvertime',
             width: '80',
             render: 'customTemplate',
@@ -93,15 +93,15 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '谐波电压越限(分钟)',
+            title: '谐波电压越限(%)',
             children: loop50('uharm')
         },
         {
-            title: '谐波电流越限(分钟)',
+            title: '谐波电流越限(%)',
             children: loop50('iharm')
         },
         {
-            title: '三相不平衡度越限(分钟)',
+            title: '三相不平衡度越限(%)',
             field: 'ubalanceOvertime',
             width: '100',
             render: 'customTemplate',
@@ -110,8 +110,8 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '电压偏差越限(分钟)',
+            title: '电压偏差越限(%)',
-            field: 'uaberranceOvertime',
+            field: 'voltageDevOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {
@@ -119,7 +119,7 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '频率偏差越限(分钟)',
+            title: '频率偏差越限(%)',
             field: 'freqDevOvertime',
             width: '100',
             render: 'customTemplate',
@@ -155,17 +155,18 @@ const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name' && column.field != 'time') {
+        dialogFlag.value = true
         dialogVisible.value = false
-        // if(column.title && column.title=='闪变越限(分钟)'){
+        nextTick(() => {
-        //     column.title = '1次'
-        // }
-        // harmonicRatio‌Ref.value.openDialog(row,column.title.replace(/次/g, ""))
             harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        })
+
     }
 }
 
 // 谐波弹窗关闭时的回调
 const onHarmonicRatioClose = () => {
+     dialogFlag.value = false
     // 重新打开指标越限详情弹窗
     nextTick(() => {
         dialogVisible.value = true

src/components/cockpit/monitoringPointList/index.vue

@@ -2,22 +2,50 @@
     <div>
         <!-- 监测点列表 -->
         <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`"></Table>
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? -58 : 56}px )`"
+        ></Table>
         <!-- 指标越限详情 -->
         <OverLimitDetails ref="OverLimitDetailsRef" />
+
+        <!-- 上传对话框 -->
+        <el-dialog v-model="uploadDialogVisible" title="上传报告" width="500px" @closed="handleDialogClosed">
+            <el-upload
+                ref="uploadRef"
+                class="upload-demo"
+                :auto-upload="true"
+                :on-change="handleChange"
+                :before-upload="beforeUpload"
+                :http-request="handleUpload"
+                :limit="1"
+                :on-exceed="handleExceed"
+                :file-list="fileList"
+            >
+                <el-button type="primary">点击上传</el-button>
+                <template #tip>
+                    <div class="el-upload__tip">只能上传Word或PDF文件，且不超过10MB</div>
+                </template>
+            </el-upload>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="uploadDialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="uploadDialogVisible = false">确定</el-button>
+                </span>
+            </template>
+        </el-dialog>
     </div>
 </template>
+
 <script setup lang="ts">
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import { ElTag } from 'element-plus'
 import OverLimitDetails from '@/components/cockpit/monitoringPointList/components/overLimitDetails.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useRoute } from 'vue-router'
+import { uploadReport, getReportUrl } from '@/api/harmonic-boot/cockpit/cockpit'
-import { useTimeCacheStore } from '@/stores/timeCache'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -30,8 +58,11 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
+// 上传相关
-const timeCacheStore = useTimeCacheStore()
+const uploadDialogVisible = ref(false)
+const currentUploadRow = ref<any>(null)
+const uploadRef = ref()
+const fileList = ref([])
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
@@ -57,11 +88,10 @@ const fullscreen = computed(() => {
 
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-device-boot/csline/getSensitiveUserLineList',
     method: 'POST',
-
+    showPage: fullscreen.value ? true : false,
-    showPage: false,
+    exportName: '监测点列表',
-    exportName: '主要监测点列表',
     column: [
         {
             field: 'index',
@@ -72,107 +102,215 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '治理对象名称',
+            title: '治理对象',
-            field: 'name',
+            field: 'sensitiveUser',
             minWidth: '80'
         },
 
         {
             title: '电压等级',
-            field: 'type',
+            field: 'volGrade',
             minWidth: '70'
         },
         {
-            title: '治理设备详情',
+            title: '是否治理',
-            field: 'type1',
+            field: 'govern',
             minWidth: '70'
         },
 
+        // {
+        //     title: '治理前报告',
+        //     field: 'reportFileName',
+        //     minWidth: '80',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return `<span style='cursor: pointer;text-decoration: underline;'>${row.reportFileName}</span>`
+        //     }
+        // },
         {
-            title: '治理前报告',
+            title: '监测点名称',
-            field: 'type2',
+            field: 'lineName',
-            minWidth: '80',
+            minWidth: '70',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;' onclick="handleReportClick('${row.name}')">${row.type2}</span>`
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
             }
         },
-        { title: '监测点名称', field: 'type3', minWidth: '70' },
+        { title: '监测类型', field: 'position', minWidth: '60' },
-        { title: '监测类型', field: 'type4', minWidth: '60' },
         {
             title: '监测点状态',
-            field: 'type5',
+            field: 'runStatus',
             minWidth: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='color: ${row.type5 === '中断' ? '#FF0000' : ''}'>${row.type5}</span>`
+                return `<span style='color: ${row.runStatus === '中断' ? '#FF0000' : ''}'>${row.runStatus}</span>`
             }
         },
-        { title: '最新数据时间', field: 'type6', minWidth: '140' }
+        {
+            title: '最新数据时间',
+            field: 'latestTime',
+            minWidth: '140',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                if (row.latestTime) {
+                    return `<span>${row.latestTime}</span>`
+                } else {
+                    return `<span>/</span>`
+                }
+            }
+        },
+        {
+            title: '操作',
+            minWidth: 120,
+            // fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '上传报告',
+                    type: 'primary',
+                    icon: 'el-icon-upload',
+                    render: 'basicButton',
+                    click: row => {
+                        uploadReportRow(row)
+                    },
+                    disabled: row => {
+                        return row.reportFilePath
+                    }
+                },
+
+                {
+                    name: 'productSetting',
+                    title: '下载报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        downloadTheReport(row.lineId)
+                    },
+                    disabled: row => {
+                        return row.reportFilePath == null || row.reportFilePath.length == 0
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '重新上传',
+                    type: 'primary',
+                    icon: 'el-icon-upload',
+                    render: 'basicButton',
+                    click: row => {
+                        uploadReportRow(row)
+                    },
+                    disabled: row => {
+                        return row.reportFilePath == null || row.reportFilePath.length == 0
+                    }
+                }
+            ]
+        }
     ],
     beforeSearchFun: () => {
         tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
         tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '1#变压器',
-                type: '0.38kV',
-                type1: '250A APF',
-                type2: '报告.doc',
-                type3: '1#变压器 电网侧',
-                type4: '电网侧',
-                type5: '运行',
-                type6: '2025-04-11 18:16:00'
-            },
-            {
-                name: '1#变压器',
-                type: '0.38kV',
-                type1: '250A APF',
-                type2: '报告.doc',
-                type3: '1#变压器 负载侧',
-                type4: '负载侧',
-                type5: '运行',
-                type6: '2025-04-11 18:16:00'
-            },
-            {
-                name: '2#变压器',
-                type: '0.38kV',
-                type1: '100A SVG',
-                type2: '/',
-                type3: '1#变压器 电网侧',
-                type4: '电网侧',
-                type5: '运行',
-                type6: '2025-04-11 18:16:00'
-            },
-            {
-                name: '2#变压器',
-                type: '0.38kV',
-                type1: '100A SVG',
-                type2: '/',
-                type3: '1#变压器 负载侧',
-                type4: '负载侧',
-                type5: '中断',
-                type6: '2025-04-11 18:16:00'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
     }
 })
 
 const tableRef = ref()
 provide('tableRef', tableRef)
-tableStore.table.params.type = ''
+tableStore.table.params.keywords = ''
-tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field == 'name') {
+    if (column.field == 'lineName') {
-        console.log(row)
+        OverLimitDetailsRef.value.open(
-        OverLimitDetailsRef.value.open(row)
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
+    }
+}
+
+// 下载报告
+const downloadTheReport = (lineId: string) => {
+    getReportUrl({ lineId: lineId }).then((res: any) => {
+        const link = document.createElement('a')
+        link.href = res.data
+        link.download = '治理报告'
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+    })
+}
+
+// 上传报告
+const uploadReportRow = (row: any) => {
+    currentUploadRow.value = row
+    // 打开弹窗前清空文件列表
+    fileList.value = []
+    uploadDialogVisible.value = true
+}
+
+// 处理弹窗关闭事件
+const handleDialogClosed = () => {
+    // 清空文件列表
+    fileList.value = []
+}
+
+// 处理文件超出限制
+const handleExceed = (files: any, fileList: any) => {
+    ElMessage.warning('只能上传一个文件，请先删除已选择的文件')
+}
+
+// 文件变更处理函数
+const handleChange = (file: any, fileList: any) => {
+    // 在这里直接处理文件上传逻辑
+    beforeUpload(file.raw) // 注意使用 file.raw 获取原始文件对象
+}
+
+// 处理上传前检查
+const beforeUpload = (file: any) => {
+    const isWord =
+        file.type === 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ||
+        file.type === 'application/msword' ||
+        file.name.endsWith('.doc') ||
+        file.name.endsWith('.docx')
+
+    const isPDF = file.type === 'application/pdf' || file.name.endsWith('.pdf')
+
+    const isValidType = isWord || isPDF
+    const isLt10M = file.size / 1024 / 1024 < 10
+
+    if (!isValidType) {
+        ElMessage.error('上传文件只能是 Word 文档(.doc/.docx) 或 PDF 文件(.pdf)!')
+        return false
+    }
+    if (!isLt10M) {
+        ElMessage.error('上传文件大小不能超过 10MB!')
+        return false
+    }
+
+    // 校验通过后允许上传，交由 http-request 处理
+    return true
+}
+
+const handleUpload = async (options: any) => {
+    const { file } = options
+    const formData = new FormData()
+    formData.append('file', file)
+    formData.append('lineId', currentUploadRow.value?.lineId || currentUploadRow.value?.id || '')
+
+    try {
+        const result = await uploadReport(formData)
+        ElMessage.success('上传成功')
+        uploadDialogVisible.value = false
+        tableStore.index()
+        return Promise.resolve(result)
+    } catch (error: any) {
+        ElMessage.error('上传失败: ' + (error.message || '未知错误'))
+        return Promise.reject(error)
     }
 }
 
@@ -199,31 +337,5 @@ watch(
         deep: true
     }
 )
-
-const handleReportClick = (id: string) => {
-    const row = tableStore.table.data.find((item: any) => item.id === id)
-    if (row && row.type2 !== '/') {
-        // 示例：触发下载逻辑（根据你注释掉的代码）
-        // getFileZip({ eventId: id }).then(res => {
-        //   let blob = new Blob([res], { type: 'application/zip' })
-        //   const url = window.URL.createObjectURL(blob)
-        //   const link = document.createElement('a')
-        //   link.href = url
-        //   link.download = row.wavePath?.split('/')[2] || '报告文件.zip'
-        //   link.click()
-        // })
-        console.log('点击了报告:', row.type2)
-    } else {
-        ElMessage.warning('暂无报告可下载')
-    }
-}
-
-// 挂载到 window 供 HTML 调用
-window.handleReportClick = handleReportClick
-
-// 组件销毁时清理全局方法
-onBeforeUnmount(() => {
-    delete window.handleReportClick
-})
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable title="谐波电压/电流含有率" v-model="dialogVisible" append-to-body width="70%">
+    <el-dialog draggable title="趋势图" v-model="dialogVisible" append-to-body width="70%">
         <!-- 总体指标占比详情谐波含有率 -->
         <div>
             <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
@@ -157,7 +157,7 @@ const countOptions: any = ref([])
 const legendDictList: any = ref([])
 
 const initCode = (field: string, title: string) => {
-    queryByCode('steady_state_power_quality').then(res => {
+    queryByCode('steady_state_limit_trend').then(res => {
         queryCsDictTree(res.data.id).then(item => {
             //排序
             indexOptions.value = item.data.sort((a: any, b: any) => {

src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue

@@ -58,7 +58,7 @@ const loop50 = (key: string) => {
     return list
 }
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/totalLimitStatistics/details',
+    url: '/cs-harmonic-boot/totalLimitStatistics/details',
     method: 'POST',
     publicHeight: 30,
     showPage: false,
@@ -111,7 +111,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '电压偏差越限(%)',
-            field: 'uaberranceOvertime',
+            field: 'voltageDevOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {

src/components/cockpit/overLimitStatistics/index.vue

@@ -120,7 +120,7 @@ const initEcharts = () => {
 
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/totalLimitStatistics/list',
+    url: '/cs-harmonic-boot/totalLimitStatistics/list',
     method: 'POST',
 
     showPage: false,

src/components/cockpit/sensitiveLoad/index.vue

@@ -2,17 +2,17 @@
     <div>
         <!--敏感负荷列表 -->
         <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`" isGroup></Table>
+        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? -58 : 56}px  )`" isGroup></Table>
     </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import TableHeader from '@/components/table/header/index.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
 
 const prop = defineProps({
     w: { type:  [String, Number]},
@@ -25,8 +25,9 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
+const dictData = useDictData()
-const timeCacheStore = useTimeCacheStore()
+const sensitiveUserType = dictData.getBasicData('Sensitive_User_Type')
+
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
@@ -53,11 +54,9 @@ const fullscreen = computed(() => {
 
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/pqSensitiveUser/getList',
     method: 'POST',
-
+    showPage: fullscreen.value ? true : false,
-    showPage: false,
-
     column: [
         {
             field: 'index',
@@ -75,17 +74,20 @@ const tableStore: any = new TableStore({
 
         {
             title: '敏感负荷类型',
-            field: 'type',
+            field: 'loadType',
-            minWidth: '70'
+            minWidth: '70',
+             formatter: row => {
+                return sensitiveUserType.filter(item => item.id == row.cellValue)[0]?.name
+            }
         },
         {
             title: '是否监测',
-            field: 'type1',
+            field: 'isMonitor',
             minWidth: '80'
         },
         {
             title: '是否治理',
-            field: 'type2',
+            field: 'isGovern',
             minWidth: '80'
         }
     ],
@@ -95,20 +97,6 @@ const tableStore: any = new TableStore({
     },
 
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '10kV1#变压器',
-                type: '机房',
-                type1: '是',
-                type2: '100A APF'
-            },
-            {
-                name: '380kV1#母线',
-                type: 'PLC',
-                type1: '是',
-                type2: 'UPS'
-            }
-        ]
     }
 })
 
@@ -151,6 +139,5 @@ watch(
     }
 )
 
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/transientDetails/components/transientList.vue

@@ -1,15 +1,11 @@
 <template>
     <div>
-        <!-- 暂态事件列表 -->
+        <!-- 暂态事件详情 -->
-        <el-dialog draggable title="暂态事件列表" v-model="dialogVisible" append-to-body width="70%">
+        <el-dialog draggable title="暂态事件详情 " v-model="dialogVisible" append-to-body width="70%">
-            <!-- <TableHeader datePicker showExport :showReset="false">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
                 <template v-slot:select>
-                    <el-form-item label="监测点名称">
+                    <el-form-item label="监测点">
-                        <el-select
+                        <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
-                            v-model="tableStore.table.params.searchValue"
-                            placeholder="请选择监测点名称"
-                            style="width: 240px"
-                        >
                             <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -19,8 +15,25 @@
                         </el-select>
                     </el-form-item>
                 </template>
-            </TableHeader> -->
+            </TableHeader>
-            <Table ref="tableRef"  isGroup :height="height"></Table>
+            <Table ref="tableRef" isGroup :height="heightRef"></Table>
+        </el-dialog>
+        <!-- 查看波形 -->
+        <el-dialog
+            v-model="isWaveCharts"
+            draggable
+            title="波形分析"
+            append-to-body
+            v-if="isWaveCharts"
+            width="70%"
+            @close="handleHideCharts"
+        >
+            <waveFormAnalysis
+                v-loading="loading"
+                ref="waveFormAnalysisRef"
+                @handleHideCharts="handleHideCharts"
+                :wp="wp"
+            />
         </el-dialog>
     </div>
 </template>
@@ -30,21 +43,36 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
+import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
+import { analyseWave } from '@/api/common'
+import { getSimpleLine } from '@/api/harmonic-boot/cockpit/cockpit'
+
 const dialogVisible: any = ref(false)
-const harmonicRatio‌Ref: any = ref(null)
+const waveFormAnalysisRef: any = ref(null)
-const options = [
+// 波形
-    {
+const isWaveCharts = ref(false)
-        value: '35kV进线',
+const loading = ref(false)
-        label: '35kV进线'
+const wp = ref({})
+const boxoList: any = ref({})
+
+const tableHeaderRef = ref()
+
+const options = ref()
+const heightRef = ref(mainHeight(168, 2.1).height)
+const selectChange = (flag: boolean, h: any) => {
+    heightRef.value = mainHeight(h, 2.1).height
 }
-]
+
-const height = mainHeight(0, 2).height as any
+const getSimpleLineList = async () => {
+    const res = await getSimpleLine()
+    options.value = res.data
+}
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-harmonic-boot/event/pageEvent',
     method: 'POST',
-    publicHeight: 30,
+    showPage: true,
-    showPage: false,
+    exportName: '暂态事件详情',
-    exportName: '主要监测点列表',
     column: [
         {
             field: 'index',
@@ -56,75 +84,141 @@ const tableStore: any = new TableStore({
         },
         {
             title: '暂态时间',
-            field: 'time',
+            field: 'startTime',
+            minWidth: '180'
         },
         {
             title: '测点名称',
-            field: 'name',
+            field: 'lineName',
-            width: '150'
+            minWidth: '150'
         },
         {
             title: '暂态类型',
-            field: 'flicker',
+            field: 'tag',
-            width: '100',
+            minWidth: '100'
         },
         {
             title: '特征幅值(%)',
-            field: 'flicker',
+            field: 'amplitude',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '暂降深度(%)',
-            field: 'flicker',
+            field: 'depth',
-            width: '100'
+            minWidth: '100',
+            formatter: (row: any) => {
+                // 当暂态类型不是电压暂升时，计算暂降深度 = 100 - 特征幅值
+                if (row.row.tag !== '电压暂升') {
+                    const amplitude = parseFloat(row.row.amplitude)
+                    if (!isNaN(amplitude)) {
+                        return 100 - amplitude
+                    }
+                    return '-'
+                } else {
+                    // 电压暂升时不显示暂降深度
+                    return '/'
+                }
+            }
         },
         {
             title: '持续时间(S)',
-            field: 'flicker',
+            field: 'persistTime',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '严重度',
-            field: 'flicker',
+            field: 'severity',
-            width: '80'
+            minWidth: '80'
-        },
-    ],
-    beforeSearchFun: () => {},
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                time: '2024-01-01 00:00:00',
-                name: '35kV进线',
-                flicker: '0'
         },
         {
-                time: '2024-01-01 00:00:00',
+            title: '波形',
-                name: '35kV进线',
+            width: '100',
-                flicker: '0'
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    text: '波形分析',
+                    type: 'primary',
+                    icon: 'el-icon-DataLine',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.wavePath
+                    },
+
+                    click: async row => {
+                        row.loading1 = true
+                        loading.value = true
+                        isWaveCharts.value = true
+                        dialogVisible.value = false
+                        // 在打开弹窗时立即设置高度
+                        nextTick(() => {
+                            if (waveFormAnalysisRef.value) {
+                                // waveFormAnalysisRef.value.setHeight(false, 360)
+                                waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
+                            }
+                        })
+                        await analyseWave(row.id)
+                            .then(res => {
+                                row.loading1 = false
+                                if (res != undefined) {
+                                    boxoList.value = row
+                                    // boxoList.value = {
+                                    //     ...row,
+                                    //     duration: row.persistTime // 将 persistTime 值赋给 duration
+                                    // }
+                                    boxoList.value.featureAmplitude =
+                                        row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
+                                    boxoList.value.systemType = 'YPT'
+                                    wp.value = res.data
+                                }
+                                loading.value = false
+                            })
+                            .catch(() => {
+                                row.loading1 = false
+                                loading.value = false
+                            })
+
+                        nextTick(() => {
+                            waveFormAnalysisRef.value &&
+                                waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
+                        })
+                    }
                 },
                 {
-                time: '2024-01-01 00:00:00',
+                    name: 'edit',
-                name: '35kV进线',
+                    text: '暂无波形',
-                flicker: '0'
+                    type: 'info',
+                    icon: 'el-icon-DataLine',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !!row.wavePath
+                    }
                 }
             ]
         }
+    ],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
 })
 
-tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
-const open = async (row: any) => {
+const open = async (time: any) => {
     dialogVisible.value = true
+    getSimpleLineList()
+    tableStore.table.params.lineId = ''
+    nextTick(() => {
+        tableHeaderRef.value.setInterval(5)
+        tableHeaderRef.value.setTimeInterval([time, time])
+        tableStore.table.params.searchBeginTime = time
+        tableStore.table.params.searchEndTime = time
         tableStore.index()
+    })
 }
 
-// 点击行
+const handleHideCharts = () => {
-const cellClickEvent = ({ row, column }: any) => {
+    isWaveCharts.value = false
-    if (column.field != 'name') {
+    dialogVisible.value = true
-        harmonicRatio‌Ref.value.openDialog(row)
 }
-}
-
 
 defineExpose({ open })
 </script>

src/components/cockpit/transientDetails/index.vue

@@ -1,41 +1,51 @@
 <template>
     <div>
         <!--暂态事件明细 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+            :timeCacheFlag="false"
+        ></TableHeader>
         <el-calendar
             v-model="value"
             :style="{
                 height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
                 overflow: 'auto'
             }"
+            v-loading="tableStore.table.loading"
         >
             <template #date-cell="{ data }">
-                <div style="height: 100%; padding: 8px" :style="{ background: setBackground(data.day) }">
+                <div
+                    style="padding: 8px"
+                    :style="{
+                        background: setBackground(data.day),
+                        height: `calc((${prop.height} - 100px - ${headerHeight}px + ${fullscreen ? 0 : 56}px) / 5 )`
+                    }"
+                >
                     <p :class="data.isSelected ? 'is-selected' : ''">
                         {{ data.day.split('-').slice(2).join('-') }}
                     </p>
-                    <el-tooltip
+                    <el-tooltip effect="dark" placement="top" :hide-after="0" v-if="hasEventData(data.day)">
-                        effect="dark"
-                        placement="top"
-                        :hide-after="0"
-                        v-if="list?.filter(item => item.time == data.day)[0]?.type || false"
-                    >
                         <template #content>
                             <!-- <span v-html="list?.filter(item => item.time == data.day)[0]?.type || ''"></span> -->
-                            <div v-for="item in list?.filter(item => item.time == data.day)">
+                            <div v-for="item in list?.filter((item:any) => item.name == data.day)">
-                                <div>电压暂降：{{ item.type || '' }}</div>
+                                <div>电压暂降：{{ item.eventDown || 0 }}</div>
-                                <div>电压中断：{{ item.type1 || '' }}</div>
+                                <div>电压中断：{{ item.eventOff || 0 }}</div>
-                                <div>电压暂升：{{ item.type2 || '' }}</div>
+                                <div>电压暂升：{{ item.eventUp || 0 }}</div>
                             </div>
                         </template>
                         <div
                             style="text-decoration: underline"
-                            :style="{ height: `calc(${prop.height} / 5 - 47px)`, overflow: 'auto' }"
+                            class="details"
-                            v-for="item in list?.filter(item => item.time == data.day)"
+                            v-for="item in list?.filter((item:any) => item.name == data.day)"
+                            @click="descentClick(item)"
                         >
-                            <div @click="descentClick">电压暂降:{{ item.type || '' }}</div>
+                            <div>电压暂降:{{ item.eventDown || 0 }}</div>
-                            <div>电压中断:{{ item.type1 || '' }}</div>
+                            <div>电压中断:{{ item.eventOff || 0 }}</div>
-                            <div>电压暂升:{{ item.type2 || '' }}</div>
+                            <div>电压暂升:{{ item.eventUp || 0 }}</div>
                         </div>
                     </el-tooltip>
                 </div>
@@ -46,14 +56,11 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h } from 'vue'
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { dayjs } from 'element-plus'
 import TransientList from './components/transientList.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -66,8 +73,14 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
+const TableHeaderRef = ref()
-const timeCacheStore = useTimeCacheStore()
+
+const hasEventData = (day: string) => {
+    const item = list.value?.find((item: any) => item.name == day)
+    if (!item) return false
+
+    return (item.eventDown || item.eventOff || item.eventUp) > 0
+}
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
@@ -95,53 +108,10 @@ dayjs.en.weekStart = 1 //设置日历的周起始日为星期一
 const value = ref(new Date())
 
 const transientListRef = ref()
-const list = ref([
+const list = ref()
-    {
+
-        time: '2025-10-01',
-        key: 81,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-31',
-        key: 81,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-08',
-        key: 20,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-16',
-        key: 20,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-23',
-        key: 20,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-04',
-        key: 0
-    },
-    {
-        time: '2025-10-05',
-        key: 0
-    }
-])
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/getEventDate',
     method: 'POST',
 
     showPage: false,
@@ -149,21 +119,24 @@ const tableStore: any = new TableStore({
     column: [],
 
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
+        if (!fullscreen.value && prop.timeValue && Array.isArray(prop.timeValue)) {
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
     },
 
     loadCallback: () => {
-        tableStore.table.data = []
+        value.value = tableStore.table.params.searchBeginTime
+        list.value = tableStore.table.data
     }
 })
 
 const setBackground = (value: string) => {
     let data = []
-    data = list.value?.filter(item => item.time == value)
+    data = list.value?.filter((item: any) => item.name == value)
 
     if (data && data?.length > 0) {
-        if (data[0].key > 0) {
+        if (data[0].eventDown > 0 || data[0].eventOff > 0 || data[0].eventUp > 0) {
             return '#Ff660090'
         }
     }
@@ -174,8 +147,16 @@ const setBackground = (value: string) => {
 provide('tableStore', tableStore)
 
 onMounted(() => {
+    nextTick(() => {
+        if (TableHeaderRef.value && typeof TableHeaderRef.value.setDatePicker === 'function') {
+            TableHeaderRef.value.setDatePicker([{ label: '月份', value: 3 }])
+        }
+        if (fullscreen.value) {
+            TableHeaderRef.value.setInterval(3)
+        }
         tableStore.index()
     })
+})
 watch(
     () => prop.timeKey,
     val => {
@@ -184,40 +165,49 @@ watch(
 )
 watch(
     () => prop.timeValue,
-    (newVal, oldVal) => {
+    // (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
+    //     // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
+    //     if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
+    //         tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
+    //         tableStore.table.params.searchEndTime = newVal[1]
+    //         tableStore.index()
+    //     }
+    // },
+    val => {
         tableStore.index()
-        }
     },
+
     {
         deep: true
     }
 )
 
 // 电压暂降点击事件
-const descentClick = () => {
+const descentClick = (item:any) => {
-    transientListRef.value.open()
+    transientListRef.value.open(item.name)
 }
 </script>
 <style lang="scss" scoped>
 :deep(.el-calendar) {
-    .el-calendar__header {
+    .el-calendar__button-group {
         display: none;
     }
     .el-calendar__body {
         padding: 0px !important;
-        height: 100%;
+        height: calc(100% - 46px);
         .el-calendar-table {
             height: 100%;
         }
     }
     .el-calendar-day {
+        // height: calc(912px / 5 );
         height: 100%;
         padding: 0px;
         overflow: hidden;
+        .details {
+            height: calc(100% - 20px);
+            overflow-y: auto;
+        }
     }
     .el-calendar-table__row {
         .next {

src/components/cockpit/transientDistribution/index.vue

@@ -24,11 +24,8 @@
 import { ref, onMounted, provide, reactive, watch } from 'vue'
 import TableStore from '@/utils/tableStore'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { useConfig } from '@/stores/config'
 import TableHeader from '@/components/table/header/index.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -41,9 +38,6 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
-
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -68,48 +62,195 @@ const fullscreen = computed(() => {
 
 const config = useConfig()
 
-const echartList = ref({
+const echartList = ref({})
-    options: {
-        xAxis: null,
-        yAxis: null,
-        dataZoom: null,
-        backgroundColor: '#fff',
-        tooltip: {
-            // trigger: 'axis'
-            textStyle: {
-                color: '#fff',
-                fontStyle: 'normal',
-                opacity: 0.35,
-                fontSize: 14
-            },
-            backgroundColor: 'rgba(0,0,0,0.55)',
-            borderWidth: 0,
-            formatter: function (params: any) {
-                console.log(params)
-                var tips = ''
-                for (var i = 0; i < params.length; i++) {
-                    tips += params[i].name + '</br/>'
-                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
-                }
-                return tips
-            }
-        },
-        title: {
-            text: '暂态事件概率分布',
-            x: 'center'
-        },
 
-        visualMap: {
+const echartList1 = ref({})
-            max: 20,
+
-            show: false,
+// const echartList1 = ref({
-            inRange: {
+//     title: {
-                color: ['#313695', '#00BB00', '#ff8000', '#a50026']
+//         text: '越限时间概率分布'
+//     },
+
+//     xAxis: {
+//         // name: '时间',
+//         // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+//         type: 'time',
+//         axisLabel: {
+//             formatter: {
+//                 day: '{MM}-{dd}',
+//                 month: '{MM}',
+//                 year: '{yyyy}'
+//             }
+//         }
+//     },
+
+//     yAxis: {
+//         name: '次' // 给X轴加单位
+//     },
+//     grid: {
+//         left: '10px',
+//         right: '20px'
+//     },
+//     options: {
+//         series: [
+//             {
+//                 type: 'line',
+//                 showSymbol: false,
+//                 // smooth: true,
+//                 name: '电压中断',
+//                 color: '#FF9100',
+//                 data: [
+//                     ['2025-10-16 07:00:00', 10],
+//                     ['2025-10-16 07:15:00', 10],
+//                     ['2025-10-16 07:30:00', 10],
+//                     ['2025-10-16 07:45:00', 10],
+//                     ['2025-10-16 08:00:00', 30],
+//                     ['2025-10-16 08:15:00', 50],
+//                     ['2025-10-16 08:30:00', 60],
+//                     ['2025-10-16 08:45:00', 70],
+//                     ['2025-10-16 09:00:00', 100],
+//                     ['2025-10-16 09:15:00', 120],
+//                     ['2025-10-16 09:30:00', 130],
+//                     ['2025-10-16 09:45:00', 140],
+//                     ['2025-10-16 10:00:00', 160],
+//                     ['2025-10-16 10:15:00', 160],
+//                     ['2025-10-16 10:30:00', 130],
+//                     ['2025-10-16 10:45:00', 120],
+//                     ['2025-10-16 11:00:00', 140],
+//                     ['2025-10-16 11:15:00', 80],
+//                     ['2025-10-16 11:30:00', 70],
+//                     ['2025-10-16 11:45:00', 90],
+//                     ['2025-10-16 12:00:00', 60],
+//                     ['2025-10-16 12:15:00', 60],
+//                     ['2025-10-16 12:30:00', 60],
+//                     ['2025-10-16 12:45:00', 60]
+//                 ]
+//             },
+//             {
+//                 type: 'line',
+//                 showSymbol: false,
+//                 // smooth: true,
+//                 color: '#FFBF00',
+//                 name: '电压暂降',
+//                 data: [
+//                     ['2025-10-16 07:00:00', 1],
+//                     ['2025-10-16 07:15:00', 1],
+//                     ['2025-10-16 07:30:00', 1],
+//                     ['2025-10-16 07:45:00', 1],
+//                     ['2025-10-16 08:00:00', 3],
+//                     ['2025-10-16 08:15:00', 5],
+//                     ['2025-10-16 08:30:00', 6],
+//                     ['2025-10-16 08:45:00', 7],
+//                     ['2025-10-16 09:00:00', 10],
+//                     ['2025-10-16 09:15:00', 12],
+//                     ['2025-10-16 09:30:00', 13],
+//                     ['2025-10-16 09:45:00', 14],
+//                     ['2025-10-16 10:00:00', 16],
+//                     ['2025-10-16 10:15:00', 16],
+//                     ['2025-10-16 10:30:00', 13],
+//                     ['2025-10-16 10:45:00', 12],
+//                     ['2025-10-16 11:00:00', 14],
+//                     ['2025-10-16 11:15:00', 8],
+//                     ['2025-10-16 11:30:00', 7],
+//                     ['2025-10-16 11:45:00', 9],
+//                     ['2025-10-16 12:00:00', 6],
+//                     ['2025-10-16 12:15:00', 6],
+//                     ['2025-10-16 12:30:00', 6],
+//                     ['2025-10-16 12:45:00', 6]
+//                 ]
+//             },
+//             {
+//                 type: 'line',
+//                 showSymbol: false,
+//                 // smooth: true,
+//                 name: '电压暂升',
+//                 color: config.layout.elementUiPrimary[0],
+//                 data: [
+//                     ['2025-10-16 07:00:00', 19],
+//                     ['2025-10-16 07:15:00', 19],
+//                     ['2025-10-16 07:30:00', 19],
+//                     ['2025-10-16 07:45:00', 19],
+//                     ['2025-10-16 08:00:00', 39],
+//                     ['2025-10-16 08:15:00', 59],
+//                     ['2025-10-16 08:30:00', 69],
+//                     ['2025-10-16 08:45:00', 79],
+//                     ['2025-10-16 09:00:00', 109],
+//                     ['2025-10-16 09:15:00', 129],
+//                     ['2025-10-16 09:30:00', 139],
+//                     ['2025-10-16 09:45:00', 149],
+//                     ['2025-10-16 10:00:00', 169],
+//                     ['2025-10-16 10:15:00', 169],
+//                     ['2025-10-16 10:30:00', 139],
+//                     ['2025-10-16 10:45:00', 129],
+//                     ['2025-10-16 11:00:00', 149],
+//                     ['2025-10-16 11:15:00', 89],
+//                     ['2025-10-16 11:30:00', 79],
+//                     ['2025-10-16 11:45:00', 99],
+//                     ['2025-10-16 12:00:00', 69],
+//                     ['2025-10-16 12:15:00', 69],
+//                     ['2025-10-16 12:30:00', 69],
+//                     ['2025-10-16 12:45:00', 69]
+//                 ]
+//             }
+//         ]
+//     }
+// })
+const processDataForChart = (rawData: any[]) => {
+    // 将后端返回的扁平数据转换为 ECharts 需要的三维坐标格式 [x, y, z]
+    const chartData = rawData.map(item => [item.x, item.y, item.z])
+
+    return chartData
 }
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/csevent/getEventCoords',
+    method: 'POST',
+    showPage: false,
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
+        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
     },
-        xAxis3D: {
+    loadCallback: () => {
-            type: 'category',
+        const processedData = processDataForChart(tableStore.table.data.innerList || [])
-            name: '特征幅值',
+        const trendList = tableStore.table.data.trendList || []
-            data: [
+        const xlist = tableStore.table.data.xlist || []
+
+        // 处理趋势图数据
+        const seriesData = trendList.map((item: any) => {
+            // 根据接口返回的name字段确定系列名称和颜色
+            let name = ''
+            let color = ''
+
+            switch (item.name) {
+                case 'Evt_Sys_DipStr':
+                    name = '电压暂降'
+                    color = '#FFBF00'
+                    break
+                case 'Evt_Sys_IntrStr':
+                    name = '电压中断'
+                    color = '#FF9100'
+                    break
+                case 'Evt_Sys_SwlStr':
+                    name = '电压暂升'
+                    color = config.layout.elementUiPrimary[0]
+                    break
+                default:
+                    name = item.name
+                    color = '#000000'
+            }
+
+            return {
+                name: name,
+                type: 'line',
+                showSymbol: false,
+                color: color,
+                data: item.trendList?.map((value: number, index: number) => [xlist[index], value]) || []
+            }
+        })
+
+        // 获取x轴和y轴的标签值
+        const xLabels = [
             '0-10%',
             '10%-20%',
             '20%-30%',
@@ -120,7 +261,47 @@ const echartList = ref({
             '70%-80%',
             '80%-90%',
             '90%-100%'
-            ],
+        ]
+        const yLabels = ['0-0.01s', '0.01s-0.1s', '0.1s-1s', '1s-10s', '10s']
+
+        echartList.value = {
+            options: {
+                xAxis: null,
+                yAxis: null,
+                dataZoom: null,
+                backgroundColor: '#fff',
+                tooltip: {
+                    textStyle: {
+                        color: '#fff',
+                        fontStyle: 'normal',
+                        opacity: 0.35,
+                        fontSize: 14
+                    },
+                    backgroundColor: 'rgba(0,0,0,0.55)',
+                    borderWidth: 0,
+                    formatter: function (params: any) {
+                        var tips = ''
+                        tips += '持续时间: ' + yLabels[params.value[1]] + '</br>'
+                        tips += '特征幅值: ' + xLabels[params.value[0]] + '</br>'
+                        tips += '事件次数: ' + params.value[2] + '</br>'
+                        return tips
+                    }
+                },
+                title: {
+                    text: '暂态事件概率分布',
+                    x: 'center'
+                },
+                visualMap: {
+                    max: 500,
+                    show: false,
+                    inRange: {
+                        color: ['#313695', '#00BB00', '#ff8000', '#a50026']
+                    }
+                },
+                xAxis3D: {
+                    type: 'category',
+                    name: '特征幅值',
+                    data: xLabels,
                     axisLine: {
                         lineStyle: {
                             color: '#111'
@@ -133,7 +314,7 @@ const echartList = ref({
                 yAxis3D: {
                     type: 'category',
                     name: '持续时间',
-            data: ['0-0.01s', '0.01s-0.1s', '0.1s-1s', '1s-10s', '10s'],
+                    data: yLabels,
                     nameTextStyle: {
                         color: '#111'
                     },
@@ -148,7 +329,6 @@ const echartList = ref({
                     },
                     splitLine: {
                         lineStyle: {
-                    // 使用深浅的间隔色
                             color: ['#111'],
                             type: 'dashed',
                             opacity: 0.5
@@ -180,11 +360,7 @@ const echartList = ref({
                 series: [
                     {
                         type: 'bar3D',
-                data: [
+                        data: processedData,
-                    [0, 0, 1],
-                    [0, 1, 1],
-                    [0.2, 1]
-                ],
                         shading: 'realistic',
                         label: {
                             show: false,
@@ -193,7 +369,6 @@ const echartList = ref({
                                 borderWidth: 1
                             }
                         },
-
                         itemStyle: {
                             opacity: 1
                         },
@@ -211,147 +386,28 @@ const echartList = ref({
                     }
                 ]
             }
-})
+        }
-const echartList1 = ref({
+
+        echartList1.value = {
             title: {
                 text: '越限时间概率分布'
             },
-
             xAxis: {
-        // name: '时间',
+                type: 'category',
-        // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+                data: xlist,
-        type: 'time',
                 axisLabel: {
-            formatter: {
+                    formatter: '{value}'
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
-            }
                 }
             },
-
             yAxis: {
-        name: '次' // 给X轴加单位
+                name: '次'
             },
             grid: {
                 left: '10px',
                 right: '20px'
             },
-    options: {
+            series: seriesData
-        series: [
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                name: '电压中断',
-                color: '#FF9100',
-                data: [
-                    ['2025-10-16 07:00:00', 10],
-                    ['2025-10-16 07:15:00', 10],
-                    ['2025-10-16 07:30:00', 10],
-                    ['2025-10-16 07:45:00', 10],
-                    ['2025-10-16 08:00:00', 30],
-                    ['2025-10-16 08:15:00', 50],
-                    ['2025-10-16 08:30:00', 60],
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
-                ]
-            },
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                color: '#FFBF00',
-                name: '电压暂降',
-                data: [
-                    ['2025-10-16 07:00:00', 1],
-                    ['2025-10-16 07:15:00', 1],
-                    ['2025-10-16 07:30:00', 1],
-                    ['2025-10-16 07:45:00', 1],
-                    ['2025-10-16 08:00:00', 3],
-                    ['2025-10-16 08:15:00', 5],
-                    ['2025-10-16 08:30:00', 6],
-                    ['2025-10-16 08:45:00', 7],
-                    ['2025-10-16 09:00:00', 10],
-                    ['2025-10-16 09:15:00', 12],
-                    ['2025-10-16 09:30:00', 13],
-                    ['2025-10-16 09:45:00', 14],
-                    ['2025-10-16 10:00:00', 16],
-                    ['2025-10-16 10:15:00', 16],
-                    ['2025-10-16 10:30:00', 13],
-                    ['2025-10-16 10:45:00', 12],
-                    ['2025-10-16 11:00:00', 14],
-                    ['2025-10-16 11:15:00', 8],
-                    ['2025-10-16 11:30:00', 7],
-                    ['2025-10-16 11:45:00', 9],
-                    ['2025-10-16 12:00:00', 6],
-                    ['2025-10-16 12:15:00', 6],
-                    ['2025-10-16 12:30:00', 6],
-                    ['2025-10-16 12:45:00', 6]
-                ]
-            },
-            {
-                type: 'line',
-                showSymbol: false,
-                // smooth: true,
-                name: '电压暂升',
-                color: config.layout.elementUiPrimary[0],
-                data: [
-                    ['2025-10-16 07:00:00', 19],
-                    ['2025-10-16 07:15:00', 19],
-                    ['2025-10-16 07:30:00', 19],
-                    ['2025-10-16 07:45:00', 19],
-                    ['2025-10-16 08:00:00', 39],
-                    ['2025-10-16 08:15:00', 59],
-                    ['2025-10-16 08:30:00', 69],
-                    ['2025-10-16 08:45:00', 79],
-                    ['2025-10-16 09:00:00', 109],
-                    ['2025-10-16 09:15:00', 129],
-                    ['2025-10-16 09:30:00', 139],
-                    ['2025-10-16 09:45:00', 149],
-                    ['2025-10-16 10:00:00', 169],
-                    ['2025-10-16 10:15:00', 169],
-                    ['2025-10-16 10:30:00', 139],
-                    ['2025-10-16 10:45:00', 129],
-                    ['2025-10-16 11:00:00', 149],
-                    ['2025-10-16 11:15:00', 89],
-                    ['2025-10-16 11:30:00', 79],
-                    ['2025-10-16 11:45:00', 99],
-                    ['2025-10-16 12:00:00', 69],
-                    ['2025-10-16 12:15:00', 69],
-                    ['2025-10-16 12:30:00', 69],
-                    ['2025-10-16 12:45:00', 69]
-                ]
         }
-        ]
-    }
-})
-const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
-    method: 'POST',
-    showPage: false,
-    column: [],
-    beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
-    },
-    loadCallback: () => {
-        tableStore.table.data = []
     }
 })
 

src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue

@@ -2,14 +2,10 @@
     <div>
         <!-- 暂态事件详情 -->
         <el-dialog draggable title="暂态事件详情 " v-model="dialogVisible" append-to-body width="70%">
-            <TableHeader datePicker showExport :showReset="false">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
                 <template v-slot:select>
-                    <el-form-item label="监测点名称">
+                    <el-form-item label="监测点">
-                        <el-select
+                        <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
-                            v-model="tableStore.table.params.searchValue"
-                            placeholder="请选择监测点名称"
-                            style="width: 240px"
-                        >
                             <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -20,15 +16,22 @@
                     </el-form-item>
                 </template>
             </TableHeader>
-            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+            <Table ref="tableRef" isGroup :height="heightRef"></Table>
         </el-dialog>
         <!-- 查看波形 -->
-        <el-dialog v-model="isWaveCharts" draggable title="瞬时/RMS波形" append-to-body width="70%">
+        <el-dialog
+            v-model="isWaveCharts"
+            draggable
+            title="波形分析"
+            append-to-body
+            width="70%"
+            @close="handleHideCharts"
+        >
             <waveFormAnalysis
                 v-loading="loading"
                 v-if="isWaveCharts"
                 ref="waveFormAnalysisRef"
-                @handleHideCharts="isWaveCharts = false"
+                @handleHideCharts="handleHideCharts"
                 :wp="wp"
             />
         </el-dialog>
@@ -42,6 +45,8 @@ import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
 import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
 import { analyseWave } from '@/api/common'
+import { getSimpleLine } from '@/api/harmonic-boot/cockpit/cockpit'
+
 const dialogVisible: any = ref(false)
 const waveFormAnalysisRef: any = ref(null)
 // 波形
@@ -50,18 +55,24 @@ const loading = ref(false)
 const wp = ref({})
 const boxoList: any = ref({})
 
-const options = [
+const tableHeaderRef = ref()
-    {
+
-        value: '35kV进线',
+const options = ref()
-        label: '35kV进线'
+const heightRef = ref(mainHeight(168, 2.1).height)
+const selectChange = (flag: boolean, h: any) => {
+    heightRef.value = mainHeight(h, 2.1).height
 }
-]
+
-const height = mainHeight(0, 2).height as any
+const getSimpleLineList = async () => {
+    const res = await getSimpleLine()
+    options.value = res.data
+}
+
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-harmonic-boot/event/pageEvent',
     method: 'POST',
-    publicHeight: 30,
+    showPage: true,
-    showPage: false,
     exportName: '主要监测点列表',
     column: [
         {
@@ -74,36 +85,50 @@ const tableStore: any = new TableStore({
         },
         {
             title: '暂态时间',
-            field: 'time'
+            field: 'startTime',
+            minWidth: '150'
         },
         {
             title: '测点名称',
-            field: 'name',
+            field: 'lineName',
             width: '150'
         },
         {
             title: '暂态类型',
-            field: 'flicker',
+            field: 'tag',
             width: '100'
         },
         {
             title: '特征幅值(%)',
-            field: 'flicker',
+            field: 'amplitude',
             width: '100'
         },
         {
             title: '暂降深度(%)',
-            field: 'flicker',
+            field: 'depth',
-            width: '100'
+            width: '100',
+            formatter: (row: any) => {
+                // 当暂态类型不是电压暂升时，计算暂降深度 = 100 - 特征幅值
+                if (row.row.tag !== '电压暂升') {
+                    const amplitude = parseFloat(row.row.amplitude)
+                    if (!isNaN(amplitude)) {
+                        return 100 - amplitude
+                    }
+                    return '-'
+                } else {
+                    // 电压暂升时不显示暂降深度
+                    return '/'
+                }
+            }
         },
         {
             title: '持续时间(S)',
-            field: 'flicker',
+            field: 'persistTime',
             width: '100'
         },
         {
             title: '严重度',
-            field: 'flicker',
+            field: 'severity',
             width: '80'
         },
         {
@@ -112,27 +137,39 @@ const tableStore: any = new TableStore({
             render: 'buttons',
             buttons: [
                 {
-                    name: 'check',
+                    name: 'edit',
-                    title: '查看波形',
+                    text: '波形分析',
                     type: 'primary',
-                    icon: 'el-icon-EditPen',
+                    icon: 'el-icon-DataLine',
                     render: 'basicButton',
-                    loading: 'loading1',
+                    disabled: row => {
-                    //  disabled: row => {
+                        return !row.wavePath
-                    //     return !row.wavePath
+                    },
-                    // },
+
                     click: async row => {
                         row.loading1 = true
                         loading.value = true
                         isWaveCharts.value = true
+                        dialogVisible.value = false
+                        // 在打开弹窗时立即设置高度
+                        nextTick(() => {
+                            if (waveFormAnalysisRef.value) {
+                                // waveFormAnalysisRef.value.setHeight(false, 360)
+                                waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
+                            }
+                        })
                         await analyseWave(row.id)
                             .then(res => {
                                 row.loading1 = false
                                 if (res != undefined) {
                                     boxoList.value = row
+                                    // boxoList.value = {
+                                    //     ...row,
+                                    //     duration: row.persistTime // 将 persistTime 值赋给 duration
+                                    // }
                                     boxoList.value.featureAmplitude =
                                         row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
-                                    boxoList.value.systemType = 'WX'
+                                    boxoList.value.systemType = 'YPT'
                                     wp.value = res.data
                                 }
                                 loading.value = false
@@ -147,44 +184,40 @@ const tableStore: any = new TableStore({
                                 waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
                         })
                     }
+                },
+                {
+                    name: 'edit',
+                    text: '暂无波形',
+                    type: 'info',
+                    icon: 'el-icon-DataLine',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !(!row.wavePath && row.evtParamTm < 20)
+                    }
                 }
             ]
         }
     ],
     beforeSearchFun: () => {},
-    loadCallback: () => {
+    loadCallback: () => {}
-        tableStore.table.data = [
-            {
-                time: '2024-01-01 00:00:00',
-                name: '35kV进线',
-                flicker: '0'
-            },
-            {
-                time: '2024-01-01 00:00:00',
-                name: '35kV进线',
-                flicker: '0'
-            },
-            {
-                time: '2024-01-01 00:00:00',
-                name: '35kV进线',
-                flicker: '0'
-            }
-        ]
-    }
 })
 
-tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
-const open = async (row: any) => {
+const open = async (row: any, searchBeginTime: any, searchEndTime: any) => {
     dialogVisible.value = true
+    getSimpleLineList()
+    tableStore.table.params.lineId = row.id
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime = searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
         tableStore.index()
+    })
 }
 
-// 点击行
+const handleHideCharts = () => {
-const cellClickEvent = ({ row, column }: any) => {
+    isWaveCharts.value = false
-    if (column.field != 'name') {
+    dialogVisible.value = true
-        isWaveCharts.value = true
-    }
 }
 
 defineExpose({ open })

src/components/cockpit/transientStatistics/index.vue

@@ -24,12 +24,10 @@ import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { useConfig } from '@/stores/config'
 import TransientStatisticsDetail from '@/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useRoute } from 'vue-router'
+import { netEventEcharts } from '@/api/harmonic-boot/cockpit/cockpit'
-import { useTimeCacheStore } from '@/stores/timeCache'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -42,9 +40,6 @@ const prop = defineProps({
 
 const headerHeight = ref(57)
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
-
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -68,23 +63,34 @@ const fullscreen = computed(() => {
 })
 const config = useConfig()
 
-const data = [
+const data = ref()
+
+const echartList = ref()
+
+const eventEcharts = () => {
+    netEventEcharts({
+        searchBeginTime: tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+        searchEndTime: tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+    }).then(res => {
+        // 整理接口数据为图表所需格式
+        const rawData = res.data || {}
+        data.value = [
             {
                 name: '电压中断',
-        value: 4
+                value: rawData.eventOff || 0
             },
             {
                 name: '电压暂降',
-        value: 41
+                value: rawData.eventDown || 0
             },
             {
                 name: '电压暂升',
-        value: 46
+                value: rawData.eventUp || 0
             }
         ]
-const echartList = ref({
-    title: {},
 
+        echartList.value = {
+            title: {},
             tooltip: {
                 trigger: 'item'
             },
@@ -93,7 +99,7 @@ const echartList = ref({
                 top: 'center',
                 right: '5%',
                 formatter: function (e: any) {
-            return e + '   ' + data.filter(item => item.name == e)[0].value + '次'
+                    return e + '   ' + data.value.filter((item: any) => item.name == e)[0].value + '次'
                 }
             },
             xAxis: {
@@ -115,7 +121,7 @@ const echartList = ref({
                         left: 'center'
                     },
                     {
-                text: data[0].value + data[1].value + data[2].value + '次',
+                        text: rawData.eventOff + rawData.eventDown + rawData.eventUp + '次',
                         left: 'center',
                         top: 'center'
                     }
@@ -127,20 +133,21 @@ const echartList = ref({
                         radius: ['50%', '70%'],
                         label: {
                             show: false,
-                    position: 'outside',
+                            position: 'outside'
-                    textStyle: {
-                        //数值样式
-                    }
                         },
                         name: '事件统计',
-                data: data
+                        data: data.value
                     }
                 ]
             }
+        }
     })
+}
+
 const transientStatisticsDetailRef = ref()
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/netEventTable',
     method: 'POST',
 
     showPage: false,
@@ -162,29 +169,32 @@ const tableStore: any = new TableStore({
 
         {
             title: '电压中断(次)',
-            field: 'type',
+            field: 'eventOff',
             minWidth: '70',
+            sortable: true,
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.type}</span>`
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.eventOff}</span>`
             }
         },
         {
             title: '电压暂降(次)',
-            field: 'type1',
+            field: 'eventDown',
             minWidth: '80',
+            sortable: true,
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.type1}</span>`
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.eventDown}</span>`
             }
         },
         {
             title: '电压暂升(次)',
-            field: 'type2',
+            field: 'eventUp',
             minWidth: '80',
+            sortable: true,
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.type2}</span>`
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.eventUp}</span>`
             }
         }
     ],
@@ -193,32 +203,7 @@ const tableStore: any = new TableStore({
         tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
+        eventEcharts()
-            {
-                name: '35kV1进线',
-                type: '2',
-                type1: '38',
-                type2: '35'
-            },
-            {
-                name: '35kV1变压器',
-                type: '2',
-                type1: '1',
-                type2: '3'
-            },
-            {
-                name: '35kV1母线',
-                type: '0',
-                type1: '1',
-                type2: '4'
-            },
-            {
-                name: '35kV2母线',
-                type: '0',
-                type1: '1',
-                type2: '4'
-            }
-        ]
     }
 })
 
@@ -230,7 +215,11 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        transientStatisticsDetailRef.value.open(row)
+        transientStatisticsDetailRef.value.open(
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
     }
 }
 
@@ -259,7 +248,5 @@ watch(
         deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/trendComparison/index.vue

@@ -1,56 +1,67 @@
 <template>
     <div>
         <!--趋势对比 -->
-        <TableHeader :showReset="false" datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader datePicker :showReset="false" @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
-                <el-form-item label="监测点名称">
+                <el-form-item label="监测对象">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
-                        v-model="tableStore.table.params.power"
+                        <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
-                        placeholder="请选择监测点名称"
-                        clearable
-                        style="width: 130px"
-                    >
-                        <el-option
-                            v-for="item in powerList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
+                <!-- <el-form-item label="监测点名称">
+                    <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称" clearable>
+                        <el-option
+                            v-for="item in lineIdList"
+                            :key="item.lineId"
+                            :label="item.name"
+                            :value="item.lineId"
+                        />
+                    </el-select>
+                </el-form-item> -->
                 <el-form-item label="电能质量指标">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.indicator" placeholder="请选择电能质量指标" clearable>
-                        v-model="tableStore.table.params.indicator"
+                        <el-option v-for="item in indicatorList" :key="item.id" :label="item.name" :value="item.id" />
-                        placeholder="请选择电能质量指标"
-                        clearable
-                        style="width: 130px"
-                    >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="谐波次数">
+                <el-form-item>
+                    <el-radio-group v-model="tableStore.table.params.dataLevel">
+                        <el-radio-button label="一次值" value="Primary" />
+                        <el-radio-button label="二次值" value="Secondary" />
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="统计类型">
                     <el-select
-                        v-model="tableStore.table.params.exceedingTheLimit"
+                        style="min-width: 120px !important"
+                        placeholder="请选择"
+                        v-model="tableStore.table.params.valueType"
+                    >
+                        <el-option value="max" label="最大值"></el-option>
+                        <el-option value="min" label="最小值"></el-option>
+                        <el-option value="avg" label="平均值"></el-option>
+                        <el-option value="cp95" label="cp95"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <div v-if="shouldShowHarmonicCount()" style="display: flex; color: var(--el-text-color-regular)">
+                        <span style="width: 160px">{{ getHarmonicTypeName() }}谐波次数</span>
+                        <el-select
+                            v-model="tableStore.table.params.harmonicCount"
                             placeholder="请选择谐波次数"
-                        clearable
+                            style="min-width: 80px !important"
-                        style="width: 90px"
                         >
                             <el-option
-                            v-for="item in exceedingTheLimitList"
+                                v-for="num in harmonicCountOptions"
-                            :key="item.value"
+                                :key="num"
-                            :label="item.label"
+                                :label="num"
-                            :value="item.value"
+                                :value="num"
-                        />
+                            ></el-option>
                         </el-select>
+                    </div>
                 </el-form-item>
             </template>
         </TableHeader>
         <my-echart
+            v-loading="tableStore.table.loading"
             class="tall"
             :options="echartList"
             :style="{
@@ -61,17 +72,16 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h, computed } from 'vue'
+import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
+
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
@@ -84,16 +94,9 @@ const prop = defineProps({
 const route = useRoute()
 const timeCacheStore = useTimeCacheStore()
 const config = useConfig()
-const powerList: any = ref([
+
-    {
+const lineIdList = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
-        label: '1#变压器',
+
-        value: '1'
-    },
-    {
-        label: '2#变压器',
-        value: '2'
-    }
-])
 // 计算是否全屏展示
 const fullscreen = computed(() => {
     const w = Number(prop.w)
@@ -105,47 +108,194 @@ const fullscreen = computed(() => {
         return false
     }
 })
-const exceedingTheLimitList: any = ref([
+// 添加谐波次数选项（2-50）
-    {
+const harmonicCountOptions = ref(Array.from({ length: 49 }, (_, i) => i + 2))
-        label: '2次',
-        value: '2'
-    },
-    {
-        label: '3次',
-        value: '3'
-    },
-    {
-        label: '4次',
-        value: '4'
-    },
-    {
-        label: '5次',
-        value: '5'
-    }
-])
-const indicatorList: any = ref([
-    {
-        label: '谐波电压总畸变率',
-        value: '1'
-    },
-    {
-        label: '各次谐波电压',
-        value: '2'
-    },
-    {
-        label: '各次谐波电压',
-        value: '3'
-    },
-    {
-        label: '三相电压不平衡',
-        value: '4'
-    }
-])
-const echartList = ref({
-    title: {
-        text: '趋势对比'
-    },
 
+const indicatorList = ref()
+
+const echartList = ref()
+
+const headerHeight = ref(57)
+
+// 监测对象
+const idList = ref()
+
+// 监测对象
+const initListByIds = () => {
+    getListByIds({}).then((res: any) => {
+        if (res.data.length > 0) {
+            idList.value = res.data
+            initCode()
+        }
+    })
+}
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+
+    if (datePickerValue && datePickerValue.timeValue) {
+        // 更新时间参数
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    }
+}
+
+const initCode = () => {
+    queryByCode('steady_state_limit_trend').then(res => {
+        queryCsDictTree(res.data.id).then(item => {
+            indicatorList.value = item.data
+            tableStore.table.params.indicator = indicatorList.value[0].id
+            nextTick(() => {
+                tableStore.index()
+            })
+        })
+    })
+}
+// 治理前
+const chartsListBefore = ref()
+// 治理后
+const chartsListAfter = ref()
+
+const setEchart = () => {
+    // 从接口数据中提取治理前和治理后的数据
+    const beforeData = chartsListBefore.value || []
+    const afterData = chartsListAfter.value || []
+
+    // 按相位分组数据
+    const beforeGroupedByPhase: any = {}
+    const afterGroupedByPhase: any = {}
+
+    // 处理治理前数据
+    beforeData.forEach((item: any) => {
+        const phase = item.phase || 'default'
+        if (!beforeGroupedByPhase[phase]) {
+            beforeGroupedByPhase[phase] = []
+        }
+        beforeGroupedByPhase[phase].push([item.time, item.statisticalData])
+    })
+
+    // 处理治理后数据
+    afterData.forEach((item: any) => {
+        const phase = item.phase || 'default'
+        if (!afterGroupedByPhase[phase]) {
+            afterGroupedByPhase[phase] = []
+        }
+        afterGroupedByPhase[phase].push([item.time, item.statisticalData])
+    })
+
+    // 构建系列数据
+    const series: any = []
+
+    // 定义相位颜色
+    const phaseColors: any = {
+        A: '#DAA520',
+        B: '#2E8B57',
+        C: '#A52a2a'
+    }
+
+    // 添加治理前数据系列（实线）
+    Object.keys(beforeGroupedByPhase).forEach(phase => {
+        const phaseName = phase === 'default' ? '' : `${phase}相`
+        const color = phaseColors[phase] || config.layout.elementUiPrimary[0]
+
+        series.push({
+            name: `治理前${phaseName}`,
+            type: 'line',
+            showSymbol: false,
+            smooth: true,
+            symbol: 'none',
+            data: beforeGroupedByPhase[phase],
+            itemStyle: {
+                normal: {
+                    color: color
+                }
+            },
+            lineStyle: {
+                type: 'solid', // 实线
+                width: 2 // 线条宽度
+            },
+            yAxisIndex: 0
+        })
+    })
+
+    // 添加治理后数据系列（虚线）
+    Object.keys(afterGroupedByPhase).forEach(phase => {
+        const phaseName = phase === 'default' ? '' : `${phase}相`
+        const color = phaseColors[phase] || config.layout.elementUiPrimary[0]
+
+        series.push({
+            name: `治理后${phaseName}`,
+            type: 'line',
+            showSymbol: false,
+            smooth: true,
+            symbol: 'none',
+            data: afterGroupedByPhase[phase],
+            itemStyle: {
+                normal: {
+                    color:color
+                }
+            },
+            lineStyle: {
+                type: 'dashed', // 虚线
+                width: 2 // 线条宽度
+            },
+            yAxisIndex: 0
+        })
+    })
+
+    // 获取指标名称用于图表标题
+    let titleText = '治理前后对比'
+    if (beforeData.length > 0 && beforeData[0].anotherName) {
+        titleText = beforeData[0].anotherName
+    } else if (afterData.length > 0 && afterData[0].anotherName) {
+        titleText = afterData[0].anotherName
+    }
+
+    // 构建图例数据
+    const legendData = series.map((item: any, index: number) => {
+        let color = config.layout.elementUiPrimary[0]
+        const name = item.name
+        if (name.includes('A相')) {
+            color = '#DAA520'
+        } else if (name.includes('B相')) {
+            color = '#2E8B57'
+        } else if (name.includes('C相')) {
+            color = '#A52a2a'
+        }
+
+        // 判断是治理前还是治理后，设置不同的线条样式
+        const isBefore = name.includes('治理前')
+
+        return {
+            name: item.name,
+            icon: isBefore
+                ? 'rect'
+                : 'path://M0,2 L8,2 L8,6 L0,6 Z M12,2 L20,2 L20,6 L12,6 Z M24,2 L32,2 L32,6 L24,6 Z M36,2 L44,2 L44,6 L36,6 Z', // 矩形组成的粗虚线
+            itemStyle: {
+                color: color // 明确指定图例图标的颜色
+            },
+            lineStyle: {
+                type: isBefore ? 'solid' : 'dashed', // 治理前实线，治理后虚线
+                width: 2
+            }
+        }
+    })
+
+    echartList.value = {
+        title: {
+            text: titleText
+        },
+        legend: {
+            data: legendData,
+            icon: 'rect',
+            itemWidth: 18,
+            itemHeight: 3,
+            itemStyle: {
+                borderWidth: 0
+            },
+            lineStyle: {
+                width: 2 // 确保图例线条宽度与系列线条宽度一致
+            }
+        },
         xAxis: {
             type: 'time',
             axisLabel: {
@@ -156,130 +306,96 @@ const echartList = ref({
                 }
             }
         },
-
+        yAxis: {
-    yAxis: {},
+            name: beforeData.length > 0 ? beforeData[0].unit : afterData.length > 0 ? afterData[0].unit : ''
+        },
         grid: {
             left: '10px',
             right: '20px'
         },
-    options: {
+        series: series
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'line',
-                name: '治理前',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 1],
-                    ['2025-10-16 07:15:00', 1],
-                    ['2025-10-16 07:30:00', 1],
-                    ['2025-10-16 07:45:00', 1],
-                    ['2025-10-16 08:00:00', 3],
-                    ['2025-10-16 08:15:00', 5],
-                    ['2025-10-16 08:30:00', 6],
-                    ['2025-10-16 08:45:00', 7],
-                    ['2025-10-16 09:00:00', 10],
-                    ['2025-10-16 09:15:00', 12],
-                    ['2025-10-16 09:30:00', 13],
-                    ['2025-10-16 09:45:00', 14],
-                    ['2025-10-16 10:00:00', 16],
-                    ['2025-10-16 10:15:00', 16],
-                    ['2025-10-16 10:30:00', 13],
-                    ['2025-10-16 10:45:00', 12],
-                    ['2025-10-16 11:00:00', 14],
-                    ['2025-10-16 11:15:00', 8],
-                    ['2025-10-16 11:30:00', 7],
-                    ['2025-10-16 11:45:00', 9],
-                    ['2025-10-16 12:00:00', 6],
-                    ['2025-10-16 12:15:00', 6],
-                    ['2025-10-16 12:30:00', 6],
-                    ['2025-10-16 12:45:00', 6]
-                ],
-                itemStyle: {
-                    normal: {
-                        //这里是颜色
-                        color: function (params: any) {
-                            if (params.value[1] == 0 || params.value[1] == 3.14159) {
-                                return '#ccc'
-                            } else {
-                                return config.layout.elementUiPrimary[0]
     }
 }
-                    }
-                },
-                yAxisIndex: 0
-            },
-            {
-                name: '治理后',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 10],
-                    ['2025-10-16 07:15:00', 10],
-                    ['2025-10-16 07:30:00', 10],
-                    ['2025-10-16 07:45:00', 10],
-                    ['2025-10-16 08:00:00', 30],
-                    ['2025-10-16 08:15:00', 50],
-                    ['2025-10-16 08:30:00', 60],
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
-                ]
-            }
-        ]
-    }
-})
-const headerHeight = ref(57)
-const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-    headerHeight.value = height
 
-    if (datePickerValue && datePickerValue.timeValue) {
-        // 更新时间参数
-        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
-        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
-    }
-}
 const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-device-boot/csGroup/sensitiveUserTrendData',
     method: 'POST',
-
     showPage: false,
-    exportName: '主要监测点列表',
+    exportName: '趋势对比',
     column: [],
     beforeSearchFun: () => {
         tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
         tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
+            tableStore.table.params.sensitiveUserId = idList.value[0].id
+        }
+        let lists: any = []
+        // 处理电能质量指标
+        const selectedIndicator = indicatorList.value?.find(
+            (item: any) => item.id === tableStore.table.params.indicator
+        )
+        if (selectedIndicator) {
+            let frequencys = ''
+            if (selectedIndicator.name.includes('谐波含有率')) {
+                frequencys = tableStore.table.params.harmonicCount
+            }
+
+            lists.push({
+                statisticalId: tableStore.table.params.indicator,
+                frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : ''
+            })
+        }
+
+        // 将 lists 添加到请求参数中
+        tableStore.table.params.list = lists
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
+        // 数据加载完成后的处理
+        if (tableStore.table.data) {
+            chartsListBefore.value = tableStore.table.data.before
+            chartsListAfter.value = tableStore.table.data.after
+            setEchart()
+        } 
     }
 })
 
-tableStore.table.params.power = '1'
 tableStore.table.params.indicator = '1'
 tableStore.table.params.exceedingTheLimit = '1'
-tableStore.table.params.searchValue = ''
+tableStore.table.params.dataLevel = 'Primary'
+tableStore.table.params.valueType = 'avg'
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
+    initListByIds()
 })
+
+// 判断是否应该显示谐波次数选择框
+const shouldShowHarmonicCount = () => {
+    if (!tableStore.table.params.indicator || !indicatorList.value) return false
+
+    const currentIndicator = indicatorList.value.find((item: any) => item.id === tableStore.table.params.indicator)
+
+    return (
+        currentIndicator &&
+        (currentIndicator.name.includes('电压谐波含有率') || currentIndicator.name.includes('电流谐波含有率'))
+    )
+}
+
+// 获取谐波类型名称
+const getHarmonicTypeName = () => {
+    const currentIndicator = indicatorList.value.find((item: any) => item.id === tableStore.table.params.indicator)
+
+    if (currentIndicator) {
+        if (currentIndicator.name.includes('电压谐波含有率')) {
+            return '电压'
+        } else if (currentIndicator.name.includes('电流谐波含有率')) {
+            return '电流'
+        }
+    }
+    return ''
+}
+
 watch(
     () => prop.timeKey,
     val => {
@@ -301,10 +417,26 @@ watch(
     }
 )
 
+// 监听指标变化，当指标变化时重置谐波次数
+watch(
+    () => tableStore.table.params.indicator,
+    newVal => {
+        if (shouldShowHarmonicCount()) {
+            // 如果之前没有设置过谐波次数，则默认设置为2
+            if (!tableStore.table.params.harmonicCount) {
+                tableStore.table.params.harmonicCount = 2
+            }
+        } else {
+            // 如果不是谐波含有率指标，则清除谐波次数设置
+            tableStore.table.params.harmonicCount = ''
+        }
+    }
+)
+
 const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
-:deep(.el-select) {
+// :deep(.el-select) {
-    min-width: 80px;
+//     min-width: 80px;
-}
+// }
 </style>

src/components/echarts/rmsWorker.js

@@ -1,51 +1,51 @@
 // 辅助函数
 const getMax = (temp, tempA, tempB, tempC) => {
-  temp = temp > tempA ? temp : tempA;
+    temp = temp > tempA ? temp : tempA
-  temp = temp > tempB ? temp : tempB;
+    temp = temp > tempB ? temp : tempB
     if (tempC !== undefined) {
-    temp = temp > tempC ? temp : tempC;
+        temp = temp > tempC ? temp : tempC
+    }
+    return temp
 }
-  return temp;
-};
 
 const getMaxTwo = (temp, tempA, tempB) => {
-  temp = temp > tempA ? temp : tempA;
+    temp = temp > tempA ? temp : tempA
-  temp = temp > tempB ? temp : tempB;
+    temp = temp > tempB ? temp : tempB
-  return temp;
+    return temp
-};
+}
 
 const getMin = (temp, tempA, tempB, tempC) => {
-  temp = temp < tempA ? temp : tempA;
+    temp = temp < tempA ? temp : tempA
-  temp = temp < tempB ? temp : tempB;
+    temp = temp < tempB ? temp : tempB
     if (tempC !== undefined) {
-    temp = temp < tempC ? temp : tempC;
+        temp = temp < tempC ? temp : tempC
+    }
+    return temp
 }
-  return temp;
-};
 
 const getMinOpen = (temp, tempA, tempB) => {
-  temp = temp < tempA ? temp : tempA;
+    temp = temp < tempA ? temp : tempA
-  temp = temp < tempB ? temp : tempB;
+    temp = temp < tempB ? temp : tempB
-  return temp;
+    return temp
-};
+}
 
 // 数据处理函数
 const fliteWaveData = (wp, step, iphasicValue, isOpen) => {
-  const rmsData = wp.listRmsData;
+    const rmsData = wp.listRmsData
-  const pt = Number(wp.pt) / 1000;
+    const pt = Number(wp.pt) / 1000
-  const ct = Number(wp.ct);
+    const ct = Number(wp.ct)
-  const titleList = wp.waveTitle;
+    const titleList = wp.waveTitle
-  let xishu = pt;
+    let xishu = pt
-  let aTitle = "",
+    let aTitle = '',
-    bTitle = "",
+        bTitle = '',
-    cTitle = "",
+        cTitle = '',
-    unit = "电压";
+        unit = '电压'
     let rmsvFirstX = 0,
         rmsvFirstY = 0,
         rmsvSecondX = 0,
         rmsvSecondY = 0,
-    firstZhou = "a",
+        firstZhou = 'a',
-    secondeZhou = "a";
+        secondeZhou = 'a'
     let ifmax = 0,
         ifmin = 0,
         ismax = 0,
@@ -53,176 +53,172 @@ const fliteWaveData = (wp, step, iphasicValue, isOpen) => {
         rfmax = 0,
         rfmin = 0,
         rsmax = 0,
-    rsmin = 0;
+        rsmin = 0
 
-  const shunshiFA = [];
+    const shunshiFA = []
-  const shunshiFB = [];
+    const shunshiFB = []
-  const shunshiFC = [];
+    const shunshiFC = []
-  const shunshiSA = [];
+    const shunshiSA = []
-  const shunshiSB = [];
+    const shunshiSB = []
-  const shunshiSC = [];
+    const shunshiSC = []
-  const rmsFA = [];
+    const rmsFA = []
-  const rmsFB = [];
+    const rmsFB = []
-  const rmsFC = [];
+    const rmsFC = []
-  const rmsSA = [];
+    const rmsSA = []
-  const rmsSB = [];
+    const rmsSB = []
-  const rmsSC = [];
+    const rmsSC = []
 
-  
+    if (titleList[iphasicValue * step + 1]?.substring(0, 1) !== 'U') {
-
+        xishu = ct
-  if (titleList[iphasicValue * step + 1]?.substring(0, 1) !== "U") {
+        unit = '电流'
-    xishu = ct;
-    unit = "电流";
     }
 
     for (let i = 1; i <= iphasicValue; i++) {
         switch (i) {
             case 1:
-        aTitle = titleList[iphasicValue * step + i]?.substring(1) || "";
+                aTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
-        break;
+                break
             case 2:
-        bTitle = titleList[iphasicValue * step + i]?.substring(1) || "";
+                bTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
-        break;
+                break
             case 3:
-        cTitle = titleList[iphasicValue * step + i]?.substring(1) || "";
+                cTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
-        break;
+                break
         }
     }
 
     if (rmsData[0] && rmsData[0][iphasicValue * step + 1] !== undefined) {
-    rfmax = rmsData[0][iphasicValue * step + 1] * xishu;
+        rfmax = rmsData[0][iphasicValue * step + 1] * xishu
-    rfmin = rmsData[0][iphasicValue * step + 1] * xishu;
+        rfmin = rmsData[0][iphasicValue * step + 1] * xishu
-    rmsvFirstY = rmsData[0][iphasicValue * step + 1] * xishu;
+        rmsvFirstY = rmsData[0][iphasicValue * step + 1] * xishu
-    rmsvFirstX = rmsData[0][0];
+        rmsvFirstX = rmsData[0][0]
-    rsmax = rmsData[0][iphasicValue * step + 1];
+        rsmax = rmsData[0][iphasicValue * step + 1]
-    rsmin = rmsData[0][iphasicValue * step + 1];
+        rsmin = rmsData[0][iphasicValue * step + 1]
-    rmsvSecondY = rmsData[0][iphasicValue * step + 1];
+        rmsvSecondY = rmsData[0][iphasicValue * step + 1]
-    rmsvSecondX = rmsData[0][0];
+        rmsvSecondX = rmsData[0][0]
     }
 
     for (let rms = 0; rms < rmsData.length; rms++) {
         if (!rmsData[rms] || rmsData[rms][iphasicValue * step + 1] === undefined) {
-      break;
+            break
         }
 
         switch (iphasicValue) {
             case 1:
-        const rmsFirstA = rmsData[rms][iphasicValue * step + 1] * xishu;
+                const rmsFirstA = rmsData[rms][iphasicValue * step + 1] * xishu
-        rmsFA.push([rmsData[rms][0], rmsFirstA]);
+                rmsFA.push([rmsData[rms][0], rmsFirstA])
-        rfmax = rfmax > rmsFirstA ? rfmax : rmsFirstA;
+                rfmax = rfmax > rmsFirstA ? rfmax : rmsFirstA
-        rfmin = rfmin < rmsFirstA ? rfmin : rmsFirstA;
+                rfmin = rfmin < rmsFirstA ? rfmin : rmsFirstA
                 if (rfmin < rmsvFirstY) {
-          rmsvFirstY = rfmin;
+                    rmsvFirstY = rfmin
-          firstZhou = "a";
+                    firstZhou = 'a'
-          rmsvFirstX = rmsData[rms][0];
+                    rmsvFirstX = rmsData[rms][0]
                 }
 
-        const rmsSecondA = rmsData[rms][iphasicValue * step + 1];
+                const rmsSecondA = rmsData[rms][iphasicValue * step + 1]
-        rmsSA.push([rmsData[rms][0], rmsSecondA]);
+                rmsSA.push([rmsData[rms][0], rmsSecondA])
-        rsmax = rsmax > rmsSecondA ? rsmax : rmsSecondA;
+                rsmax = rsmax > rmsSecondA ? rsmax : rmsSecondA
-        rsmin = rsmin < rmsSecondA ? rsmin : rmsSecondA;
+                rsmin = rsmin < rmsSecondA ? rsmin : rmsSecondA
                 if (rsmin < rmsvSecondY) {
-          rmsvSecondY = rsmin;
+                    rmsvSecondY = rsmin
-          secondeZhou = "a";
+                    secondeZhou = 'a'
-          rmsvSecondX = rmsData[rms][0];
+                    rmsvSecondX = rmsData[rms][0]
                 }
-        break;
+                break
             case 2:
-        const rmsFirstA2 = rmsData[rms][iphasicValue * step + 1] * xishu;
+                const rmsFirstA2 = rmsData[rms][iphasicValue * step + 1] * xishu
-        const rmsFirstB2 = rmsData[rms][iphasicValue * step + 2] * xishu;
+                const rmsFirstB2 = rmsData[rms][iphasicValue * step + 2] * xishu
-        rmsFA.push([rmsData[rms][0], rmsFirstA2]);
+                rmsFA.push([rmsData[rms][0], rmsFirstA2])
-        rmsFB.push([rmsData[rms][0], rmsFirstB2]);
+                rmsFB.push([rmsData[rms][0], rmsFirstB2])
-        rfmax = getMaxTwo(rfmax, rmsFirstA2, rmsFirstB2);
+                rfmax = getMaxTwo(rfmax, rmsFirstA2, rmsFirstB2)
-        rfmin = getMinOpen(rfmin, rmsFirstA2, rmsFirstB2);
+                rfmin = getMinOpen(rfmin, rmsFirstA2, rmsFirstB2)
                 if (rfmin < rmsvFirstY) {
-          rmsvFirstY = rfmin;
+                    rmsvFirstY = rfmin
                     if (rfmin === rmsFirstA2) {
-            firstZhou = "a";
+                        firstZhou = 'a'
                     } else if (rfmin === rmsFirstB2) {
-            firstZhou = "b";
+                        firstZhou = 'b'
                     }
-          rmsvFirstX = rmsData[rms][0];
+                    rmsvFirstX = rmsData[rms][0]
                 }
 
-        const rmsSecondA2 = rmsData[rms][iphasicValue * step + 1];
+                const rmsSecondA2 = rmsData[rms][iphasicValue * step + 1]
-        const rmsSecondB2 = rmsData[rms][iphasicValue * step + 2];
+                const rmsSecondB2 = rmsData[rms][iphasicValue * step + 2]
-        rmsSA.push([rmsData[rms][0], rmsSecondA2]);
+                rmsSA.push([rmsData[rms][0], rmsSecondA2])
-        rmsSB.push([rmsData[rms][0], rmsSecondB2]);
+                rmsSB.push([rmsData[rms][0], rmsSecondB2])
-        rsmax = getMaxTwo(rsmax, rmsSecondA2, rmsSecondB2);
+                rsmax = getMaxTwo(rsmax, rmsSecondA2, rmsSecondB2)
-        rsmin = getMinOpen(rsmin, rmsSecondA2, rmsSecondB2);
+                rsmin = getMinOpen(rsmin, rmsSecondA2, rmsSecondB2)
                 if (rsmin < rmsvSecondY) {
-          rmsvSecondY = rsmin;
+                    rmsvSecondY = rsmin
                     if (rsmin === rmsSecondA2) {
-            secondeZhou = "a";
+                        secondeZhou = 'a'
                     } else if (rsmin === rmsSecondB2) {
-            secondeZhou = "b";
+                        secondeZhou = 'b'
                     }
-          rmsvSecondX = rmsData[rms][0];
+                    rmsvSecondX = rmsData[rms][0]
                 }
-        break;
+                break
             case 3:
-        const rmsFirstA3 = rmsData[rms][iphasicValue * step + 1] * xishu;
+                const rmsFirstA3 = rmsData[rms][iphasicValue * step + 1] * xishu
-        const rmsFirstB3 = rmsData[rms][iphasicValue * step + 2] * xishu;
+                const rmsFirstB3 = rmsData[rms][iphasicValue * step + 2] * xishu
-        const rmsFirstC3 = rmsData[rms][iphasicValue * step + 3] * xishu;
+                const rmsFirstC3 = rmsData[rms][iphasicValue * step + 3] * xishu
-        rmsFA.push([rmsData[rms][0], rmsFirstA3]);
+                rmsFA.push([rmsData[rms][0], rmsFirstA3])
-        rmsFB.push([rmsData[rms][0], rmsFirstB3]);
+                rmsFB.push([rmsData[rms][0], rmsFirstB3])
-        rmsFC.push([rmsData[rms][0], rmsFirstC3]);
+                rmsFC.push([rmsData[rms][0], rmsFirstC3])
-        rfmax = getMax(rfmax, rmsFirstA3, rmsFirstB3, rmsFirstC3);
+                rfmax = getMax(rfmax, rmsFirstA3, rmsFirstB3, rmsFirstC3)
                 rfmin = isOpen
                     ? getMinOpen(rfmin, rmsFirstA3, rmsFirstC3)
-          : getMin(rfmin, rmsFirstA3, rmsFirstB3, rmsFirstC3);
+                    : getMin(rfmin, rmsFirstA3, rmsFirstB3, rmsFirstC3)
                 if (rfmin < rmsvFirstY) {
-          rmsvFirstY = rfmin;
+                    rmsvFirstY = rfmin
                     if (rfmin === rmsFirstA3) {
-            firstZhou = "a";
+                        firstZhou = 'a'
                     } else if (rfmin === rmsFirstB3) {
-            firstZhou = "b";
+                        firstZhou = 'b'
                     } else {
-            firstZhou = "c";
+                        firstZhou = 'c'
                     }
-          rmsvFirstX = rmsData[rms][0];
+                    rmsvFirstX = rmsData[rms][0]
                 }
 
-        const rmsSecondA3 = rmsData[rms][iphasicValue * step + 1];
+                const rmsSecondA3 = rmsData[rms][iphasicValue * step + 1]
-        const rmsSecondB3 = rmsData[rms][iphasicValue * step + 2];
+                const rmsSecondB3 = rmsData[rms][iphasicValue * step + 2]
-        const rmsSecondC3 = rmsData[rms][iphasicValue * step + 3];
+                const rmsSecondC3 = rmsData[rms][iphasicValue * step + 3]
-        rmsSA.push([rmsData[rms][0], rmsSecondA3]);
+                rmsSA.push([rmsData[rms][0], rmsSecondA3])
-        rmsSB.push([rmsData[rms][0], rmsSecondB3]);
+                rmsSB.push([rmsData[rms][0], rmsSecondB3])
-        rmsSC.push([rmsData[rms][0], rmsSecondC3]);
+                rmsSC.push([rmsData[rms][0], rmsSecondC3])
-        rsmax = getMax(rsmax, rmsSecondA3, rmsSecondB3, rmsSecondC3);
+                rsmax = getMax(rsmax, rmsSecondA3, rmsSecondB3, rmsSecondC3)
                 rsmin = isOpen
                     ? getMinOpen(rsmin, rmsSecondA3, rmsSecondC3)
-          : getMin(rsmin, rmsSecondA3, rmsSecondB3, rmsSecondC3);
+                    : getMin(rsmin, rmsSecondA3, rmsSecondB3, rmsSecondC3)
                 if (rsmin < rmsvSecondY) {
-          rmsvSecondY = rsmin;
+                    rmsvSecondY = rsmin
                     if (rsmin === rmsSecondA3) {
-            secondeZhou = "a";
+                        secondeZhou = 'a'
                     } else if (rsmin === rmsSecondB3) {
-            secondeZhou = "b";
+                        secondeZhou = 'b'
                     } else {
-            secondeZhou = "c";
+                        secondeZhou = 'c'
                     }
-          rmsvSecondX = rmsData[rms][0];
+                    rmsvSecondX = rmsData[rms][0]
                 }
-        break;
+                break
         }
     }
 
-  const instantF = { max: ifmax, min: ifmin };
+    const instantF = { max: ifmax, min: ifmin }
-  const instantS = { max: ismax, min: ismin };
+    const instantS = { max: ismax, min: ismin }
-  const RMSF = { max: rfmax, min: rfmin };
+    const RMSF = { max: rfmax, min: rfmin }
-  const RMSS = { max: rsmax, min: rsmin };
+    const RMSS = { max: rsmax, min: rsmin }
-  const RMSFMinDetail = { rmsvFirstX, rmsvFirstY, firstZhou };
+    const RMSFMinDetail = { rmsvFirstX, rmsvFirstY, firstZhou }
-  const RMSSMinDetail = { rmsvSecondX, rmsvSecondY, secondeZhou };
+    const RMSSMinDetail = { rmsvSecondX, rmsvSecondY, secondeZhou }
-  const shunshiF = { shunshiFA, shunshiFB, shunshiFC };
+    const shunshiF = { shunshiFA, shunshiFB, shunshiFC }
-  const shunshiS = { shunshiSA, shunshiSB, shunshiSC };
+    const shunshiS = { shunshiSA, shunshiSB, shunshiSC }
-  const RMSFWave = { rmsFA, rmsFB, rmsFC };
+    const RMSFWave = { rmsFA, rmsFB, rmsFC }
-  const RMSSWave = { rmsSA, rmsSB, rmsSC };
+    const RMSSWave = { rmsSA, rmsSB, rmsSC }
-  const title = { aTitle, bTitle, cTitle, unit };
+    const title = { aTitle, bTitle, cTitle, unit }
-
 
     return {
- 
         instantF,
         instantS,
         RMSF,
@@ -234,63 +230,74 @@ const fliteWaveData = (wp, step, iphasicValue, isOpen) => {
         RMSFWave,
         RMSSWave,
         title,
-    unit,
+        unit
-  };
+    }
-};
+}
 
 // 监听消息
 self.onmessage = function (e) {
-  const { wp, isOpen, value, boxoList } = JSON.parse(e.data);
+    const { wp, isOpen, value, boxoList } = JSON.parse(e.data)
 
     try {
-    const iphasicValue = wp.iphasic || 1;
+        const iphasicValue = wp.iphasic || 1
 
-    const picCounts = (wp.waveTitle.length - 1) / iphasicValue;
+        const picCounts = (wp.waveTitle.length - 1) / iphasicValue
-    const waveDatas = [];
+        const waveDatas = []
 
         for (let i = 0; i < picCounts; i++) {
-      const data = fliteWaveData(wp, i, iphasicValue, isOpen,boxoList);
+            const data = fliteWaveData(wp, i, iphasicValue, isOpen, boxoList)
-      waveDatas.push(data);
+            waveDatas.push(data)
         }
         // 处理标题
-  let titles = "";
+        let titles = ''
-  if (boxoList.systemType == "pms") {
+        if (boxoList.systemType == 'pms') {
             titles =
-      "变电站名称：" +
+                '变电站名称：' +
                 boxoList.powerStationName +
-      " 监测点名称：" +
+                ' 监测点名称：' +
                 boxoList.measurementPointName +
-      " 发生时刻：" +
+                ' 发生时刻：' +
                 boxoList.startTime +
-      " 残余电压：" +
+                ' 残余电压：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
-      "% 持续时间：" +
+                '% 持续时间：' +
                 boxoList.duration +
-      "s";
+                's'
-  } else if (boxoList.systemType == "ZL") {
+        } else if (boxoList.systemType == 'ZL') {
             titles =
-      " 监测点名称：" +
+                ' 监测点名称：' +
                 boxoList.equipmentName +
-      " 发生时刻：" +
+                ' 发生时刻：' +
                 boxoList.startTime +
-      " 残余电压：" +
+                ' 残余电压：' +
                 boxoList.evtParamVVaDepth +
-      " 持续时间：" +
+                ' 持续时间：' +
                 boxoList.evtParamTm +
-      "s";
+                's'
+        } else if (boxoList.systemType == 'YPT') {
+            titles =
+                ' 监测点名称：' +
+                boxoList.lineName +
+                ' 发生时刻：' +
+                boxoList.startTime +
+                ' 残余电压：' +
+                (boxoList.featureAmplitude * 100).toFixed(2) +
+                '% 持续时间：' +
+                boxoList.persistTime +
+                's'
         } else {
             titles =
-      "变电站名称：" +
+                '变电站名称：' +
                 boxoList.subName +
-      " 监测点名称：" +
+                ' 监测点名称：' +
                 boxoList.lineName +
-      " 发生时刻：" +
+                ' 发生时刻：' +
                 boxoList.startTime +
-      " 残余电压：" +
+                ' 残余电压：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
-      "% 持续时间：" +
+                '% 持续时间：' +
                 boxoList.duration +
-      "s";
+                's'
         }
         // 发送处理结果回主线程
         self.postMessage({
@@ -300,12 +307,12 @@ self.onmessage = function (e) {
             time: wp.time,
             type: wp.waveType,
             severity: wp.yzd,
-      iphasic: iphasicValue,
+            iphasic: iphasicValue
-    });
+        })
     } catch (error) {
         self.postMessage({
             success: false,
-      error: error.message,
+            error: error.message
-    });
+        })
+    }
 }
-};

src/components/echarts/rmsboxi.vue

@@ -1,9 +1,6 @@
 <template>
-
+    <div v-loading="loading" style="position: relative; height: 100%">
-    <div v-loading="loading" :element-loading-background="'rgba(122, 122, 122, 0.8)'"
+        <div id="boxr">
-        style="position: relative;height: 100%;">
-
-        <div id="boxr" style="background: #343849c7">
             <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
                 <div class="bx" id="rms"></div>
             </div>
@@ -16,6 +13,7 @@ import { ref, computed, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
 import html2canvas from 'html2canvas'
 import $ from 'jquery'
 import * as echarts from 'echarts'
+import { mainHeight } from '@/utils/layout'
 import url from '@/assets/img/point.png'
 import url2 from '@/assets/img/dw.png'
 const worker = ref<Worker | null>(null)
@@ -66,7 +64,7 @@ interface WaveData {
 interface Props {
     value?: number
     flag?: string | number | boolean
-    parentHeight?: string | number | boolean
+    parentHeight?: any
     DColor?: boolean
     boxoList?: any
     wp?: any
@@ -78,7 +76,7 @@ const props = withDefaults(defineProps<Props>(), {
     parentHeight: 0,
     DColor: false,
     boxoList: () => ({}),
-    wp: () => ({}),
+    wp: () => ({})
 })
 
 const loading = ref(true)
@@ -110,34 +108,41 @@ const myChartess4 = ref<echarts.ECharts | null>(null)
 const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
-    if (props.flag == 1) {
+    if (props.parentHeight == 999) {
-        return '690px'
-    } else if (props.parentHeight != 0) {
         return '310px'
+    } else if (props.parentHeight != 0) {
+        return mainHeight(props.parentHeight, 2).height
+    }
+
+    if (props.flag == 1) {
+        return mainHeight(200).height
     } else {
-        return '350px'
+        return mainHeight(200, 2).height
     }
 })
 
 const vw = computed(() => '100%')
 
-watch(() => props.value, (newVal) => {
+watch(
+    () => props.value,
+    newVal => {
         if (newVal == 2) {
             initWaves()
         } else {
             $('#wave1').remove()
             initWaves()
         }
-})
+    }
+)
 
 onMounted(() => {
-    const zoomValue = document.body.style.getPropertyValue('zoom');
+    const zoomValue = document.body.style.getPropertyValue('zoom')
-    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1);
+    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
     window.addEventListener('resize', handleResize)
 
     // 初始化 Web Worker
-    worker.value = new Worker(new URL('./rmsWorker.js', import.meta.url));
+    worker.value = new Worker(new URL('./rmsWorker.js', import.meta.url))
-    worker.value.onmessage = (e) => {
+    worker.value.onmessage = e => {
         if (e.data.success) {
             const data = e.data
             titles.value = data.titles
@@ -171,15 +176,15 @@ onBeforeUnmount(() => {
 })
 
 const handleResize = () => {
-    const zoomValue = document.body.style.getPropertyValue('zoom');
+    const zoomValue = document.body.style.getPropertyValue('zoom')
-    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1);
+    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
 }
 
 const download = () => {
     const boxr = document.getElementById('boxr')
     if (boxr) {
         html2canvas(boxr, {
-            scale: 2,
+            scale: 2
         }).then(function (canvas) {
             const creatIMg = document.createElement('a')
             creatIMg.download = 'rms波形.png'
@@ -195,13 +200,14 @@ const query = () => {
     if (props.wp) {
         // 使用 Worker 处理数据
         if (worker.value) {
-
+            worker.value.postMessage(
-            worker.value.postMessage(JSON.stringify({
+                JSON.stringify({
                     wp: props.wp,
                     isOpen: isOpen.value,
                     value: props.value,
                     boxoList: props.boxoList
-            }))
+                })
+            )
         }
     } else {
         initWave(null, null, null, null, null)
@@ -240,7 +246,6 @@ const waveData = (
 
 const initWaves = () => {
     if (props.wp) {
-
         iphasic.value = props.wp.iphasic || 1
         const picCounts = (props.wp.waveTitle.length - 1) / iphasic.value
         waveDatas.value = []
@@ -266,15 +271,29 @@ const initWaves = () => {
 }
 
 const fliteWaveData = (wp: any, step: number): WaveData => {
-
     const rmsData = wp.listRmsData
     const pt = Number(wp.pt) / 1000
     const ct = Number(wp.ct)
     const titleList = wp.waveTitle
     let xishu = pt
-    let aTitle = '', bTitle = '', cTitle = '', unit = '电压'
+    let aTitle = '',
-    let rmsvFirstX = 0, rmsvFirstY = 0, rmsvSecondX = 0, rmsvSecondY = 0, firstZhou = 'a', secondeZhou = 'a'
+        bTitle = '',
-    let ifmax = 0, ifmin = 0, ismax = 0, ismin = 0, rfmax = 0, rfmin = 0, rsmax = 0, rsmin = 0
+        cTitle = '',
+        unit = '电压'
+    let rmsvFirstX = 0,
+        rmsvFirstY = 0,
+        rmsvSecondX = 0,
+        rmsvSecondY = 0,
+        firstZhou = 'a',
+        secondeZhou = 'a'
+    let ifmax = 0,
+        ifmin = 0,
+        ismax = 0,
+        ismin = 0,
+        rfmax = 0,
+        rfmin = 0,
+        rsmax = 0,
+        rsmin = 0
 
     const shunshiFA: number[][] = []
     const shunshiFB: number[][] = []
@@ -289,7 +308,6 @@ const fliteWaveData = (wp: any, step: number): WaveData => {
     const rmsSB: number[][] = []
     const rmsSC: number[][] = []
 
-
     if (titleList[iphasic.value * step + 1]?.substring(0, 1) !== 'U') {
         xishu = ct
         unit = '电流'
@@ -309,8 +327,6 @@ const fliteWaveData = (wp: any, step: number): WaveData => {
         }
     }
 
-
-
     if (rmsData[0][iphasic.value * step + 1] !== undefined) {
         rfmax = rmsData[0][iphasic.value * step + 1] * xishu
         rfmin = rmsData[0][iphasic.value * step + 1] * xishu
@@ -322,8 +338,6 @@ const fliteWaveData = (wp: any, step: number): WaveData => {
         rmsvSecondX = rmsData[0][0]
     }
 
-
-
     for (let rms = 0; rms < rmsData.length; rms++) {
         if (rmsData[rms][iphasic.value * step + 1] === undefined) {
             break
@@ -388,12 +402,14 @@ const fliteWaveData = (wp: any, step: number): WaveData => {
                 const rmsFirstA3 = rmsData[rms][iphasic.value * step + 1] * xishu
                 const rmsFirstB3 = rmsData[rms][iphasic.value * step + 2] * xishu
                 const rmsFirstC3 = rmsData[rms][iphasic.value * step + 3] * xishu
-                rmsFA.push([rmsData[rms][0], rmsFirstA3]);
+                rmsFA.push([rmsData[rms][0], rmsFirstA3])
 
-                rmsFB.push([rmsData[rms][0], rmsFirstB3]);
+                rmsFB.push([rmsData[rms][0], rmsFirstB3])
-                rmsFC.push([rmsData[rms][0], rmsFirstC3]);
+                rmsFC.push([rmsData[rms][0], rmsFirstC3])
                 rfmax = getMax(rfmax, rmsFirstA3, rmsFirstB3, rmsFirstC3)
-                rfmin = isOpen.value ? getMinOpen(rfmin, rmsFirstA3, rmsFirstC3) : getMin(rfmin, rmsFirstA3, rmsFirstB3, rmsFirstC3)
+                rfmin = isOpen.value
+                    ? getMinOpen(rfmin, rmsFirstA3, rmsFirstC3)
+                    : getMin(rfmin, rmsFirstA3, rmsFirstB3, rmsFirstC3)
                 if (rfmin < rmsvFirstY) {
                     rmsvFirstY = rfmin
                     if (rfmin === rmsFirstA3) {
@@ -413,7 +429,9 @@ const fliteWaveData = (wp: any, step: number): WaveData => {
                 rmsSB.push([rmsData[rms][0], rmsSecondB3])
                 rmsSC.push([rmsData[rms][0], rmsSecondC3])
                 rsmax = getMax(rsmax, rmsSecondA3, rmsSecondB3, rmsSecondC3)
-                rsmin = isOpen.value ? getMinOpen(rsmin, rmsSecondA3, rmsSecondC3) : getMin(rsmin, rmsSecondA3, rmsSecondB3, rmsSecondC3)
+                rsmin = isOpen.value
+                    ? getMinOpen(rsmin, rmsSecondA3, rmsSecondC3)
+                    : getMin(rsmin, rmsSecondA3, rmsSecondB3, rmsSecondC3)
                 if (rsmin < rmsvSecondY) {
                     rmsvSecondY = rsmin
                     if (rsmin === rmsSecondA3) {
@@ -429,7 +447,6 @@ const fliteWaveData = (wp: any, step: number): WaveData => {
         }
     }
 
-
     const instantF = { max: ifmax, min: ifmin }
     const instantS = { max: ismax, min: ismin }
     const RMSF = { max: rfmax, min: rfmin }
@@ -442,11 +459,29 @@ const fliteWaveData = (wp: any, step: number): WaveData => {
     const RMSSWave = { rmsSA, rmsSB, rmsSC }
     const title = { aTitle, bTitle, cTitle, unit }
 
-    return waveData(instantF, instantS, RMSF, RMSS, RMSFMinDetail, RMSSMinDetail, shunshiF, shunshiS, RMSFWave, RMSSWave, title, unit)
+    return waveData(
+        instantF,
+        instantS,
+        RMSF,
+        RMSS,
+        RMSFMinDetail,
+        RMSSMinDetail,
+        shunshiF,
+        shunshiS,
+        RMSFWave,
+        RMSSWave,
+        title,
+        unit
+    )
 }
 
-const initWave = (waveDatas: WaveData[] | null, time: string | null, type: string | null, severity: string | null, isOpen: boolean | null) => {
+const initWave = (
-
+    waveDatas: WaveData[] | null,
+    time: string | null,
+    type: string | null,
+    severity: string | null,
+    isOpen: boolean | null
+) => {
     $('div.bx').remove()
 
     let picHeight = vh.value
@@ -456,9 +491,15 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
     let rmscm: number[][] = []
     let titleText = ''
     let unit = ''
-    let a: string | null = null, b: string | null = null, c: string | null = null
+    let a: string | null = null,
-    let radata: number[][] = [], rbdata: number[][] = [], rcdata: number[][] = []
+        b: string | null = null,
-    let rmsvX: any = 0, rmsvY: any = 0, zhou = ''
+        c: string | null = null
+    let radata: number[][] = [],
+        rbdata: number[][] = [],
+        rcdata: number[][] = []
+    let rmsvX: any = 0,
+        rmsvY: any = 0,
+        zhou = ''
 
     if (!waveDatas) {
         titleText = '该事件暂无波形图'
@@ -543,10 +584,7 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                 ]
                 unit = 'kV'
             } else {
-                fz.value = [
+                fz.value = [props.wp.listRmsMinData[0][0], props.wp.listRmsMinData[0][1]]
-                    props.wp.listRmsMinData[0][0],
-                    props.wp.listRmsMinData[0][1]
-                ]
                 unit = 'V'
             }
         } else {
@@ -555,18 +593,40 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
 
         for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
             const rmsId = 'rms' + step
-            const newDivRms = $(`<div style="height:${vh.value};overflow: hidden;"><div class='bx' id='${rmsId}'></div></div>`)
+            const newDivRms = $(
+                `<div style="height:${vh.value};overflow: hidden;"><div class='bx' id='${rmsId}'></div></div>`
+            )
             newDivRms.insertAfter($('#rmsp'))
             $(`#${rmsId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(Number(eventValue.value) * 1).toFixed(0)}% 持续时间：${persistTime.value}s`
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+            Number(eventValue.value) * 1
+        ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }
     const rms = document.getElementById('rmsp')
 
     if (!rms) return
     const myChartes = echarts.init(rms)
-    const echartsColor = { WordColor: "#fff", thread: "#fff", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
+    const echartsColor = {
+        WordColor: '#000',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
 
     setTimeout(() => {
         rms.style.width = '100%'
@@ -582,7 +642,12 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                 let tips = '时刻:' + params[0].data[0] + '</br/>'
                 for (let i = 0; i < params.length; i++) {
                     if (params[i].seriesName != '暂降触发点') {
-                        tips += params[i].marker + params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '<br/>'
+                        tips +=
+                            params[i].marker +
+                            params[i].seriesName +
+                            ':' +
+                            (params[i].value[1] - 0).toFixed(2) +
+                            '<br/>'
                     }
                 }
                 return tips
@@ -604,8 +669,8 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                 align: 'left'
             },
             textStyle: {
-                fontSize: '0.8rem',
+                fontSize: '16px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             }
         },
         legend: {
@@ -615,8 +680,8 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             enabled: true,
             itemDistance: 5,
             textStyle: {
-                fontSize: '0.7rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 rich: { a: { verticalAlign: 'middle' } },
                 padding: [0, 0, 0, 0]
             }
@@ -641,13 +706,13 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             title: {
                 text: 'ms',
                 textStyle: {
-                    fontSize: '0.6rem',
+                    fontSize: '12px',
-                    color: props.DColor ? '#fff' : echartsColor.WordColor
+                    color: props.DColor ? '#000' : echartsColor.WordColor
                 },
                 enabled: true,
                 align: 'high'
             },
-            nameTextStyle: { fontSize: '0.6rem' },
+            nameTextStyle: { fontSize: '12px' },
             labels: {
                 formatter: function () {
                     return this.value
@@ -657,13 +722,13 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             axisTick: { alignWithLabel: true },
             axisLine: {
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     if (valA.value != (value - 0).toFixed(0)) {
                         valA.value = Number((value - 0).toFixed(0))
@@ -684,31 +749,31 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                 y: -10
             },
             max: rmscm[0]?.[1] * 1.06 || 0,
-            min: rmscu[0]?.[1] - (rmscu[0]?.[1] * 0.04) || 0,
+            min: rmscu[0]?.[1] - rmscu[0]?.[1] * 0.04 || 0,
             boundaryGap: [0, '100%'],
             showLastLabel: true,
             opposite: false,
             nameTextStyle: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             },
             axisLine: {
                 show: true,
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     return (value - 0).toFixed(2)
                 }
             },
             splitLine: {
                 lineStyle: {
-                    color: [props.DColor ? '#fff' : echartsColor.thread],
+                    color: [props.DColor ? '#000' : echartsColor.thread],
                     type: 'dashed',
                     opacity: 0.5
                 }
@@ -718,7 +783,7 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             left: '1%',
             right: '45px',
             bottom: '40px',
-            top: '70px',
+            top: '60px',
             containLabel: true
         },
         dataZoom: [
@@ -780,7 +845,7 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                     show: true,
                     position: [5, -20],
                     color: '#000',
-                    fontSize: '14px',
+                    fontSize: '12px',
                     fontWeight: 'bold',
                     borderType: 'solid',
                     borderWidth: 0.5,
@@ -792,7 +857,6 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
         ]
     }
 
-
     myChartes.setOption(option)
     myChartess.value = myChartes
 
@@ -809,12 +873,25 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
     }
 }
 
-const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show: boolean, myChartes1: echarts.ECharts, rmscm: number[][], rmscu: number[][], title: string) => {
+const drawPics = (
+    waveDataTemp: WaveData,
+    picHeight: string,
+    step: number,
+    show: boolean,
+    myChartes1: echarts.ECharts,
+    rmscm: number[][],
+    rmscu: number[][],
+    title: string
+) => {
     step = step + 1
     const rmsId = 'rms' + step
-    let a = '', b = '', c = ''
+    let a = '',
+        b = '',
+        c = ''
     let unit = ''
-    let radata: number[][] = [], rbdata: number[][] = [], rcdata: number[][] = []
+    let radata: number[][] = [],
+        rbdata: number[][] = [],
+        rcdata: number[][] = []
 
     switch (iphasic.value) {
         case 1:
@@ -877,7 +954,25 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
     if (!rmsIds) return
 
     const myChartes = echarts.init(rmsIds)
-    const echartsColor = { WordColor: "#fff", thread: "#fff", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
+    const echartsColor = {
+        WordColor: '#000',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
 
     const option = {
         tooltip: {
@@ -888,7 +983,12 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
                 let tips = '时刻:' + params[0].data[0] + '</br/>'
                 for (let i = 0; i < params.length; i++) {
                     if (params[i].seriesName != '暂降触发点') {
-                        tips += params[i].marker + params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '<br/>'
+                        tips +=
+                            params[i].marker +
+                            params[i].seriesName +
+                            ':' +
+                            (params[i].value[1] - 0).toFixed(2) +
+                            '<br/>'
                     }
                 }
                 return tips
@@ -906,8 +1006,8 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             left: 'center',
             text: '', //titlename || title,
             textStyle: {
-                fontSize: '0.8rem',
+                fontSize: '16px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             }
         },
         legend: {
@@ -917,8 +1017,8 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             enabled: true,
             itemDistance: 5,
             textStyle: {
-                fontSize: '0.7rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 rich: { a: { verticalAlign: 'middle' } },
                 padding: [0, 0, 0, 0]
             }
@@ -932,8 +1032,8 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             title: {
                 text: 'ms',
                 textStyle: {
-                    fontSize: '0.6rem',
+                    fontSize: '12px',
-                    color: props.DColor ? '#fff' : echartsColor.WordColor
+                    color: props.DColor ? '#000' : echartsColor.WordColor
                 },
                 enabled: true,
                 align: 'high'
@@ -943,18 +1043,18 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
                     return this.value
                 }
             },
-            nameTextStyle: { fontSize: '0.6rem' },
+            nameTextStyle: { fontSize: '12px' },
             splitLine: { show: false },
             axisTick: { alignWithLabel: true },
             axisLine: {
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     if (valB.value != (value - 0).toFixed(0)) {
                         valB.value = Number((value - 0).toFixed(0))
@@ -978,26 +1078,26 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             showLastLabel: true,
             opposite: false,
             nameTextStyle: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             },
             axisLine: {
                 show: true,
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     return (value - 0).toFixed(2)
                 }
             },
             splitLine: {
                 lineStyle: {
-                    color: [props.DColor ? '#fff' : echartsColor.thread],
+                    color: [props.DColor ? '#000' : echartsColor.thread],
                     type: 'dashed',
                     opacity: 0.5
                 }
@@ -1007,7 +1107,7 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             left: '1%',
             right: '45px',
             bottom: '40px',
-            top: '70px',
+            top: '60px',
             containLabel: true
         },
         dataZoom: [
@@ -1059,11 +1159,21 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
     myChartes.setOption(option)
 
     switch (step) {
-        case 1: myChartess1.value = myChartes; break
+        case 1:
-        case 2: myChartess2.value = myChartes; break
+            myChartess1.value = myChartes
-        case 3: myChartess3.value = myChartes; break
+            break
-        case 4: myChartess4.value = myChartes; break
+        case 2:
-        case 5: myChartess5.value = myChartes; break
+            myChartess2.value = myChartes
+            break
+        case 3:
+            myChartess3.value = myChartes
+            break
+        case 4:
+            myChartess4.value = myChartes
+            break
+        case 5:
+            myChartess5.value = myChartes
+            break
     }
 
     setTimeout(() => {
@@ -1076,7 +1186,14 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
 
 const backbxlb = () => {
     waveDatas.value = []
-    const charts = [myChartess.value, myChartess1.value, myChartess2.value, myChartess3.value, myChartess4.value, myChartess5.value]
+    const charts = [
+        myChartess.value,
+        myChartess1.value,
+        myChartess2.value,
+        myChartess3.value,
+        myChartess4.value,
+        myChartess5.value
+    ]
 
     charts.forEach(chart => {
         if (chart) {
@@ -1092,13 +1209,11 @@ const backbxlb = () => {
     myChartess5.value = null
 
     // echarts.disconnect(charts.filter(Boolean) as echarts.ECharts[])
-    charts
+    charts.filter(Boolean).forEach(chart => {
-        .filter(Boolean)
-        .forEach(chart => {
         if (chart && typeof chart.dispose === 'function') {
-                chart.dispose();
+            chart.dispose()
         }
-        });
+    })
 }
 
 const getMax = (temp: number, tempA: number, tempB: number, tempC: number): number => {

src/components/echarts/shuWorker.js

@@ -1,120 +1,131 @@
 // waveData.worker.js
 self.addEventListener('message', function (e) {
-  const { wp, value, iphasic, isOpen, boxoList } = JSON.parse(e.data);
+    const { wp, value, iphasic, isOpen, boxoList } = JSON.parse(e.data)
 
     // 处理波形数据的函数
     const fliteWaveData = (wp, step) => {
         // 将原有的fliteWaveData函数实现复制到这里
-    const shunData = wp.listWaveData;
+        const shunData = wp.listWaveData
-    const pt = Number(wp.pt) / 1000;
+        const pt = Number(wp.pt) / 1000
-    const ct = Number(wp.ct);
+        const ct = Number(wp.ct)
-    const titleList = wp.waveTitle;
+        const titleList = wp.waveTitle
-    let xishu = pt;
+        let xishu = pt
-    let aTitle = '', bTitle = '', cTitle = '', unit = '电压';
+        let aTitle = '',
-    let ifmax = 0, ifmin = 0, ismax = 0, ismin = 0;
+            bTitle = '',
+            cTitle = '',
+            unit = '电压'
+        let ifmax = 0,
+            ifmin = 0,
+            ismax = 0,
+            ismin = 0
 
-    const shunshiFA = [];
+        const shunshiFA = []
-    const shunshiFB = [];
+        const shunshiFB = []
-    const shunshiFC = [];
+        const shunshiFC = []
-    const shunshiSA = [];
+        const shunshiSA = []
-    const shunshiSB = [];
+        const shunshiSB = []
-    const shunshiSC = [];
+        const shunshiSC = []
 
         if (shunData.length > 0) {
             if (titleList[iphasic * step + 1]?.substring(0, 1) !== 'U') {
-        xishu = ct;
+                xishu = ct
-        unit = '电流';
+                unit = '电流'
             }
 
             for (let i = 1; i <= iphasic; i++) {
                 switch (i) {
                     case 1:
-            aTitle = titleList[iphasic * step + i]?.substring(1) || '';
+                        aTitle = titleList[iphasic * step + i]?.substring(1) || ''
-            break;
+                        break
                     case 2:
-            bTitle = titleList[iphasic * step + i]?.substring(1) || '';
+                        bTitle = titleList[iphasic * step + i]?.substring(1) || ''
-            break;
+                        break
                     case 3:
-            cTitle = titleList[iphasic * step + i]?.substring(1) || '';
+                        cTitle = titleList[iphasic * step + i]?.substring(1) || ''
-            break;
+                        break
                 }
             }
 
             if (shunData[0][iphasic * step + 1] !== undefined) {
-        ifmax = shunData[0][iphasic * step + 1] * xishu;
+                ifmax = shunData[0][iphasic * step + 1] * xishu
-        ifmin = shunData[0][iphasic * step + 1] * xishu;
+                ifmin = shunData[0][iphasic * step + 1] * xishu
-        ismax = shunData[0][iphasic * step + 1];
+                ismax = shunData[0][iphasic * step + 1]
-        ismin = shunData[0][iphasic * step + 1];
+                ismin = shunData[0][iphasic * step + 1]
             }
 
             for (let shun = 0; shun < shunData.length; shun++) {
                 if (shunData[shun][iphasic * step + 1] === undefined) {
-          break;
+                    break
                 }
 
                 switch (iphasic) {
                     case 1:
-            const shunFirstA = shunData[shun][iphasic * step + 1] * xishu;
+                        const shunFirstA = shunData[shun][iphasic * step + 1] * xishu
-            shunshiFA.push([shunData[shun][0], shunFirstA]);
+                        shunshiFA.push([shunData[shun][0], shunFirstA])
-            ifmax = Math.max(ifmax, shunFirstA);
+                        ifmax = Math.max(ifmax, shunFirstA)
-            ifmin = Math.min(ifmin, shunFirstA);
+                        ifmin = Math.min(ifmin, shunFirstA)
 
-            const shunSecondA = shunData[shun][iphasic * step + 1];
+                        const shunSecondA = shunData[shun][iphasic * step + 1]
-            shunshiSA.push([shunData[shun][0], shunSecondA]);
+                        shunshiSA.push([shunData[shun][0], shunSecondA])
-            ismax = Math.max(ismax, shunSecondA);
+                        ismax = Math.max(ismax, shunSecondA)
-            ismin = Math.min(ismin, shunSecondA);
+                        ismin = Math.min(ismin, shunSecondA)
-            break;
+                        break
                     case 2:
-            const shunFirstA2 = shunData[shun][iphasic * step + 1] * xishu;
+                        const shunFirstA2 = shunData[shun][iphasic * step + 1] * xishu
-            const shunFirstB2 = shunData[shun][iphasic * step + 2] * xishu;
+                        const shunFirstB2 = shunData[shun][iphasic * step + 2] * xishu
-            shunshiFA.push([shunData[shun][0], shunFirstA2]);
+                        shunshiFA.push([shunData[shun][0], shunFirstA2])
-            shunshiFB.push([shunData[shun][0], shunFirstB2]);
+                        shunshiFB.push([shunData[shun][0], shunFirstB2])
-            ifmax = Math.max(ifmax, shunFirstA2, shunFirstB2);
+                        ifmax = Math.max(ifmax, shunFirstA2, shunFirstB2)
-            ifmin = Math.min(ifmin, shunFirstA2, shunFirstB2);
+                        ifmin = Math.min(ifmin, shunFirstA2, shunFirstB2)
 
-            const shunSecondA2 = shunData[shun][iphasic * step + 1];
+                        const shunSecondA2 = shunData[shun][iphasic * step + 1]
-            const shunSecondB2 = shunData[shun][iphasic * step + 2];
+                        const shunSecondB2 = shunData[shun][iphasic * step + 2]
-            shunshiSA.push([shunData[shun][0], shunSecondA2]);
+                        shunshiSA.push([shunData[shun][0], shunSecondA2])
-            shunshiSB.push([shunData[shun][0], shunSecondB2]);
+                        shunshiSB.push([shunData[shun][0], shunSecondB2])
-            ismax = Math.max(ismax, shunSecondA2, shunSecondB2);
+                        ismax = Math.max(ismax, shunSecondA2, shunSecondB2)
-            ismin = Math.min(ismin, shunSecondA2, shunSecondB2);
+                        ismin = Math.min(ismin, shunSecondA2, shunSecondB2)
-            break;
+                        break
                     case 3:
-            const shunFirstA3 = shunData[shun][iphasic * step + 1] * xishu;
+                        const shunFirstA3 = shunData[shun][iphasic * step + 1] * xishu
-            const shunFirstB3 = shunData[shun][iphasic * step + 2] * xishu;
+                        const shunFirstB3 = shunData[shun][iphasic * step + 2] * xishu
-            const shunFirstC3 = shunData[shun][iphasic * step + 3] * xishu;
+                        const shunFirstC3 = shunData[shun][iphasic * step + 3] * xishu
-            shunshiFA.push([shunData[shun][0], shunFirstA3]);
+                        shunshiFA.push([shunData[shun][0], shunFirstA3])
-            shunshiFB.push([shunData[shun][0], shunFirstB3]);
+                        shunshiFB.push([shunData[shun][0], shunFirstB3])
-            shunshiFC.push([shunData[shun][0], shunFirstC3]);
+                        shunshiFC.push([shunData[shun][0], shunFirstC3])
-            ifmax = Math.max(ifmax, shunFirstA3, shunFirstB3, shunFirstC3);
+                        ifmax = Math.max(ifmax, shunFirstA3, shunFirstB3, shunFirstC3)
-            ifmin = isOpen ? Math.min(ifmin, shunFirstA3, shunFirstC3) : Math.min(ifmin, shunFirstA3, shunFirstB3, shunFirstC3);
+                        ifmin = isOpen
+                            ? Math.min(ifmin, shunFirstA3, shunFirstC3)
+                            : Math.min(ifmin, shunFirstA3, shunFirstB3, shunFirstC3)
 
-            const shunSecondA3 = shunData[shun][iphasic * step + 1];
+                        const shunSecondA3 = shunData[shun][iphasic * step + 1]
-            const shunSecondB3 = shunData[shun][iphasic * step + 2];
+                        const shunSecondB3 = shunData[shun][iphasic * step + 2]
-            const shunSecondC3 = shunData[shun][iphasic * step + 3];
+                        const shunSecondC3 = shunData[shun][iphasic * step + 3]
-            shunshiSA.push([shunData[shun][0], shunSecondA3]);
+                        shunshiSA.push([shunData[shun][0], shunSecondA3])
-            shunshiSB.push([shunData[shun][0], shunSecondB3]);
+                        shunshiSB.push([shunData[shun][0], shunSecondB3])
-            shunshiSC.push([shunData[shun][0], shunSecondC3]);
+                        shunshiSC.push([shunData[shun][0], shunSecondC3])
-            ismax = Math.max(ismax, shunSecondA3, shunSecondB3, shunSecondC3);
+                        ismax = Math.max(ismax, shunSecondA3, shunSecondB3, shunSecondC3)
-            ismin = isOpen ? Math.min(ismin, shunSecondA3, shunSecondC3) : Math.min(ismin, shunSecondA3, shunSecondB3, shunSecondC3);
+                        ismin = isOpen
-            break;
+                            ? Math.min(ismin, shunSecondA3, shunSecondC3)
+                            : Math.min(ismin, shunSecondA3, shunSecondB3, shunSecondC3)
+                        break
                 }
             }
         }
 
-    const instantF = { max: ifmax, min: ifmin };
+        const instantF = { max: ifmax, min: ifmin }
-    const instantS = { max: ismax, min: ismin };
+        const instantS = { max: ismax, min: ismin }
-    const shunshiF = { shunshiFA, shunshiFB, shunshiFC };
+        const shunshiF = { shunshiFA, shunshiFB, shunshiFC }
-    const shunshiS = { shunshiSA, shunshiSB, shunshiSC };
+        const shunshiS = { shunshiSA, shunshiSB, shunshiSC }
-    const title = { aTitle, bTitle, cTitle, unit };
+        const title = { aTitle, bTitle, cTitle, unit }
 
-    return { instantF, instantS, shunshiF, shunshiS, title, unit };
+        return { instantF, instantS, shunshiF, shunshiS, title, unit }
-  };
+    }
 
     // 处理标题
-  let titles = '';
+    let titles = ''
     if (boxoList.systemType == 'pms') {
-    titles = '变电站名称：' +
+        titles =
+            '变电站名称：' +
             boxoList.powerStationName +
             ' 监测点名称：' +
             boxoList.measurementPointName +
@@ -124,9 +135,10 @@ self.addEventListener('message', function(e) {
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.duration +
-      's';
+            's'
     } else if (boxoList.systemType == 'ZL') {
-    titles = ' 监测点名称：' +
+        titles =
+            ' 监测点名称：' +
             boxoList.equipmentName +
             ' 发生时刻：' +
             boxoList.startTime +
@@ -134,9 +146,21 @@ self.addEventListener('message', function(e) {
             boxoList.evtParamVVaDepth +
             ' 持续时间：' +
             boxoList.evtParamTm +
-      's';
+            's'
+    } else if (boxoList.systemType == 'YPT') {
+        titles =
+            ' 监测点名称：' +
+            boxoList.lineName +
+            ' 发生时刻：' +
+            boxoList.startTime +
+            ' 残余电压：' +
+            (boxoList.featureAmplitude * 100).toFixed(2) +
+            '% 持续时间：' +
+            boxoList.persistTime +
+            's'
     } else {
-    titles = '变电站名称：' +
+        titles =
+            '变电站名称：' +
             boxoList.subName +
             ' 监测点名称：' +
             boxoList.lineName +
@@ -146,25 +170,25 @@ self.addEventListener('message', function(e) {
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.duration +
-      's';
+            's'
     }
 
-  const iphasicValue = wp.iphasic || 1;
+    const iphasicValue = wp.iphasic || 1
-  const picCounts = (wp.waveTitle.length - 1) / iphasicValue;
+    const picCounts = (wp.waveTitle.length - 1) / iphasicValue
-  const waveDatas = [];
+    const waveDatas = []
 
     for (let i = 0; i < picCounts; i++) {
-    const data = fliteWaveData(wp, i);
+        const data = fliteWaveData(wp, i)
-    waveDatas.push(data);
+        waveDatas.push(data)
     }
 
-  const time = wp.time;
+    const time = wp.time
-  const type = wp.waveType;
+    const type = wp.waveType
-  let severity = wp.yzd;
+    let severity = wp.yzd
 
     if (severity < 0) {
-    severity = '/';
+        severity = '/'
-    type = '/';
+        type = '/'
     }
 
     // 将处理结果发送回主线程
@@ -175,5 +199,5 @@ self.addEventListener('message', function(e) {
         severity,
         titles,
         iphasic: iphasicValue
-  });
+    })
-});
+})

src/components/echarts/shushiboxi.vue

@@ -1,7 +1,6 @@
 <template>
-    <div v-loading="loading" :element-loading-background="'rgba(122, 122, 122, 0.8)'" class="boxbx"
+    <div v-loading="loading" class="boxbx" style="position: relative; height: 100%">
-        style="position: relative;height: 100%;">
+        <div id="boxsj">
-        <div id="boxsj" style="background: #343849c7">
             <div id="shushi" :style="`height:${vh};overflow: hidden;`">
                 <div class="bx" id="wave"></div>
             </div>
@@ -14,9 +13,10 @@ import { ref, computed, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
 import html2canvas from 'html2canvas'
 import $ from 'jquery'
 import * as echarts from 'echarts'
+import { mainHeight } from '@/utils/layout'
 import url from '@/assets/img/point.png'
 // 创建Worker
-let waveDataWorker: Worker | null = null;
+let waveDataWorker: Worker | null = null
 interface WaveData {
     instantF: { max: number; min: number }
     instantS: { max: number; min: number }
@@ -42,7 +42,7 @@ interface WaveData {
 interface Props {
     value?: number
     flag?: string | number | boolean
-    parentHeight?: string | number | boolean
+    parentHeight?: any
     DColor?: boolean
     boxoList?: any
     wp?: any
@@ -87,29 +87,44 @@ const myChartess4 = ref<echarts.ECharts | null>(null)
 const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
-    if (props.flag == 1) {
+    if (props.parentHeight == 999) {
-        return '690px'
-    } else if (props.parentHeight != 0) {
         return '310px'
-    } else {
+    } else if (props.parentHeight != 0) {
-        return '350px'
+        return mainHeight(props.parentHeight, 2).height
     }
+
+    if (props.flag == 1) {
+        return mainHeight(200).height
+    } else {
+        return mainHeight(200, 2).height
+    }
+
+    // if (props.flag == 1) {
+    //     return '690px'
+    // } else if (props.parentHeight != 0) {
+    //     return '310px'
+    // } else {
+    //     return '350px'
+    // }
 })
 
 const vw = computed(() => '100%')
 
-watch(() => props.value, (newVal) => {
+watch(
+    () => props.value,
+    newVal => {
         if (newVal == 2) {
             initWaves()
         } else {
             $('#wave1').remove()
             initWaves()
         }
-})
+    }
+)
 
 onMounted(() => {
-    const zoomValue = document.body.style.getPropertyValue('zoom');
+    const zoomValue = document.body.style.getPropertyValue('zoom')
-    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1);
+    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
 
     window.addEventListener('resize', handleResize)
     nextTick(() => {
@@ -120,27 +135,27 @@ onMounted(() => {
 })
 
 onBeforeUnmount(() => {
-    console.log('组件卸载');
+    console.log('组件卸载')
 
     if (waveDataWorker) {
-        waveDataWorker.terminate();
+        waveDataWorker.terminate()
-        waveDataWorker = null;
+        waveDataWorker = null
     }
 
-    backbxlb();
+    backbxlb()
-    window.removeEventListener('resize', handleResize);
+    window.removeEventListener('resize', handleResize)
 })
 
 const handleResize = () => {
-    const zoomValue = document.body.style.getPropertyValue('zoom');
+    const zoomValue = document.body.style.getPropertyValue('zoom')
-    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1);
+    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
 }
 
 const download = () => {
     const boxsj = document.getElementById('boxsj')
     if (boxsj) {
         html2canvas(boxsj, {
-            scale: 2,
+            scale: 2
         }).then(function (canvas) {
             const creatIMg = document.createElement('a')
             creatIMg.download = '瞬间波形.png'
@@ -170,49 +185,56 @@ const waveData = (instantF: any, instantS: any, shunshiF: any, shunshiS: any, ti
 // 在组件中修改initWaves函数
 const initWaves = () => {
     if (props.wp) {
-        loading.value = true;
+        loading.value = true
         iphasic.value = props.wp.iphasic || 1
         // 使用Web Worker处理数据
         if (!waveDataWorker) {
-            waveDataWorker = new Worker(new URL('./shuWorker.js', import.meta.url));
+            waveDataWorker = new Worker(new URL('./shuWorker.js', import.meta.url))
 
             waveDataWorker.onmessage = function (e) {
-                const data = e.data;
+                const data = e.data
 
-                titles.value = data.titles;
+                titles.value = data.titles
-                iphasic.value = data.iphasic;
+                iphasic.value = data.iphasic
-                time.value = data.time;
+                time.value = data.time
-                type.value = data.type;
+                type.value = data.type
-                severity.value = data.severity;
+                severity.value = data.severity
 
-                initWave(data.waveDatas, data.time, data.type, data.severity, isOpen.value);
+                initWave(data.waveDatas, data.time, data.type, data.severity, isOpen.value)
 
-                loading.value = false;
+                loading.value = false
-            };
+            }
 
             waveDataWorker.onerror = function (error) {
-                console.error('Worker error:', error);
+                console.error('Worker error:', error)
-                loading.value = false;
+                loading.value = false
                 // 备用方案：在主线程处理数据
                 // processDataInMainThread();
-            };
+            }
         }
 
         // 发送数据到Worker
-        waveDataWorker.postMessage(JSON.stringify({
+        waveDataWorker.postMessage(
+            JSON.stringify({
                 wp: props.wp,
                 value: props.value,
                 iphasic: iphasic.value,
                 isOpen: isOpen.value,
                 boxoList: props.boxoList
-        }));
+            })
+        )
     } else {
-        initWave(null, null, null, null, null);
+        initWave(null, null, null, null, null)
     }
 }
 
-
+const initWave = (
-const initWave = (waveDatas: WaveData[] | null, time: string | null, type: string | null, severity: string | null, isOpen: boolean | null) => {
+    waveDatas: WaveData[] | null,
+    time: string | null,
+    type: string | null,
+    severity: string | null,
+    isOpen: boolean | null
+) => {
     $('div.bx1').remove()
 
     let picHeight = vh.value
@@ -221,9 +243,14 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
     let cu: number[][] = []
     let titleText = ''
     let unit = ''
-    let max: any = 0, min: any = 0
+    let max: any = 0,
-    let a: string | null = null, b: string | null = null, c: string | null = null
+        min: any = 0
-    let adata: number[][] = [], bdata: number[][] = [], cdata: number[][] = []
+    let a: string | null = null,
+        b: string | null = null,
+        c: string | null = null
+    let adata: number[][] = [],
+        bdata: number[][] = [],
+        cdata: number[][] = []
     const colors: string[] = []
 
     if (!waveDatas) {
@@ -249,7 +276,7 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                     min = waveDatas[0].instantS.min
                     adata = waveDatas[0].shunshiS.shunshiSA
                 }
-                colors.push('#DAA520', '#fff', '#fff')
+                colors.push('#DAA520', '#000', '#000')
                 break
             case 2:
                 a = waveDatas[0].title.aTitle
@@ -267,7 +294,7 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                     adata = waveDatas[0].shunshiS.shunshiSA
                     bdata = waveDatas[0].shunshiS.shunshiSB
                 }
-                colors.push('#DAA520', '#2E8B57', '#fff')
+                colors.push('#DAA520', '#2E8B57', '#000')
                 break
             case 3:
                 a = waveDatas[0].title.aTitle
@@ -307,14 +334,34 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             $(`#${waveId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(Number(eventValue.value) * 1).toFixed(0)}% 持续时间：${persistTime.value}s`
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+            Number(eventValue.value) * 1
+        ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }
 
     const wave = document.getElementById('wave')
     if (!wave) return
 
     const myChartes = echarts.init(wave)
-    const echartsColor = { WordColor: "#fff", thread: "#fff", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
+    const echartsColor = {
+        WordColor: '#000',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
 
     setTimeout(() => {
         wave.style.width = '100%'
@@ -335,7 +382,12 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
                 let tips = '时刻:' + params[0].data[0] + '</br/>'
                 for (let i = 0; i < params.length; i++) {
                     if (params[i].seriesName != '暂降触发点') {
-                        tips += params[i].marker + params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '<br/>'
+                        tips +=
+                            params[i].marker +
+                            params[i].seriesName +
+                            ':' +
+                            (params[i].value[1] - 0).toFixed(2) +
+                            '<br/>'
                     }
                 }
                 return tips
@@ -353,8 +405,8 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             left: 'center',
             text: titleText,
             textStyle: {
-                fontSize: '0.8rem',
+                fontSize: '16px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             }
         },
         legend: {
@@ -364,8 +416,8 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             enabled: true,
             itemDistance: 5,
             textStyle: {
-                fontSize: '0.6rem',
+                fontSize: 12,
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 rich: { a: { verticalAlign: 'middle' } },
                 padding: [0, 0, 0, 0]
             }
@@ -390,24 +442,24 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             title: {
                 text: 'ms',
                 textStyle: {
-                    fontSize: '0.6rem',
+                    fontSize: '12px',
-                    color: props.DColor ? '#fff' : echartsColor.WordColor
+                    color: props.DColor ? '#000' : echartsColor.WordColor
                 },
                 enabled: true,
                 align: 'high'
             },
             splitLine: { show: false },
-            nameTextStyle: { fontSize: '0.6rem' },
+            nameTextStyle: { fontSize: '12px' },
             axisTick: { alignWithLabel: true },
             axisLine: {
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     if (valA.value != (value - 0).toFixed(0)) {
                         valA.value = Number((value - 0).toFixed(0))
@@ -433,26 +485,26 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
             min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
             opposite: false,
             nameTextStyle: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             },
             axisLine: {
                 show: true,
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     return (value - 0).toFixed(2)
                 }
             },
             splitLine: {
                 lineStyle: {
-                    color: [props.DColor ? '#fff' : echartsColor.thread],
+                    color: [props.DColor ? '#000' : echartsColor.thread],
                     type: 'dashed',
                     opacity: 0.5
                 }
@@ -460,9 +512,9 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
         },
         grid: {
             left: '1%',
-            right: '2.8%',
+            right: '45px',
             bottom: '40px',
-            top: '70px',
+            top: '60px',
             containLabel: true
         },
         dataZoom: [
@@ -537,23 +589,36 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin
     }
 }
 
-const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show: boolean, myChartes1: echarts.ECharts, title: string) => {
+const drawPics = (
+    waveDataTemp: WaveData,
+    picHeight: string,
+    step: number,
+    show: boolean,
+    myChartes1: echarts.ECharts,
+    title: string
+) => {
     step = step + 1
     const waveId = 'wave' + step
-    let a: string | null = null, b: string | null = null, c: string | null = null
+    let a: string | null = null,
-    let max: any = 0, min: any = 0, unit = ''
+        b: string | null = null,
-    let adata: number[][] = [], bdata: number[][] = [], cdata: number[][] = []
+        c: string | null = null
+    let max: any = 0,
+        min: any = 0,
+        unit = ''
+    let adata: number[][] = [],
+        bdata: number[][] = [],
+        cdata: number[][] = []
     const colors: string[] = []
 
     switch (iphasic.value) {
         case 1:
             a = waveDataTemp.title.aTitle
-            colors.push('#DAA520', '#fff', '#fff')
+            colors.push('#DAA520', '#000', '#000')
             break
         case 2:
             a = waveDataTemp.title.aTitle
             b = waveDataTemp.title.bTitle
-            colors.push('#DAA520', '#2E8B57', '#fff')
+            colors.push('#DAA520', '#2E8B57', '#000')
             break
         case 3:
             a = waveDataTemp.title.aTitle
@@ -612,7 +677,25 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
     if (!waveIds) return
 
     const myChartes = echarts.init(waveIds)
-    const echartsColor = { WordColor: "#fff", thread: "#fff", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
+    const echartsColor = {
+        WordColor: '#000',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
 
     const option = {
         tooltip: {
@@ -640,8 +723,8 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             left: 'center',
             text: '', //titlename || title,
             textStyle: {
-                fontSize: '0.8rem',
+                fontSize: '16px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             }
         },
         legend: {
@@ -651,8 +734,8 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             enabled: true,
             itemDistance: 5,
             textStyle: {
-                fontSize: '0.6rem',
+                fontSize: 12,
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 rich: { a: { verticalAlign: 'middle' } },
                 padding: [0, 0, 0, 0]
             }
@@ -666,8 +749,8 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             title: {
                 text: 'ms',
                 textStyle: {
-                    fontSize: '0.6rem',
+                    fontSize: '12px',
-                    color: props.DColor ? '#fff' : echartsColor.WordColor
+                    color: props.DColor ? '#000' : echartsColor.WordColor
                 },
                 enabled: true,
                 align: 'high'
@@ -676,14 +759,14 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             axisTick: { alignWithLabel: true },
             axisLine: {
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
-            nameTextStyle: { fontSize: '0.6rem' },
+            nameTextStyle: { fontSize: '12px' },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     if (valB.value != (value - 0).toFixed(0)) {
                         valB.value = Number((value - 0).toFixed(0))
@@ -709,26 +792,26 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
             min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
             opposite: false,
             nameTextStyle: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor
+                color: props.DColor ? '#000' : echartsColor.WordColor
             },
             axisLine: {
                 show: true,
                 lineStyle: {
-                    color: props.DColor ? '#fff' : echartsColor.thread
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
                 onZero: false
             },
             axisLabel: {
-                fontSize: '0.6rem',
+                fontSize: '12px',
-                color: props.DColor ? '#fff' : echartsColor.WordColor,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
                     return (value - 0).toFixed(2)
                 }
             },
             splitLine: {
                 lineStyle: {
-                    color: [props.DColor ? '#fff' : echartsColor.thread],
+                    color: [props.DColor ? '#000' : echartsColor.thread],
                     type: 'dashed',
                     opacity: 0.5
                 }
@@ -736,9 +819,9 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
         },
         grid: {
             left: '1%',
-            right: '2.8%',
+            right: '45px',
             bottom: '40px',
-            top: '70px',
+            top: '60px',
             containLabel: true
         },
         dataZoom: [
@@ -793,11 +876,21 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
     myChartes.setOption(option)
 
     switch (step) {
-        case 1: myChartess1.value = myChartes; break
+        case 1:
-        case 2: myChartess2.value = myChartes; break
+            myChartess1.value = myChartes
-        case 3: myChartess3.value = myChartes; break
+            break
-        case 4: myChartess4.value = myChartes; break
+        case 2:
-        case 5: myChartess5.value = myChartes; break
+            myChartess2.value = myChartes
+            break
+        case 3:
+            myChartess3.value = myChartes
+            break
+        case 4:
+            myChartess4.value = myChartes
+            break
+        case 5:
+            myChartess5.value = myChartes
+            break
     }
 
     setTimeout(() => {
@@ -810,7 +903,14 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show:
 
 const backbxlb = () => {
     waveDatas.value = []
-    const charts = [myChartess.value, myChartess1.value, myChartess2.value, myChartess3.value, myChartess4.value, myChartess5.value]
+    const charts = [
+        myChartess.value,
+        myChartess1.value,
+        myChartess2.value,
+        myChartess3.value,
+        myChartess4.value,
+        myChartess5.value
+    ]
 
     charts.forEach(chart => {
         if (chart) {
@@ -826,13 +926,11 @@ const backbxlb = () => {
     myChartess5.value = null
 
     // echarts.disconnect(charts.filter(Boolean) as echarts.ECharts[])
-    charts
+    charts.filter(Boolean).forEach(chart => {
-        .filter(Boolean)
-        .forEach(chart => {
         if (chart && typeof chart.dispose === 'function') {
-                chart.dispose();
+            chart.dispose()
         }
-        });
+    })
 }
 
 const getMax = (temp: number, tempA: number, tempB: number, tempC: number): number => {

src/components/form/datePicker/index.vue

@@ -7,7 +7,6 @@
         >
             <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-
         <el-date-picker
             v-model.trim="timeValue"
             type="daterange"
@@ -99,9 +98,28 @@ onMounted(() => {
     if (props.initialTimeValue) {
         timeValue.value = props.initialTimeValue
     }
+
+    nextTick(() => {
+        // 初始化时检查按钮状态
+        checkInitialButtonStatus()
+    })
+
     timeChange(3)
 })
 
+// 添加初始化按钮状态检查方法
+const checkInitialButtonStatus = () => {
+    if (timeValue.value && timeValue.value.length >= 2) {
+        const endTime = timeValue.value[1]
+        const currentDate = window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
+
+        // 如果结束时间小于当前日期，则不禁用"下一个"按钮
+        if (new Date(endTime + ' 00:00:00').getTime() < new Date(currentDate + ' 00:00:00').getTime()) {
+            preDisabled.value = false
+        }
+    }
+}
+
 // 添加统一的事件触发方法
 const emitChange = () => {
     nextTick(() => {
@@ -115,11 +133,9 @@ const emitChange = () => {
 // 选择时间范围
 const timeChange = (e: number) => {
     backDisabled.value = false
-    preDisabled.value = true
     count.value = 0
     if (e == 1) {
         disabledPicker.value = true
-
         timeValue.value = [setTime(1), setTime()]
     } else if (e == 2) {
         disabledPicker.value = true
@@ -140,7 +156,6 @@ const timeChange = (e: number) => {
     } else if (e == 5) {
         disabledPicker.value = false
         backDisabled.value = true
-        preDisabled.value = true
         timeValue.value = [setTime(), setTime()]
     }
     if (e == 1 || e == 2) {
@@ -148,10 +163,31 @@ const timeChange = (e: number) => {
     } else {
         timeFlag.value = 1
     }
+
+    // 检查按钮状态
+    checkButtonStatus()
+
     // 触发 change 事件
     emitChange()
 }
 
+// 添加按钮状态检查方法
+const checkButtonStatus = () => {
+    if (timeValue.value && timeValue.value.length >= 2) {
+        const endTime = timeValue.value[1]
+        const currentDate = window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
+
+        // 如果结束时间大于等于当前日期，且 nextFlag 为 false，则禁用"下一个"按钮
+        if (!props.nextFlag) {
+            if (new Date(endTime + ' 00:00:00').getTime() >= new Date(currentDate + ' 00:00:00').getTime()) {
+                preDisabled.value = true
+            } else {
+                preDisabled.value = false
+            }
+        }
+    }
+}
+
 // 当前
 const nowTime = () => {
     // console.log(interval.value, '000000000')

src/components/table/header/index.vue

@@ -88,6 +88,7 @@ interface Props {
     theCurrentTime?: boolean //控制时间前3天展示上个月时间
     showReset?: boolean //是否显示重置
     showExport?: boolean //导出控制
+    timeCacheFlag?: boolean //是否取缓存时间
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -97,7 +98,8 @@ const props = withDefaults(defineProps<Props>(), {
     nextFlag: false,
     theCurrentTime: true,
     showReset: true,
-    showExport: false
+    showExport: false,
+    timeCacheFlag: true
 })
 
 // 处理 DatePicker 值变化事件
@@ -134,7 +136,7 @@ onMounted(() => {
     if (props.datePicker && datePickerRef.value) {
         // 从缓存中获取值并设置
         const cached = timeCacheStore.getCache(route.path)
-        if (cached) {
+        if (props.timeCacheFlag && cached) {
             if (cached.interval !== undefined) {
                 datePickerRef.value.setInterval(cached.interval)
             }

src/layouts/admin/index.vue

@@ -85,6 +85,7 @@ const init = async () => {
         handleAdminRoute(res.data)
         if (route.params.to) {
             const lastRoute = JSON.parse(route.params.to as string)
+
             if (lastRoute.path != adminBaseRoutePath) {
                 let query = !isEmpty(lastRoute.query) ? lastRoute.query : {}
                 routePush({ path: lastRoute.path, query: query })

src/utils/pageBubble.ts

@@ -17,7 +17,7 @@ const bubble: {
     ctx: {},
     circles: [],
     animate: true,
-    requestId: null,
+    requestId: null
 }
 
 export const init = function (): void {
@@ -76,7 +76,7 @@ class Circle {
     constructor() {
         this.pos = {
             x: Math.random() * bubble.width,
-            y: bubble.height + Math.random() * 100,
+            y: bubble.height + Math.random() * 100
         }
         this.alpha = 0.1 + Math.random() * 0.3
         this.scale = 0.1 + Math.random() * 0.3
@@ -84,6 +84,16 @@ class Circle {
         this.draw = function () {
             this.pos.y -= this.velocity
             this.alpha -= 0.0005
+            // 当气泡超出顶部或透明度为 0 时，重置位置和属性
+            if (this.pos.y < -10 || this.alpha < 0) {
+                this.pos = {
+                    x: Math.random() * bubble.width,
+                    y: bubble.height + Math.random() * 100
+                }
+                this.alpha = 0.1 + Math.random() * 0.35
+                this.scale = 0.1 + Math.random() * 0.35
+                this.velocity = Math.random()
+            }
             bubble.ctx.beginPath()
             bubble.ctx.arc(this.pos.x, this.pos.y, this.scale * 10, 0, 2 * Math.PI, false)
             bubble.ctx.fillStyle = 'rgba(255,255,255,' + this.alpha + ')'

src/utils/request.ts

@@ -66,7 +66,9 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                 !(
                     config.url == '/system-boot/file/upload' ||
                     config.url == '/harmonic-boot/grid/getAssessOverview' ||
-                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData'
+                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
+                    config.url == '/cs-device-boot/csline/list' ||
+                    config.url == '/cs-harmonic-boot/pqSensitiveUser/getListByIds'
                 )
             )
                 removePending(config)

src/utils/router.ts

@@ -10,7 +10,7 @@ import { compact, isEmpty, reverse } from 'lodash-es'
 import { isAdminApp } from '@/utils/common'
 import { getRouteMenu, dictDataCache } from '@/api/auth'
 import { adminBaseRoutePath } from '@/router/static'
-const route = useRouter()
+const route:any = useRouter()
 /**
  * 导航失败有错误消息的路由push
  * @param to — 导航位置，同 router.push

src/utils/tableStore.ts

@@ -52,7 +52,7 @@ export default class TableStore {
         beforeSearchFun: null,
         height: '',
         publicHeight: 0,
-        filename: '',
+        filename: ''
     })
 
     constructor(public options: TableStoreParams) {
@@ -98,10 +98,14 @@ export default class TableStore {
                     this.table.data = []
                     this.table.total = 0
                 }
+                // 只有当 this.table.data 是数组时才执行 filtration 处理
+                if (Array.isArray(this.table.data)) {
                     this.table.copyData = filtration(this.table.data)
+                }
                 if (Array.isArray(res)) {
                     this.table.data = res
                 }
+
                 if (this.isWebPaging) {
                     this.table.webPagingData = window.XEUtils.chunk(this.table.data, this.table.params.pageSize)
                     this.table.data = this.table.webPagingData[this.table.params.pageNum - 1]
@@ -109,7 +113,6 @@ export default class TableStore {
 
                 this.table.loadCallback && this.table.loadCallback()
                 this.table.loading = false
-
             })
             .catch(() => {
                 this.table.loading = false
@@ -145,7 +148,6 @@ export default class TableStore {
                 'selection-change',
                 () => {
                     this.table.selection = data as TableRow[]
-                    
                 }
             ],
             [

src/views/auth/userList/index.vue

@@ -107,7 +107,7 @@ const tableStore = new TableStore({
                         return row.state !== 1
                     },
                     click: row => {
-                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
+                        ElMessageBox.prompt('二次校验密码确认', '修改密码', {
                             confirmButtonText: '确认',
                             cancelButtonText: '取消',
                             inputType: 'password'

src/views/auth/userList/popupPwd.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog width=“500px” v-model.trim="dialogVisible" title="修改密码">
+    <el-dialog width='500px' draggable v-model.trim="dialogVisible" title="修改密码">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" class="form-one" :rules="rules" ref="formRef">
                 <el-form-item label="新密码" prop="newPwd">

src/views/govern/device/control/index.vue

@@ -729,7 +729,7 @@ const handleHarmonicSpectrum = async () => {
     // }
     realTimeFlag.value = false
     sonTab.value = 2
-    harmonicSpectrumRef.value && harmonicSpectrumRef.value.resetData()
+    harmonicSpectrumRef.value && harmonicSpectrumRef.value.resetData(formInline.dataLevel)
     // getRealDataMqttMsg()
     await getBasicRealData(lineId.value).then((res: any) => {
         if (res.code == 'A0000') {
@@ -991,35 +991,37 @@ const getRealDataMqttMsg = async () => {
                     //如果消息返回值是二次值，下拉框是二次值只需要单位换算 除以1000
                     //如果消息返回值是一次值，下拉框是一次值只需要单位换算 除以1000
                     if (obj.dataLevel == formInline.dataLevel) {
+          
                         obj = {
                             ...obj,
                             // 电压有效值
-                            vRmsA: obj.vRmsA / 1000,
+                            vRmsA: obj.vRmsA ,
-                            vRmsB: obj.vRmsB / 1000,
+                            vRmsB: obj.vRmsB ,
-                            vRmsC: obj.vRmsC / 1000,
+                            vRmsC: obj.vRmsC ,
                             //基波电压幅值
-                            v1A: obj.v1A / 1000,
+                            v1A: obj.v1A ,
-                            v1B: obj.v1B / 1000,
+                            v1B: obj.v1B ,
-                            v1C: obj.v1C / 1000,
+                            v1C: obj.v1C ,
                             //有功功率
-                            pA: obj.pA / 1000,
+                            pA: obj.pA ,
-                            pB: obj.pB / 1000,
+                            pB: obj.pB ,
-                            pC: obj.pC / 1000,
+                            pC: obj.pC ,
-                            pTot: obj.pTot / 1000,
+                            pTot: obj.pTot ,
                             //无功功率
-                            qA: obj.qA / 1000,
+                            qA: obj.qA ,
-                            qB: obj.qB / 1000,
+                            qB: obj.qB ,
-                            qC: obj.qC / 1000,
+                            qC: obj.qC ,
-                            qTot: obj.qTot / 1000,
+                            qTot: obj.qTot ,
                             //视在功率
-                            sA: obj.sA / 1000,
+                            sA: obj.sA ,
-                            sB: obj.sB / 1000,
+                            sB: obj.sB ,
-                            sC: obj.sC / 1000,
+                            sC: obj.sC ,
-                            sTot: obj.sTot / 1000
+                            sTot: obj.sTot 
                         }
                     }
                     //如果消息返回值是二次值，下拉框是一次值需要单位换算 除以1000 并且乘以pt ct
                     if (obj.dataLevel == 'Secondary' && formInline.dataLevel == 'Primary') {
+                        
                         obj = {
                             ...obj,
                             // 电压有效值
@@ -1102,7 +1104,7 @@ const getRealDataMqttMsg = async () => {
                         mqttMessage.value = obj
                     
                         //更新实时数据主页面值
-                        realTimeFlag.value && realTimeRef.value && realTimeRef.value.setRealData(mqttMessage.value)
+                        realTimeFlag.value && realTimeRef.value && realTimeRef.value.setRealData(mqttMessage.value,formInline.dataLevel)
                         tableLoading.value = false
                         //更新实时趋势折线图数据
                         if (sonTab.value == 2) {

src/views/govern/device/control/tabs/components/harmonicSpectrum.vue

@@ -144,7 +144,8 @@ let height: any = mainHeight(275).height
 const loading = ref(false)
 const allDataList: any = ref([])
 const xAixsTimeList: any = ref([])
-const resetData = () => {
+
+const resetData = (dataLevel: string) => {
     loading.value = true
     indexOptions.value = [
         {
@@ -155,7 +156,7 @@ const resetData = () => {
                 { name: 'vRmsB', phase: 'B相', data: [], yMethodList: [] },
                 { name: 'vRmsC', phase: 'C相', data: [], yMethodList: [] }
             ],
-            unit: 'kV',
+            unit: dataLevel === 'Primary' ? 'kV' : 'V',
             data: [],
             yMethodList: []
         },
@@ -180,7 +181,7 @@ const resetData = () => {
                 { name: 'pC', phase: 'C相', data: [], yMethodList: [] },
                 { name: 'pTot', phase: '总', data: [], yMethodList: [] }
             ],
-            unit: 'kW',
+            unit: dataLevel === 'Primary' ? 'kW' : 'W',
             data: [],
             yMethodList: []
         },
@@ -193,7 +194,7 @@ const resetData = () => {
                 { name: 'qC', phase: 'C相', data: [], yMethodList: [] },
                 { name: 'qTot', phase: '总', data: [], yMethodList: [] }
             ],
-            unit: 'kW',
+            unit: dataLevel === 'Primary' ? 'kVar' : 'Var',
             data: [],
             yMethodList: []
         },
@@ -206,7 +207,7 @@ const resetData = () => {
                 { name: 'v1B', phase: 'B相', data: [], yMethodList: [] },
                 { name: 'v1C', phase: 'C相', data: [], yMethodList: [] }
             ],
-            unit: 'kV',
+            unit: dataLevel === 'Primary' ? 'kV' : 'V',
             data: [],
             yMethodList: []
         },
@@ -255,9 +256,10 @@ const resetData = () => {
     allDataList.value = []
     xAixsTimeList.value = []
 }
-resetData()
+resetData('Primary')
 const mqttMessage: any = ref()
 const setHarmonicSpectrumData = (val: any) => {
+   
     mqttMessage.value = val
     init()
 }
@@ -307,7 +309,6 @@ const init = () => {
         //循环渲染图表
         const refName = setChildRef(index)
         childRefs[refName] = ref(null) // 初始化ref
-
         item.echartsData = {
             title: {
                 text: item.name

src/views/govern/device/control/tabs/components/waveFormAnalysis.vue

@@ -16,24 +16,34 @@
             <el-radio-group v-model.trim="theTypeOfValue" @change="changeView">
                 <el-radio-button label="一次值" :value="1" />
                 <el-radio-button label="二次值" :value="2" />
-
             </el-radio-group>
 
             <el-button @click="handleBack" :icon="Back">返回</el-button>
-
         </div>
-        <el-tabs class="home_body" type="border-card" v-model.trim="activeName1" @tab-click="handleClick"
+        <el-tabs
-            v-loading="loading">
+            class="home_body"
-
+            type="border-card"
-            <el-tab-pane label="瞬时波形" name="ssbx" :style="'height:' + bxecharts + ';overflow-y: scroll;'">
+            v-model.trim="activeName1"
-                <shushiboxi v-if="isWp && wp && activeName == 'ssbx' && showBoxi" :value="value" :boxoList="boxoList"
+            @tab-click="handleClick"
-                    :parentHeight="parentHeight" :wp="wp">
+            v-loading="loading"
-                </shushiboxi>
+        >
+            <el-tab-pane label="瞬时波形" name="ssbx" :style="'height:' + bxecharts + ';overflow-y: auto;'">
+                <shushiboxi
+                    v-if="isWp && wp && activeName == 'ssbx' && showBoxi"
+                    :value="value"
+                    :boxoList="boxoList"
+                    :parentHeight="parentHeight"
+                    :wp="wp"
+                ></shushiboxi>
             </el-tab-pane>
-            <el-tab-pane label="RMS波形" name="rmsbx" :style="'height:' + bxecharts + ';overflow-y: scroll;'">
+            <el-tab-pane label="RMS波形" name="rmsbx" :style="'height:' + bxecharts + ';overflow-y: auto;'">
-                <rmsboxi v-if="isWp && wp && activeName == 'rmsbx' && showBoxi" :value="value" :boxoList="boxoList"
+                <rmsboxi
-                    :parentHeight="parentHeight" :wp="wp">
+                    v-if="isWp && wp && activeName == 'rmsbx' && showBoxi"
-                </rmsboxi>
+                    :value="value"
+                    :boxoList="boxoList"
+                    :parentHeight="parentHeight"
+                    :wp="wp"
+                ></rmsboxi>
             </el-tab-pane>
         </el-tabs>
     </div>
@@ -96,15 +106,12 @@ const wp = ref({})
 const theTypeOfValue = ref(1)
 const value = ref(1)
 
-
 const isWp = ref(false)
 const boxoList: any = ref([])
 const getWpData = (val: any, list: any) => {
     wp.value = val
     isWp.value = true
     boxoList.value = list
-
-    console.log(wp.value, val, 'ggggghhhh')
 }
 const changeView = () => {
     showBoxi.value = false
@@ -131,13 +138,13 @@ const handleClick = (tab: any, event: any) => {
 const handleBack = () => {
     emit('handleHideCharts')
 }
-const setHeight = (h: any, vh: any) => {
+const setHeight = (h: any, vh: any, num = 1) => {
     if (h != false) {
         parentHeight.value = h
     }
 
     setTimeout(() => {
-        bxecharts.value = mainHeight(vh).height
+        bxecharts.value = mainHeight(vh,num).height
     }, 100)
 }
 onMounted(() => {})
@@ -165,7 +172,6 @@ defineExpose({ getWpData, setHeight })
     position: relative;
 
     .home_header {
-
         height: 50px;
         display: flex;
         align-items: center;

src/views/govern/device/control/tabs/realtime.vue

@@ -5,7 +5,7 @@
                 <div class="view_top">
                     <!-- 左侧仪表盘 -->
                     <div class="view_top_left">
-                        <div class="left_charts_title">电压有效值(kV)</div>
+                        <div class="left_charts_title">电压有效值({{ voltageUnit }})</div>
                         <div class="left_charts">
                             <MyEchart :pieInterVal="true" ref="pieChart1" :options="echartsDataV1"></MyEchart>
                         </div>
@@ -45,7 +45,7 @@
         <div class="view_bot">
             <vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
                 :tooltip-config="{ enterable: true }">
-                <vxe-colgroup align="center" title="电压有效值(kV)">
+                <vxe-colgroup align="center" :title="`电压有效值(${voltageUnit})`">
                     <vxe-column align="center" field="vRmsA" title="A相"></vxe-column>
                     <vxe-column align="center" field="vRmsB" title="B相"></vxe-column>
                     <vxe-column align="center" field="vRmsC" title="C相"></vxe-column>
@@ -69,11 +69,11 @@
             <br />
             <vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
                 :tooltip-config="{ enterable: true }">
-                <vxe-column align="center" field="freq" width="140" title="频率(Hz)"></vxe-column>
+                <vxe-column align="center" field="freqDev" width="140" title="频率(Hz)"></vxe-column>
-                <vxe-column align="center" field="freqDev" width="120" title="频率偏差(Hz)"></vxe-column>
+                <vxe-column align="center" field="freq" width="120" title="频率偏差(Hz)"></vxe-column>
                 <vxe-column align="center" width="180" field="vUnbalance" title="电压不平衡度(%)"></vxe-column>
                 <vxe-column align="center" width="180" field="iUnbalance" title="电流不平衡度(%)"></vxe-column>
-                <vxe-colgroup align="center" title="基波电压幅值(kV)">
+                <vxe-colgroup align="center" :title="`基波电压幅值(${voltageUnit})`">
                     <vxe-column align="center" field="v1A" title="A相"></vxe-column>
                     <vxe-column align="center" field="v1B" title="B相"></vxe-column>
                     <vxe-column align="center" field="v1C" title="C相"></vxe-column>
@@ -102,7 +102,7 @@
                     <vxe-column align="center" field="iThdB" title="B相"></vxe-column>
                     <vxe-column align="center" field="iThdC" title="C相"></vxe-column>
                 </vxe-colgroup>
-                <vxe-colgroup align="center" title="有功功率(kW)">
+                <vxe-colgroup align="center" :title="`有功功率(${powerUnit})`">
                     <vxe-column align="center" field="pA" title="A相"></vxe-column>
                     <vxe-column align="center" field="pB" title="B相"></vxe-column>
                     <vxe-column align="center" field="pC" title="C相"></vxe-column>
@@ -112,7 +112,7 @@
             <br />
             <vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
                 :tooltip-config="{ enterable: true }">
-                <vxe-colgroup align="center" title="无功功率(kVar)">
+                <vxe-colgroup align="center" :title="`无功功率(${reactivePowerUnit})`">
                     <vxe-column align="center" field="qA" title="A相"></vxe-column>
                     <vxe-column align="center" field="qB" title="B相"></vxe-column>
                     <vxe-column align="center" field="qC" title="C相">
@@ -122,7 +122,7 @@
                     </vxe-column>
                     <vxe-column align="center" field="qTot" title="总"></vxe-column>
                 </vxe-colgroup>
-                <vxe-colgroup align="center" title="视在功率(kVA)">
+                <vxe-colgroup align="center" :title="`视在功率(${apparentPowerUnit})`">
                     <vxe-column align="center" field="sA" title="A相"></vxe-column>
                     <vxe-column align="center" field="sB" title="B相"></vxe-column>
                     <vxe-column align="center" field="sC" title="C相"></vxe-column>
@@ -170,6 +170,10 @@ const echartsDataV3: any = ref({})
 const echartsDataA1: any = ref({})
 const echartsDataA2: any = ref({})
 const echartsDataA3: any = ref({})
+
+const currentDataLevel = ref('Primary') 
+const previousDataLevel = ref('')
+
 //渲染中间相角图
 const initRadioCharts = () => {
     echartsData1.value = {
@@ -542,7 +546,33 @@ const vRadioList: any = ref([])
 
 const realData = ref<any>({})
 const realList = ref<any>([])
-const setRealData = (val: any) => {
+
+// 计算电压单位
+const voltageUnit = computed(() => {
+  return currentDataLevel.value === 'Primary' ? 'kV' : 'V'
+})
+
+// 计算功率单位
+const powerUnit = computed(() => {
+  return currentDataLevel.value === 'Primary' ? 'kW' : 'W'
+})
+
+// 计算无功功率单位
+const reactivePowerUnit = computed(() => {
+  return currentDataLevel.value === 'Primary' ? 'kVar' : 'Var'
+})
+
+// 计算视在功率单位
+const apparentPowerUnit = computed(() => {
+  return currentDataLevel.value === 'Primary' ? 'kVA' : 'VA'
+})
+
+const setRealData = (val: any,dataLevel:string) => {
+    // 只有当 dataLevel 真正改变时才更新
+    if (dataLevel !== previousDataLevel.value) {
+        currentDataLevel.value = dataLevel
+        previousDataLevel.value = dataLevel
+    }
     realData.value = val
     realList.value = [val]
     initRadioCharts()

src/views/govern/mxgraph/graphList/index.vue

@@ -3,8 +3,12 @@
         <TableHeader>
             <template v-slot:select>
                 <el-form-item label="项目名称">
-                    <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue"
+                    <el-input
-                        placeholder="请输入项目名称"></el-input>
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="tableStore.table.params.searchValue"
+                        placeholder="请输入项目名称"
+                    ></el-input>
                 </el-form-item>
             </template>
             <template v-slot:operation>
@@ -12,45 +16,75 @@
             </template>
         </TableHeader>
         <!-- <Table ref="tableRef" /> -->
-        <div style="overflow-x: hidden; overflow-y: scroll;padding: 0 10px;" v-loading="tableStore.table.loading"
+        <div
-            :style="{ height: tableStore.table.height }">
+            style="overflow-x: hidden; overflow-y: scroll; padding: 0 10px"
+            v-loading="tableStore.table.loading"
+            :style="{ height: tableStore.table.height }"
+        >
             <el-row :gutter="12">
                 <el-col :span="6" v-for="item in tableStore.table.data" :key="item.id" class="mt10">
                     <el-card class="box-card" @click="querdata(item)" shadow="hover">
                         <div slot="header" class="clearfix">
-                            <span style="display: flex;align-items: center">{{ item.name }}
+                            <span style="display: flex; align-items: center">
+                                {{ item.name }}
 
                                 <el-tooltip class="item" effect="dark" content="修改项目" placement="top">
-                                    <Edit style="margin-left: 5px;width: 16px;" class=" xiaoshou color"
+                                    <Edit
-                                        @click="editd(item)" />
+                                        style="margin-left: 5px; width: 16px"
-                                </el-tooltip></span>
+                                        class="xiaoshou color"
-                            <div style="display: flex;justify-content: end;">
+                                        @click="editd(item)"
-                                <el-button class="color" icon="el-icon-Share" style="padding: 3px 0" type="text"
+                                    />
-                                    @click="Aclick(item)">设计</el-button>
+                                </el-tooltip>
+                            </span>
+                            <div style="display: flex; justify-content: end">
+                                <el-button
+                                    class="color"
+                                    icon="el-icon-Share"
+                                    style="padding: 3px 0"
+                                    type="text"
+                                    @click="Aclick(item)"
+                                >
+                                    设计
+                                </el-button>
                                 <!-- <el-button icon="el-icon-share" style="padding: 3px 0; color: green"
                                     type="text" @click="shejid(item)">设计</el-button> -->
                                 <!-- <el-button icon="el-icon-edit" style="padding: 3px 0; color: blue" type="text"
                                     @click="shejid(item)">编辑</el-button> -->
-                                <el-button icon="el-icon-Delete" style="padding: 3px 0; color: red" type="text"
+                                <el-button
-                                    @click="deleted(item)">删除</el-button>
+                                    icon="el-icon-Delete"
+                                    style="padding: 3px 0; color: red"
+                                    type="text"
+                                    @click="deleted(item)"
+                                >
+                                    删除
+                                </el-button>
                             </div>
                         </div>
-                        <img v-if="item.fileContent"  :src="item.fileContent" class="image xiaoshou" @click="imgData(item)" />
+                        <img
-                        <el-empty v-else description="暂无设计"  style="height: 220px;"/>
+                            v-if="item.fileContent"
+                            :src="item.fileContent"
+                            class="image xiaoshou"
+                            @click="imgData(item)"
+                        />
+                        <el-empty v-else description="暂无设计" style="height: 220px" />
                     </el-card>
                 </el-col>
             </el-row>
         </div>
         <div class="table-pagination">
-            <el-pagination :currentPage="tableStore.table.params!.pageNum"
+            <el-pagination
-                :page-size="tableStore.table.params!.pageSize" :page-sizes="[10, 20, 50, 100]" background
+                :currentPage="tableStore.table.params!.pageNum"
-                :layout="'sizes,total, ->, prev, pager, next, jumper'" :total="tableStore.table.total"
+                :page-size="tableStore.table.params!.pageSize"
-                @size-change="onTableSizeChange" @current-change="onTableCurrentChange"></el-pagination>
+                :page-sizes="[10, 20, 50, 100]"
+                background
+                :layout="'sizes,total, ->, prev, pager, next, jumper'"
+                :total="tableStore.table.total"
+                @size-change="onTableSizeChange"
+                @current-change="onTableCurrentChange"
+            ></el-pagination>
         </div>
 
         <popup ref="popupRef" @submit="tableStore.index()" />
-
-
     </div>
 </template>
 <script setup lang="ts">
@@ -61,9 +95,12 @@ import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import { deleteTopoTemplate, uploadTopo } from '@/api/cs-device-boot/topologyTemplate'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { audit, add } from '@/api/cs-harmonic-boot/mxgraph';
+import { audit, add } from '@/api/cs-harmonic-boot/mxgraph'
 import { Edit } from '@element-plus/icons-vue'
 import popup from './components/popup.vue'
+
+const VITE_FLAG = import.meta.env.VITE_NAME == 'ypt'
+
 defineOptions({
     name: 'mxgraph/graph-list'
 })
@@ -78,11 +115,8 @@ const tableStore = new TableStore({
     url: '/cs-harmonic-boot/csconfiguration/queryPage',
     method: 'POST',
     publicHeight: 60,
-    column: [
+    column: [],
-    ],
+    loadCallback: () => {}
-    loadCallback: () => {
-
-    }
 })
 provide('tableStore', tableStore)
 tableStore.table.params.searchValue = ''
@@ -93,7 +127,6 @@ onMounted(() => {
 })
 // 查询
 const onSubmitadd = () => {
-
     popupRef.value.open({
         title: '新增项目'
     })
@@ -107,45 +140,48 @@ const editd = (e: any) => {
 }
 // 设计
 const Aclick = (e: any) => {
-    window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
+    //window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
-    // window.open('http://192.168.1.128:4001' + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
+    window.open(
- 
+        'http://192.168.1.179:4001' +
+            `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=${VITE_FLAG ? 'ypt' : 'zl'}`
+    )
 }
 // 删除
 const deleted = (e: any) => {
-    ElMessageBox.confirm("此操作将永久删除该项目, 是否继续?", "提示", {
+    ElMessageBox.confirm('此操作将永久删除该项目, 是否继续?', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
     })
         .then(() => {
             let data = {
                 id: e.id,
                 name: e.name,
-                status: "0",
+                status: '0'
-            };
+            }
             audit(data).then((res: any) => {
-                if (res.code == "A0000") {
+                if (res.code == 'A0000') {
                     ElMessage({
-                        type: "success",
+                        type: 'success',
-                        message: "删除项目成功!",
+                        message: '删除项目成功!'
-                    });
+                    })
                 }
                 tableStore.index()
-            });
+            })
         })
         .catch(() => {
             ElMessage({
-                type: "info",
+                type: 'info',
-                message: "已取消删除",
+                message: '已取消删除'
-            });
+            })
-        });
+        })
 }
 
 const imgData = (e: any) => {
-    window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=zl#/preview_ZL`)
+    window.open(
+        window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=${VITE_FLAG ? 'ypt' : 'zl'}#/preview_ZL`
+    )
     //  window.open('http://192.168.1.128:4001' + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=zl#/preview_ZL`)
-  
 }
 
 const onTableSizeChange = (val: number) => {
@@ -155,7 +191,6 @@ const onTableSizeChange = (val: number) => {
 const onTableCurrentChange = (val: number) => {
     tableStore.onTableAction('current-page-change', { page: val })
 }
-
 </script>
 <style lang="scss" scoped>
 .text {
@@ -179,7 +214,7 @@ span {
 .clearfix::before,
 .clearfix::after {
     display: table;
-    content: "";
+    content: '';
 }
 
 .clearfix::after {
@@ -189,7 +224,7 @@ span {
 .box-card {
     width: 100%;
     // border: 1px solid #000;
-    box-shadow: var(--el-box-shadow-light)
+    box-shadow: var(--el-box-shadow-light);
 }
 
 .xiaoshou {

src/views/govern/reportForms/bind.vue

@@ -2,35 +2,75 @@
     <el-tabs v-model.trim="activeName" class="demo-tabs">
         <el-tab-pane label="数据单位" name="0">
             绑定数据单位:
-            <el-cascader :popper-append-to-body="false" ref="cascaderUnit" placeholder="请选择数据单位" v-model.trim="value"
+            <el-cascader
-                :options="options1" filterable @change="handleChange" :props="{
+                :popper-append-to-body="false"
+                ref="cascaderUnit"
+                placeholder="请选择数据单位"
+                v-model.trim="value"
+                :options="options1"
+                filterable
+                @change="handleChange"
+                :props="{
                     value: 'code',
                     label: 'name'
-                }"></el-cascader>
+                }"
+            ></el-cascader>
         </el-tab-pane>
         <el-tab-pane label="数据指标" name="1">
+            <div class="mb10" style="text-align: end;">
+                <el-radio-group v-model="frontAndBack">
+                    <el-radio-button label="治理前" :value="0" />
+                    <el-radio-button label="治理后" :value="1" />
+                </el-radio-group>
+            </div>
+            <div>
                 绑定数据指标:
-            <el-cascader :popper-append-to-body="false" ref="cascaderUnit" placeholder="请选择数据指标" v-model.trim="value"
+                <el-cascader
-                :options="options2" filterable @change="handleChange" :props="{
+                    :popper-append-to-body="false"
+                    ref="cascaderUnit"
+                    placeholder="请选择数据指标"
+                    v-model.trim="value"
+                    :options="options2"
+                    filterable
+                    @change="handleChange"
+                    :props="{
                         value: 'name',
                         label: 'showName'
-                }"></el-cascader>
+                    }"
+                ></el-cascader>
+            </div>
         </el-tab-pane>
         <el-tab-pane label="合格率判定" name="2">
             绑定合格率判定:
-            <el-cascader :popper-append-to-body="false" ref="cascaderhgl" placeholder="请选择数据合格率" v-model.trim="value"
+            <el-cascader
-                :options="options3" filterable @change="handleChange" :props="{
+                :popper-append-to-body="false"
+                ref="cascaderhgl"
+                placeholder="请选择数据合格率"
+                v-model.trim="value"
+                :options="options3"
+                filterable
+                @change="handleChange"
+                :props="{
                     value: 'name',
                     label: 'showName'
-                }"></el-cascader>
+                }"
+            ></el-cascader>
         </el-tab-pane>
         <el-tab-pane label="监测点台账指标" name="3">
             绑定数据指标:
-            <el-cascader :popper-append-to-body="false" ref="cascaderjcd" placeholder="请选择监测点台账" v-model.trim="value"
+            <el-cascader
-                :options="options4" filterable @change="handleChange" :props="{
+                :popper-append-to-body="false"
+                ref="cascaderjcd"
+                placeholder="请选择监测点台账"
+                v-model.trim="value"
+                :options="options4"
+                filterable
+                @change="handleChange"
+                :props="{
                     value: 'name',
                     label: 'showName'
-                }"></el-cascader>
+                }"
+            ></el-cascader>
         </el-tab-pane>
     </el-tabs>
 </template>
@@ -47,13 +87,12 @@ const options1 = ref([])
 const options2 = ref([])
 const options3 = ref([])
 const options4: any = ref([])
+const frontAndBack = ref(0)
 
 const handleChange = (e: any) => {
     value.value = []
-
+    emit('setValue', e, activeName.value == '1' ? frontAndBack.value : 0)
-    emit('setValue', e)
 }
-
 codeDicTree({ code: 'Device_Unit' }).then(res => {
     options1.value = res.data
 })

src/views/govern/reportForms/form.vue

@@ -5,10 +5,10 @@
                 <el-input maxlength="32" show-word-limit placeholder="模板名称" v-model.trim="formdata.name"
                     style="width: 100%"></el-input>
             </el-form-item>
-            <el-form-item label="部门:" prop="deptId">
+            <!-- <el-form-item label="部门:" prop="deptId">
                 <Area v-model.trim="formdata.deptId" style="width: 100%" collapse-tags
                     :props="{ multiple: true, label: 'name', value: 'id', emitPath: false }" />
-            </el-form-item>
+            </el-form-item> -->
 
             <el-form-item label="模板类型:" prop="reportType">
                 <el-select style="width: 100%" v-model.trim="formdata.reportType" placeholder="请选择模板类型">

src/views/govern/reportForms/index.vue

@@ -35,7 +35,7 @@ const departmentRef = ref()
 const show = ref(true)
 const lookShow = ref(true)
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/customReport/getTemplateList',
+    url: '/cs-harmonic-boot/customReport/getTemplateList',
     method: 'POST',
     isWebPaging: true,
     column: [

src/views/govern/reportForms/luckysheet.vue

@@ -1,8 +1,14 @@
 <template>
     <div class="default-main">
         <div class="mb10" style="display: flex; justify-content: flex-end">
-            <el-upload ref="upload" action="" :auto-upload="false" :show-file-list="false" :limit="1"
+            <el-upload
-                :on-change="beforeUpload">
+                ref="upload"
+                action=""
+                :auto-upload="false"
+                :show-file-list="false"
+                :limit="1"
+                :on-change="beforeUpload"
+            >
                 <el-button icon="el-icon-Upload" type="primary" class="mr10">导入excel</el-button>
             </el-upload>
             <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
@@ -54,13 +60,13 @@ const info = () => {
     luckysheet.create(options.value)
 }
 //绑定value
-const setValue = (e: any) => {
+const setValue = (e: any, frontAndBack: number) => {
     let data = luckysheet.getRange()
     luckysheet.setCellValue(
         data[0].row[0],
         data[0].column[0],
         {
-            v: e[e.length - 1],
+            v: frontAndBack == 0 ? e[e.length - 1] : `~` + e[e.length - 1],
             tr: e
         }
         //  checkedNodes[0].data.label
@@ -119,21 +125,25 @@ const submitForm = (formdata: any, text: string) => {
     params.append('reportForm', formdata.reportForm)
     ElMessage.info('正在保存请稍等!')
     if (text == '新增报表模板') {
-        addTemplate(params).then(res => {
+        addTemplate(params)
+            .then(res => {
                 ElMessage.success('新增成功!')
                 formFer.value.shutDown()
                 emit('shutDown')
-        }).catch(err => {
+            })
+            .catch(err => {
                 ElMessage.error('保存失败!')
                 formFer.value.shutDown()
             })
     } else if (text == '编辑报表模板') {
         params.append('id', list.value.id)
-        dateTemplateup(params).then(res => {
+        dateTemplateup(params)
+            .then(res => {
                 ElMessage.success('编辑成功!')
                 formFer.value.shutDown()
                 emit('shutDown')
-        }).catch(err => {
+            })
+            .catch(err => {
                 ElMessage.error('保存失败!')
                 formFer.value.shutDown()
             })

src/views/govern/sensitiveLoadMange/detail.vue

@@ -0,0 +1,106 @@
+<template>
+    <el-dialog class="cn-operate-dialog" width="600px" v-model.trim="dialogVisible" :title="title">
+        <el-form :model="form" label-width="auto" ref="formRef" :rules="rules">
+            <el-form-item label="所属厂站名称" prop="substationName">
+                <el-input v-model.trim="form.substationName" placeholder="请输入所属厂站名称"></el-input>
+            </el-form-item>
+            <el-form-item label="敏感用户名称" prop="name">
+                <el-input v-model.trim="form.name" placeholder="请输入敏感用户名称"></el-input>
+            </el-form-item>
+            <el-form-item label="敏感负荷类型" prop="loadType">
+                <el-select v-model.trim="form.loadType" filterable clearable placeholder="请选择数据分类">
+                    <el-option
+                        v-for="item in DataTypeSelect"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="用户协议容量(MVA)" prop="userAgreementCapacity">
+                <el-input-number style="width: 100%;" :min="0" maxlength="32" show-word-limit v-model.trim="form.userAgreementCapacity" placeholder="请输入用户协议容量"></el-input-number>
+            </el-form-item>
+            <el-form-item label="装机容量(MW)" prop="installedCapacity">
+                <el-input-number style="width: 100%;" :min="0" maxlength="32" show-word-limit  v-model.trim="form.installedCapacity" placeholder="请输入装机容量"></el-input-number>
+            </el-form-item>
+            <el-form-item label="排序" prop="sort">
+                <el-input-number style="width: 100%;" :min="0" maxlength="32" show-word-limit v-model.trim="form.sort" placeholder="请输入排序"></el-input-number>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref,inject } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { saveUser, updateUser } from '@/api/cs-device-boot/sensitiveLoadMange'
+import { useDictData } from '@/stores/dictData'
+
+const TypeOptions = ref()
+
+const dictData = useDictData()
+const DataTypeSelect = dictData.getBasicData('Sensitive_User_Type')
+
+const tableStore = inject('tableStore') as TableStore
+
+const formRef = ref()
+const form = reactive<any>({
+    loadType: [],
+    substationName: null,
+    installedCapacity: null,
+    name: null,
+    userAgreementCapacity:null,
+    id: null,
+    sort:100
+})
+const rules = {
+    substationName: [{ required: true, message: '所属厂站名称不能为空', trigger: 'blur' }],
+    name: [{ required: true, message: '敏感用户名称不能为空', trigger: 'blur' }],
+    loadType: [{ required: true, message: '请选择敏感负荷类型', trigger: 'blur' }],
+    installedCapacity: [{ required: true, message: '用户协议容量不能为空', trigger: 'blur' }],
+    userAgreementCapacity: [{ required: true, message: '装机容量不能为空', trigger: 'blur' }],
+    sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
+}
+
+const dialogVisible = ref(false)
+const title = ref('新增')
+const open = (text: string, data?: anyObj) => {
+    title.value = text
+    dialogVisible.value = true
+    if (data) {
+        for (let key in form) {
+            form[key] = data[key]
+        }
+    } else {
+        for (let key in form) {
+            form[key] = null
+            form.sort = 100
+        }
+    }
+}
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            if (form.id) {
+                await updateUser(form)
+            } else {
+                await saveUser(form)
+            }
+            ElMessage.success('操作成功')
+            tableStore.index()
+            dialogVisible.value = false
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

src/views/govern/sensitiveLoadMange/index.vue

@@ -0,0 +1,105 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker>
+            <template #operation>
+                <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <detail ref="detail"></detail>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import Detail from './detail.vue'
+import { ElMessage } from 'element-plus'
+import { deleteUser } from '@/api/cs-device-boot/sensitiveLoadMange'
+import { Plus } from '@element-plus/icons-vue'
+import { useDictData } from '@/stores/dictData'
+
+defineOptions({
+    name: 'govern/device/sensitiveLoadMange'
+})
+const detail = ref()
+
+const dictData = useDictData()
+const interferenceType = dictData.getBasicData('Sensitive_User_Type')
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/pqSensitiveUser/getList',
+    method: 'POST',
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '所属厂站名称', field: 'substationName', minWidth: 180 },
+        { title: '敏感用户名称', field: 'name', minWidth: 180 },
+        {
+            title: '敏感负荷类型',
+            field: 'loadType',
+            minWidth: 120,
+            formatter: row => {
+                return interferenceType.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { title: '用户协议容量(MVA)', field: 'userAgreementCapacity', minWidth: 100 },
+        { title: '装机容量(MW)', field: 'installedCapacity', minWidth: 100 },
+        {
+            title: '操作',
+            align: 'center',
+            width: '180',
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        detail.value.open('编辑', row)
+                    }
+                },
+                {
+                    name: 'del',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteUser([row.id]).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {}
+})
+
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+
+const addMenu = () => {
+    detail.value.open('新增')
+}
+</script>

src/views/pqs/cockpit/realTimeData/index.vue

@@ -26,7 +26,7 @@
 
             <el-card class="bottom-container " style="min-height: 230px;">
                 <div class="buttonBox">
-                    <el-button type="primary" icon="el-icon-Aim">复位</el-button>
+                    <el-button type="primary" icon="el-icon-Aim" @click="reset">复位</el-button>
                 </div>
                 <div class="tableBox">
                     <Table ref="tableRef"  height="100%"></Table>
@@ -125,6 +125,10 @@ provide('tableRef', tableRef)
 const pageHeight = mainHeight(40)
 provide('tableStore', tableStore)
 
+const reset = () => {
+    tableRef.value.reset()
+}
+
 const iframeSrc = ref('')
 
 // 监听 props 变化

src/views/setting/dictionary/component/add.vue

@@ -19,7 +19,7 @@
                 <el-form-item class="top" label="组件路径" prop="path">
                     <el-input v-model="form.path" placeholder="请输入组件路径"></el-input>
                 </el-form-item>
-                <el-form-item class="top" label="组件查询时间">
+                <!-- <el-form-item class="top" label="组件查询时间">
                     <el-radio-group v-model="form.timeKey" style="width: 100%">
                         <el-radio-button label="年" value="1" />
                         <el-radio-button label="季" value="2" />
@@ -27,7 +27,7 @@
                         <el-radio-button label="周" value="4" />
                         <el-radio-button label="日" value="5" />
                     </el-radio-group>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item class="top" label="组件排序" prop="sort">
                     <el-input v-model="form.sort" placeholder="请输入组件排序"></el-input>
                 </el-form-item>
@@ -54,15 +54,13 @@ import { ref, inject, onMounted, type Component, defineAsyncComponent, h, markRa
 import { reactive } from 'vue'
 import { ElMessage } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
-import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
 import { getFatherComponent, componentAdd, componentEdit } from '@/api/user-boot/dept'
 import IconSelector from '@/components/baInput/components/iconSelector.vue'
 import html2canvas from 'html2canvas'
-
+const emit = defineEmits(['cancel','submit'])
 const dictData = useDictData()
 const dialogVisible = ref(false)
 const title = ref('')
-const tableStore = inject('tableStore') as TableStore
 const formRef = ref()
 // 注意不要和表单ref的命名冲突
 const form = ref<anyObj>({
@@ -121,6 +119,7 @@ const submit = () => {
                     image: url
                 }).then(res => {
                     ElMessage.success('新增成功!')
+                    emit('submit')
                     cancel()
                 })
             } else {
@@ -131,6 +130,7 @@ const submit = () => {
                     image: url
                 }).then(res => {
                     ElMessage.success('修改成功!')
+                       emit('submit')
                     cancel()
                 })
             }
@@ -176,7 +176,7 @@ const registerComponent = (path: string): Component | string | null => {
     }
 }
 const cancel = () => {
-    tableStore.index()
+    emit('cancel')
     dialogVisible.value = false
 }
 defineExpose({ open })

src/views/setting/dictionary/component/addTree.vue

@@ -0,0 +1,139 @@
+<template>
+    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" width="500px" :title="title" @close="cancel">
+        <div style="display: flex">
+            <el-form :inline="false" :model="form" label-width="auto" :rules="rules" ref="formRef" style="flex: 1">
+                <el-form-item class="top" label="上级树">
+                    <el-cascader
+                        v-model="form.system"
+                        :options="customDeptOption"
+                        :props="props"
+                        clearable
+                        filterable
+                        placeholder="请选择上级树"
+                        style="width: 100%"
+                    />
+                </el-form-item>
+                <el-form-item class="top" label="树名称" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入组件名称"></el-input>
+                </el-form-item>
+
+                <el-form-item class="top" label="树排序" prop="sort">
+                    <el-input v-model="form.sort" placeholder="请输入组件排序"></el-input>
+                </el-form-item>
+            </el-form>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="cancel">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject, onMounted, type Component, defineAsyncComponent, h, markRaw } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
+import { getFatherComponent, componentAdd, componentEdit } from '@/api/user-boot/dept'
+
+import { componentTree } from '@/api/user-boot/user'
+const dictData = useDictData()
+const emit = defineEmits(['cancel', 'submit'])
+const dialogVisible = ref(false)
+const title = ref('')
+const formRef = ref()
+// 注意不要和表单ref的命名冲突
+const form = ref<anyObj>({
+    name: '',
+    sort: 100,
+    system: ''
+})
+const props = { label: 'name', value: 'id', checkStrictly: true }
+const rules = {
+    name: [{ required: true, message: '请输输入树名称', trigger: 'blur' }],
+    system: [{ required: true, message: '请先择父组件节点', trigger: 'change' }],
+
+    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }]
+}
+const customDeptOption: any = ref([])
+onMounted(() => {})
+
+const open = (text: string, data?: anyObj) => {
+    getFather()
+    title.value = text
+    dialogVisible.value = true
+    if (data) {
+        let Data = JSON.parse(JSON.stringify(data))
+        form.value.system = Data.systemType
+        form.value.name = Data.name
+        form.value.sort = Data.sort
+    }
+}
+// 查询父节点
+const getFather = () => {
+    componentTree().then(res => {
+        customDeptOption.value = deletePathNotNull(JSON.parse(JSON.stringify(res.data)))
+    })
+}
+
+// 递归删除path不为null的数据
+function deletePathNotNull(data:any) {
+    // 若为数组，遍历处理每个元素
+    if (Array.isArray(data)) {
+        const filtered = []
+        for (let item of data) {
+            // 递归处理子节点
+            if (item.children && item.children.length > 0) {
+                item.children = deletePathNotNull(item.children)
+            }
+            // 仅保留path为null或空字符串的节点
+            if (item.path === null || item.path === '') {
+                filtered.push(item)
+            }
+        }
+        return filtered
+    }
+    // 若为单个对象（递归子节点时用）
+    if (typeof data === 'object' && data !== null) {
+        if (data.children && data.children.length > 0) {
+            data.children = deletePathNotNull(data.children)
+        }
+        return data.path === null || data.path === '' ? data : null
+    }
+    return data
+}
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            if (title.value == '新增树') {
+                await componentAdd({
+                    ...form.value,
+                    systemType: form.value.system[0],
+                    pid: form.value.system[1]
+                }).then(res => {
+                    ElMessage.success('新增成功!')
+                    emit('submit')
+                    cancel()
+                })
+            } else {
+                await componentEdit({
+                    ...form.value,
+                    systemType: form.value.system[0],
+                    pid: form.value.system[1]
+                }).then(res => {
+                    ElMessage.success('修改成功!')
+                    emit('submit')
+                    cancel()
+                })
+            }
+        }
+    })
+}
+
+const cancel = () => {
+    emit('cancel')
+    dialogVisible.value = false
+}
+defineExpose({ open })
+</script>

src/views/setting/dictionary/component/index.vue

@@ -2,12 +2,18 @@
     <div class="default-main">
         <TableHeader :showSearch="false">
             <template v-slot:operation>
-                <el-button type="primary" @click="add" icon="el-icon-Plus">新增</el-button>
+                <el-button type="primary" @click="addTree" icon="el-icon-Plus">新增树</el-button>
+                <el-button type="primary" @click="add" icon="el-icon-Plus">新增组件</el-button>
             </template>
         </TableHeader>
-        <Table ref="tableRef" :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
+        <Table
-            :scroll-y="{ enabled: true }" />
+            ref="tableRef"
-        <Add ref="addRef" v-if="addFlag" @onSubmit="tableStore.index()" />
+            :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
+            :scroll-y="{ enabled: true }"
+        />
+        <Add ref="addRef" v-if="addFlag" @cancel="cancel" @submit="tableStore.index()" />
+        <!-- 新增树 -->
+        <Tree ref="treeRef" v-if="addFlag" @cancel="cancel" @submit="tableStore.index()" />
     </div>
 </template>
 <script setup lang="ts">
@@ -18,6 +24,7 @@ import { useDictData } from '@/stores/dictData'
 import { ElMessage } from 'element-plus'
 import TableHeader from '@/components/table/header/index.vue'
 import Add from './add.vue'
+import Tree from './addTree.vue'
 import { deleteSubassembly } from '@/api/user-boot/dept'
 defineOptions({
     name: 'component'
@@ -25,6 +32,7 @@ defineOptions({
 const addRef = ref()
 const addFlag = ref(false)
 const tableRef = ref()
+const treeRef = ref()
 const treeData: any = ref([])
 const tableStore = new TableStore({
     url: '/user-boot/component/componentTree',
@@ -39,7 +47,7 @@ const tableStore = new TableStore({
             width: '80',
             render: 'icon'
         },
-        { field: 'code', title: '组件标识', minWidth: '100', },
+        { field: 'code', title: '组件标识', minWidth: '100' },
         { field: 'path', title: '组件路径' },
         { field: 'image', title: '组件展示', render: 'image' },
         {
@@ -53,13 +61,18 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-Plus',
                     render: 'basicButton',
-                    disabled: row => {
+
-                        return row.path == '' || row.path == null
-                    },
                     click: row => {
                         addFlag.value = true
                         setTimeout(() => {
+                            if (row.path == '' || row.path == null) {
+                                // 修改树
+                                treeRef.value.open('修改树', row)
+                            } else {
+                                // 组件修改
+
                                 addRef.value.open('修改组件', row)
+                            }
                         }, 100)
                     }
                 },
@@ -69,9 +82,7 @@ const tableStore = new TableStore({
                     type: 'danger',
                     icon: 'el-icon-Delete',
                     render: 'confirmButton',
-                    disabled: row => {
+
-                        return row.path == '' || row.path == null
-                    },
                     popconfirm: {
                         confirmButtonText: '确认',
                         cancelButtonText: '取消',
@@ -79,12 +90,15 @@ const tableStore = new TableStore({
                         title: '确定删除？'
                     },
                     click: row => {
+                        if (row.path == '' || row.path == null) {
+                        } else {
                             deleteSubassembly({ id: row.id }).then(() => {
                                 ElMessage.success('删除成功!')
                                 tableStore.index()
                             })
                         }
                     }
+                }
             ]
         }
     ],
@@ -127,6 +141,16 @@ const add = () => {
         addRef.value.open('新增组件')
     }, 100)
 }
+// 新增数
+const addTree = () => {
+    addFlag.value = true
+    setTimeout(() => {
+        treeRef.value.open('新增树')
+    }, 100)
+}
+const cancel = () => {
+    addFlag.value = false
+}
 provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()

src/views/setting/dictionary/tree/popupForm.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="cn-operate-dialog" v-model.trim="dialogVisible" :title="title">
+    <el-dialog class="cn-operate-dialog" width="500px" v-model.trim="dialogVisible" :title="title">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules">
                 <el-form-item label="字典名称:" prop="name">

src/views/system/reportForms/index.vue

@@ -35,7 +35,7 @@ const departmentRef = ref()
 const show = ref(true)
 const lookShow = ref(true)
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/customReport/getTemplateList',
+    url: '/cs-harmonic-boot/customReport/getTemplateList',
     method: 'POST',
     isWebPaging: true,
     column: [