修改菜单

修改组件管理时间线配置

.env.ypt

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

.env.zl

@@ -1,2 +1,3 @@
-NODE_ENV = zl
-VITE_NAME="zl"
+# 治理
+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": {
@@ -26,8 +28,10 @@
         "element-plus": "^2.7.5",
         "exceljs": "v4.4.0",
         "file-saver": "v2.0.5",
+        "grid-layout-plus": "^1.1.0",
         "html2canvas": "^1.4.1",
         "jquery": "^3.7.1",
+        "jsencrypt": "^3.3.2",
         "jszip": "^3.10.1",
         "lodash": "^4.17.21",
         "lodash-es": "^4.17.21",
@@ -38,20 +42,18 @@
         "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "pinia-plugin-persistedstate": "^3.2.1",
+        "qs": "^6.12.0",
         "screenfull": "^6.0.2",
-        "splitpanes": "3.1.5",
+        "splitpanes": "^3.1.5",
         "use-element-plus-theme": "^0.0.5",
         "vue": "^3.3.11",
-        "vue-draggable-resizable": "3.0.0-beta.2",
+        "vue-draggable-resizable": "^3.0.0-beta.2",
+        "vue-i18n": "9.10.2",
         "vue-router": "4",
+        "vue-types": "^5.1.1",
         "vxe-table": "^4.5.17",
         "vxe-table-plugin-export-xlsx": "^4.0.7",
-        "grid-layout-plus": "^1.1.0",
-        "vue-i18n": "9.10.2",
-        "qs": "^6.12.0",
-        "vue-types": "^5.1.1",
         "web-storage-cache": "^1.1.1",
-        "jsencrypt": "^3.3.2",
         "xe-utils": "^3.5.14"
     },
     "devDependencies": {
@@ -61,9 +63,9 @@
         "@types/splitpanes": "2.2.6",
         "@vitejs/plugin-vue": "^4.5.2",
         "@vitejs/plugin-vue-jsx": "^3.1.0",
-        "unplugin-auto-import": "^0.16.7",
         "sass": "^1.69.5",
         "typescript": "^5.2.2",
+        "unplugin-auto-import": "^0.16.7",
         "vite": "^5.0.8",
         "vue-tsc": "^1.8.25"
     }

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

@@ -47,11 +47,13 @@ export function restartProcess(data: any) {
 }
 
 //更新进程号
-export function updateProcess(data: any) {
+export function updateProcess(data:any) {
     return createAxios({
-        url: '/cs-device-boot/node/updateDevProcessNo',
+        url: '/cs-device-boot/node/updateDevNode',
         method: 'post',
-        params: data
+        data: data
     })
 }
 
+
+

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/cs-device-boot/user.ts

@@ -53,3 +53,25 @@ export const removeMarketData = (data: any) => {
         params: data
     })
 }
+
+/**
+ * 获取用户未绑定的在运的便携式设备
+ */
+export const queryRunPortableDevByUseId = (data: any) => {
+    return createAxios({
+        url: '/cs-device-boot/EquipmentDelivery/getRunPortableDev',
+        method: 'post',
+        params: data
+    })
+}
+
+/**
+ * 获取用户未绑定的工程信息
+ */
+export const queryUnlinkEngineeringByUseId = (data: any) => {
+    return createAxios({
+        url: '/cs-device-boot/engineering/getUnlinkedEngineering',
+        method: 'post',
+        params: data
+    })
+}

src/api/cs-harmonic-boot/datatrend.ts

@@ -1,22 +1,31 @@
-import createAxios from '@/utils/request'
-
-// 查询设备数据趋势
-export function getDeviceDataTrend(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/datatrend/querydatatrend',
-        method: 'POST',
-        data
-    })
-}
-
-
-
-// 波形下载
-export function getFileZip(params: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/event/getFileZip',
-        method: 'get',
-        params,
-        responseType: 'blob'
-    })
-}
+import createAxios from '@/utils/request'
+
+// 查询设备数据趋势
+export function getDeviceDataTrend(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/datatrend/querydatatrend',
+        method: 'POST',
+        data
+    })
+}
+
+
+
+// 波形下载
+export function getFileZip(params: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/event/getFileZip',
+        method: 'get',
+        params,
+        responseType: 'blob'
+    })
+}
+
+export function exportModel(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/exportmodel/exportModel',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}

src/api/cs-harmonic-boot/recruitment.ts

@@ -1,27 +1,36 @@
-import createAxios from '@/utils/request'
-
-// 获取设备补召页面数据
-export function getMakeUpData(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data,
-        method: 'POST'
-    })
-}
-
-//查询装置目录-文件
-export function getAskDirOrFile(data: any) {
-    return createAxios({
-        url: `/cs-harmonic-boot/offlineDataUpload/askDirOrFile?fileType=${data.fileType}&nDid=${data.nDid}&path=${data.path}&prjName=${data.prjName}`,
-        method: 'POST'
-    })
-}
-
-//设备补召操作
-// 获取设备补召页面数据
-export function offlineDataUploadMakeUp(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/offlineDataUpload/makeUp',
-        method: 'POST',
-        data
-    })
-}
+import createAxios from '@/utils/request'
+
+// 获取设备补召页面数据
+export function getMakeUpData(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data,
+        method: 'POST'
+    })
+}
+
+//查询装置目录-文件
+export function getAskDirOrFile(data: any) {
+    return createAxios({
+        url: `/cs-harmonic-boot/offlineDataUpload/askDirOrFile?fileType=${data.fileType}&nDid=${data.nDid}&path=${data.path}&prjName=${data.prjName}`,
+        method: 'POST'
+    })
+}
+
+//设备补召操作
+// 获取设备补召页面数据
+export function offlineDataUploadMakeUp(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/offlineDataUpload/makeUp',
+        method: 'POST',
+        data
+    })
+}
+//设备补召操作
+// 根据id集合获取敏感负荷用户列表
+export function getListByIds() {
+    return createAxios({
+        url: '/cs-harmonic-boot/pqSensitiveUser/getListByIds',
+        method: 'POST',
+        
+    })
+}

src/api/cs-system-boot/official.ts

@@ -0,0 +1,29 @@
+import createAxios from '@/utils/request'
+
+// * 根据用户id查询工程和便携式设备
+export const queryDevByUseId = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/wlUser/selectDevByUserId',
+        method: 'POST',
+        params: data
+    })
+}
+
+// *  用户绑定工程和便携式设备
+export const add = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/wlUser/addUserDev',
+        method: 'POST',
+        data: data
+    })
+}
+/**
+ * 用户取消绑定工程和便携式设备
+ */
+export const removeUserDev = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/wlUser/deleteUserDev',
+        method: 'post',
+        data: data
+    })
+}

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

@@ -0,0 +1,273 @@
+import request from '@/utils/request'
+
+// 主要监测点列表查询>>分页
+export function mainLineList(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/mainLine/list',
+        method: 'post',
+        data: data
+    })
+}
+// 主要监测点指标越限详情
+export function statLimitRateDetails(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/mainLine/statLimitRateDetails',
+        method: 'post',
+        data: data
+    })
+}
+
+// 查询监测点列表=全部>>不分页
+export function cslineList(data: any) {
+    return request({
+        url: '/cs-device-boot/csline/list',
+        method: 'post',
+        data: data
+    })
+}
+
+// 监测点详情 趋势图数据
+export function trendData(data: any) {
+    return request({
+        url: '/cs-device-boot/csGroup/trendData',
+        method: 'post',
+        data: data
+    })
+}
+
+// 每日越限占比统计
+export function totalLimitStatisticsDetails(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/totalLimitStatistics/details',
+        method: 'post',
+        data: data
+    })
+}
+
+// 总体指标越限统计列表
+export function totalLimitStatisticsList(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/totalLimitStatistics/list',
+        method: 'post',
+        data: data
+    })
+}
+
+// 总体指标越限统计数据
+export function totalLimitStatisticsData(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/totalLimitStatistics/data',
+        method: 'post',
+        data: data
+    })
+}
+
+// 指标越限程度数据
+export function limitExtentData(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/limitRateDetailD/limitExtentData',
+        method: 'post',
+        data: data
+    })
+}
+// 指标日趋势图数据
+export function limitExtentDayData(data: any) {
+    return request({
+        url: '/cs-harmonic-boot/limitRateDetailD/limitExtentDayData',
+        method: 'post',
+        data: data
+    })
+}
+
+// 指标越限明细日历数据
+export function limitCalendarData(data: any) {
+    return request({
+        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'
+    })
+}
+
+
+export function getLineExport(data:any) {
+    return request({
+        url: '/cs-harmonic-boot/eventReport/getLineExport',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}
+
+

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/csDictData.ts

@@ -1,118 +1,126 @@
-import request from '@/utils/request'
-// 新增字典数据
-export const addCsDictData = (data: any) => {
-    return request({
-        url: '/system-boot/csDictData/add',
-        method: 'post',
-        data: data
-    })
-}
-
-// 查询字典数据
-export const queryCsDictDataPage = (data: any) => {
-    return request({
-        url: '/system-boot/csDictData/list',
-        method: 'post',
-        data: Object.assign(
-            {
-                orderBy: '',
-                pageNum: 0,
-                pageSize: 0,
-                searchBeginTime: '',
-                searchEndTime: '',
-                searchState: 0,
-                searchValue: '',
-                dataType: '',
-                sortBy: ''
-            },
-            data
-        )
-    })
-}
-
-//删除字典数据
-export const delCsDictData = (id: string) => {
-    let form = new FormData()
-    form.append('id', id)
-    return request({
-        url: '/system-boot/csDictData/delete',
-        method: 'post',
-        data: form,
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-        }
-    })
-}
-
-// 修改字典数据
-export const updateCsDictData = (data: any) => {
-    return request({
-        url: '/system-boot/csDictData/update',
-        method: 'post',
-        data: data
-    })
-}
-
-// 执行算法
-export const timerRun = (params: any) => {
-    return request({
-        url: '/system-boot/timer/run',
-        method: 'GET',
-        params
-    })
-}
-// 任务表达式
-export const getActionClasses = () => {
-    return request({
-        url: '/system-boot/timer/getActionClasses',
-        method: 'GET'
-    })
-}
-// 新增任务
-export const addTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/add',
-        method: 'POST',
-        data
-    })
-}
-// 修改任务
-export const updateTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/update',
-        method: 'POST',
-        data
-    })
-}
-// 补招配置
-export const runTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/run',
-        method: 'GET',
-        params: data
-    })
-}
-// 删除任务
-export const deleteTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/delete',
-        method: 'POST',
-        data: data
-    })
-}
-// 关闭任务
-export const stop = (params: any) => {
-    return request({
-        url: '/system-boot/timer/stop',
-        method: 'get',
-        params
-    })
-}
-// 启动任务
-export const start = (params: any) => {
-    return request({
-        url: '/system-boot/timer/start',
-        method: 'get',
-        params
-    })
+import request from '@/utils/request'
+// 新增字典数据
+export const addCsDictData = (data: any) => {
+    return request({
+        url: '/system-boot/csDictData/add',
+        method: 'post',
+        data: data
+    })
+}
+
+// 查询字典数据
+export const queryCsDictDataPage = (data: any) => {
+    return request({
+        url: '/system-boot/csDictData/list',
+        method: 'post',
+        data: Object.assign(
+            {
+                orderBy: '',
+                pageNum: 0,
+                pageSize: 0,
+                searchBeginTime: '',
+                searchEndTime: '',
+                searchState: 0,
+                searchValue: '',
+                dataType: '',
+                sortBy: ''
+            },
+            data
+        )
+    })
+}
+
+//删除字典数据
+export const delCsDictData = (id: string) => {
+    let form = new FormData()
+    form.append('id', id)
+    return request({
+        url: '/system-boot/csDictData/delete',
+        method: 'post',
+        data: form,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        }
+    })
+}
+
+// 修改字典数据
+export const updateCsDictData = (data: any) => {
+    return request({
+        url: '/system-boot/csDictData/update',
+        method: 'post',
+        data: data
+    })
+}
+
+// 执行算法
+export const timerRun = (params: any) => {
+    return request({
+        url: '/system-boot/timer/run',
+        method: 'GET',
+        params
+    })
+}
+// 任务表达式
+export const getActionClasses = () => {
+    return request({
+        url: '/system-boot/timer/getActionClasses',
+        method: 'GET'
+    })
+}
+// 新增任务
+export const addTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/add',
+        method: 'POST',
+        data
+    })
+}
+// 修改任务
+export const updateTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/update',
+        method: 'POST',
+        data
+    })
+}
+// 补招配置
+export const runTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/run',
+        method: 'GET',
+        params: data
+    })
+}
+// 删除任务
+export const deleteTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/delete',
+        method: 'POST',
+        data: data
+    })
+}
+// 关闭任务
+export const stop = (params: any) => {
+    return request({
+        url: '/system-boot/timer/stop',
+        method: 'get',
+        params
+    })
+}
+// 启动任务
+export const start = (params: any) => {
+    return request({
+        url: '/system-boot/timer/start',
+        method: 'get',
+        params
+    })
+}
+// 查询监测对象类型
+export const getDicDataByTypeCode = (params: any) => {
+    return request({
+        url: '/system-boot/dictData/getDicDataByTypeCode',
+        method: 'get',
+        params
+    })
 }

src/api/system-boot/csstatisticalset.ts

@@ -77,3 +77,11 @@ export const queryByPagePath = (params: any) => {
         params
     })
 }
+// 根据用户id查询用户驾驶舱
+export const getDashboardPageByUserId = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/getDashboardPageByUserId',
+        method: 'post',
+        params
+    })
+}

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',
-        method: 'get',
+        // url: '/system-boot/dictTree/codeDicTree',
+        url: '/system-boot/dictTree/queryByCodeList',
+        method: 'post',
         params: data
     })
 }

src/api/user-boot/official.ts

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+/**
+ * 获取移动端、便携式正式用户列表
+ * @returns {AxiosPromise}
+ */
+export const getFormalUserList = () => {
+    return request({
+        url: '/user-boot/user/getFormalUserList',
+        method: 'post'
+    })
+}

src/components/cockpit/F47Curve/index.vue

@@ -1,6 +1,7 @@
 <template>
     <div>
         <!--F47曲线 -->
+        <TableHeader ref="TableHeaderRef" :showReset="false"  :timeKeyList="prop.timeKey" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
         <el-descriptions class="mt2" direction="vertical" :column="4" border>
             <el-descriptions-item align="center" label="名称">{{ data.name }}</el-descriptions-item>
             <el-descriptions-item align="center" label="事件总数">{{ data.gs }}</el-descriptions-item>
@@ -8,29 +9,87 @@
             <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"
-            :style="{ width: prop.width, height: `calc(${prop.height} - 80px)` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} - 80px - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+            }"
+            @chart-click="handleChartClick"
         />
+        <el-dialog v-model="isWaveCharts" v-if="isWaveCharts" draggable :title="dialogTitle" append-to-body width="70%">
+            <waveFormAnalysis
+                v-loading="loading"
+                ref="waveFormAnalysisRef"
+                @handleHideCharts="isWaveCharts = false"
+                :wp="wp"
+            />
+        </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 MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-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 { analyseWave } from '@/api/common'
+import { ElMessage } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
-const echartList = ref({})
-const OverLimitDetailsRef = ref()
+const TableHeaderRef = ref()
+
+const headerHeight = ref(57)
+
+const dialogTitle = ref('波形分析')
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const echartList = ref()
+
+const chartRef = ref()
+// 波形
+const isWaveCharts = ref(false)
+
+const loading = ref(false)
+
+const wp = ref({})
+
+const boxoList: any = ref({})
+
+const waveFormAnalysisRef: any = ref(null)
+
 const data = reactive({
     name: '事件个数',
     gs: 0,
@@ -38,33 +97,29 @@ 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,
 
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
     loadCallback: () => {
-        let res = {
-            data: { totalNumberOfEvents: 0, voltageToleranceCurveDataList: [] }
-        }
-
-        const gongData = gongfunction(res.data.voltageToleranceCurveDataList)
-        data.gs = res.data.voltageToleranceCurveDataList.length
+        const gongData = gongfunction(tableStore.table.data)
+        data.gs = tableStore.table.data.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,
+                itemGap: 15
             },
             tooltip: {
                 trigger: 'item',
@@ -141,13 +196,40 @@ const tableStore: any = new TableStore({
                         name: '可容忍事件',
                         type: 'scatter',
                         symbol: 'circle',
-                        data: gongData.pointF
+                        symbolSize: 8,
+                        data: gongData.pointF,
+                        // data: [
+                        //     [0.2, 10, '2023-01-01 10:00:00'],
+                        //     [0.4, 50, '2023-01-01 11:00:00']
+                        // ],
+                        legendSymbol: 'circle',
+                        emphasis: {
+                            focus: 'series',
+                            itemStyle: {
+                                borderColor: '#fff',
+                                borderWidth: 2,
+                                shadowBlur: 10,
+                                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                            }
+                        },
+                        tooltip: {
+                            show: true,
+                            trigger: 'item',
+                            formatter: function (params: any) {
+                                return `<strong>可容忍事件</strong><br/>
+                    持续时间: ${params.value[0]}s<br/>
+                    特征幅值: ${params.value[1].toFixed(2)}%<br/>
+                    发生时间: ${params.value[2] || 'N/A'}`
+                            }
+                        }
                     },
                     {
                         name: '不可容忍事件',
                         type: 'scatter',
                         symbol: 'circle',
-                        data: gongData.pointFun
+                        symbolSize: 8,
+                        data: gongData.pointFun,
+                        legendSymbol: 'rect'
                     }
                 ]
             }
@@ -159,6 +241,25 @@ const tableRef = ref()
 provide('tableRef', tableRef)
 provide('tableStore', tableStore)
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 function gongfunction(arr: any) {
     let standI = 0
     let unstandI = 0
@@ -178,8 +279,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
@@ -323,6 +425,65 @@ onMounted(() => {
         tableStore.index()
     }, 100)
 })
+
+// 点击事件处理函数
+const handleChartClick = (params: any) => {
+    if (params.seriesName === '可容忍事件') {
+        // 处理可容忍事件点击
+        dialogTitle.value = '可容忍事件波形分析'
+        handleTolerableEventClick(params)
+    } else if (params.seriesName === '不可容忍事件') {
+        dialogTitle.value = '不可容忍事件波形分析'
+        // 处理不可容忍事件点击
+        // ElMessage.info(`点击了不可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
+        handleTolerableEventClick(params)
+    }
+}
+
+// 可容忍事件点击处理函数
+const handleTolerableEventClick = async (row: any) => {
+    loading.value = true
+    nextTick(() => {
+        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 = {
+                    persistTime: row.value[0], //持续时间
+                    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
+        })
+
+    nextTick(() => {
+        waveFormAnalysisRef.value &&  waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
+        waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
+    })
+}
+
+// 不可容忍事件点击处理函数
+const handleIntolerableEventClick = (params: any) => {
+    console.log('不可容忍事件详情:', params)
+}
+
 watch(
     () => prop.timeKey,
     val => {
@@ -330,12 +491,17 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
-        tableStore.index()
+        // 当外部时间值变化时，更新表格的时间参数
+        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
     }
 )
 

src/components/cockpit/directionStatistics/index.vue

@@ -1,102 +1,158 @@
 <template>
     <div>
         <!--暂降方向统计 -->
-        <my-echart class="tall" :options="echartList" :style="{ width: prop.width, height: `calc(${prop.height} )` }" />
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+             :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+        ></TableHeader>
+        <my-echart
+            v-loading="tableStore.table.loading"
+            class="tall"
+            :options="echartList"
+            :style="{ width: prop.width, height: `calc(${prop.height} )` }"
+        />
     </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 MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import TableHeader from '@/components/table/header/index.vue'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const data = [
-    {
-        name: '来自电网',
-        value: 4
-    },
-    {
-        name: '来自负荷',
-        value: 41
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+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 echartList = ref({
-    title: {},
+}
 
-    tooltip: {
-        trigger: 'item'
-    },
-    legend: {
-        orient: 'vertical',
-        top: 'center',
-        right: '5%',
-        formatter: function (e: any) {
-            return e + '   ' + data.filter(item => item.name == e)[0].value + '次'
-        }
-    },
-    xAxis: {
-        show: false
-    },
-    yAxis: {
-        show: false
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-
-    options: {
-        dataZoom: null,
-        title: [
-            {
-                text: '暂降方向统计',
-                left: 'center'
-            },
-            {
-                text: data[0].value + data[1].value + '次',
-                left: 'center',
-                top: 'center'
-            }
-        ],
-        series: [
-            {
-                type: 'pie',
-                center: 'center',
-                radius: ['55%', '75%'],
-                label: {
-                    show: false,
-                    position: 'outside',
-                    textStyle: {
-                        //数值样式
-                    }
-                },
-                name: '事件统计',
-                data: data
-            }
-        ]
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
     }
 })
+
+const echartList = ref({})
+
+// const data = [
+//     {
+//         name: '来自电网',
+//         value: 4
+//     },
+//     {
+//         name: '来自负荷',
+//         value: 41
+//     }
+// ]
+
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/getEventDirectionData',
     method: 'POST',
-
     showPage: false,
-
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
-    loadCallback: () => {}
+    loadCallback: () => {
+        if (!tableStore.table.data || !Array.isArray(tableStore.table.data)) {
+            return []
+        }
+        const chartData = ref(
+            tableStore.table.data.map((item: any) => ({
+                name: item.source === 'load' ? '来自负荷' : '来自电网',
+                value: item.times
+            }))
+        )
+
+        const total = chartData.value.reduce((sum: any, item: any) => sum + item.value, 0)
+
+        echartList.value = {
+            title: {},
+
+            tooltip: {
+                trigger: 'item'
+            },
+            legend: {
+                orient: 'vertical',
+                top: '50',
+                right: '10',
+                formatter: function (name: string) {
+                    const item = chartData.value.find((i: any) => i.name === name)
+                    return item ? `${name}   ${item.value}次` : name
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+
+            options: {
+                dataZoom: null,
+                title: [
+                    {
+                        text: '暂降方向统计',
+                        left: 'center'
+                    },
+                    {
+                        text: total + '次',
+                        left: 'center',
+                        top: 'center'
+                    }
+                ],
+                series: [
+                    {
+                        type: 'pie',
+                        center: 'center',
+                        radius: ['55%', '75%'],
+                        label: {
+                            show: false,
+                            position: 'outside',
+                            textStyle: {
+                                //数值样式
+                            }
+                        },
+                        name: '事件统计',
+                        data: chartData.value
+                    }
+                ]
+            }
+        }
+    }
 })
 
 const tableRef = ref()
@@ -104,10 +160,28 @@ provide('tableRef', tableRef)
 
 provide('tableStore', tableStore)
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
         OverLimitDetailsRef.value.open(row)
     }
 }
@@ -122,12 +196,12 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 

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

@@ -0,0 +1,150 @@
+<template>
+    <!-- 指标日趋势图 -->
+    <el-dialog draggable :title="dialogTitle" v-model="dialogVisible" append-to-body width="70%">
+        <div :style="pageHeight">
+            <my-echart class="tall" :options="echartList" style="width: 100%" />
+        </div>
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, h } from 'vue'
+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] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object }
+})
+
+const pageHeight = mainHeight(0, 2)
+
+const dialogVisible: any = ref(false)
+
+const dialogTitle = ref('')
+
+const config = useConfig()
+
+const dialogText = ref('')
+
+const echartList = ref()
+
+const init = () => {
+    echartList.value = {
+        title: {
+            text: dialogText.value
+        },
+        legend: {
+            itemWidth: 20,
+            itemHeight: 20,
+            itemStyle: { opacity: 0 }, //去圆点
+            right: 70
+        },
+        tooltip: {
+            trigger: 'axis',
+            formatter: (params: any) => {
+                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: 'time',
+            axisLabel: {
+                formatter: {
+                    day: '{MM}-{dd}',
+                    month: '{MM}',
+                    year: '{yyyy}'
+                }
+            }
+        },
+
+        yAxis: {},
+
+        options: {
+            series: []
+        }
+    }
+}
+
+const initData = async (row: any) => {
+    limitExtentDayData({ code: row.code, lineId: row.lineId, time: row.time }).then(res => {
+        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]
+            const xAxisData = firstItem.time.split(',')
+
+            // 定义相位颜色映射
+            const phaseColors: any = {
+                A: '#DAA520',
+                B: '#2E8B57',
+                C: '#A52a2a'
+            }
+
+            // 处理每条相位数据
+            const seriesData = res.data.map((item: any) => {
+                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: false,
+                    smooth: true,
+                    data: values,
+                    itemStyle: {
+                        normal: {
+                            // 根据相位设置对应颜色
+                            color: phaseColors[item.phasic] || config.layout.elementUiPrimary[0]
+                        }
+                    }
+                }
+            })
+            echartList.value.yAxis.max = max
+            echartList.value.yAxis.min = min
+            // 更新图表配置
+            echartList.value.options.series = seriesData
+            // 注意：使用时间轴时不需要设置 xAxis.data
+        }
+    })
+}
+onMounted(() => {})
+
+const open = async (row: any) => {
+    dialogVisible.value = true
+    dialogTitle.value = row.name + '日趋势图'
+    dialogText.value = `监测点名称:${row.lineName}_越限时间:${row.time}_指标名称:${row.name}`
+    nextTick(() => {
+        initData(row)
+    })
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-select) {
+    min-width: 80px;
+}
+</style>

src/components/cockpit/exceedanceLevel/index.vue

@@ -1,74 +1,81 @@
 <template>
     <div>
         <!--指标越限程度 -->
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+             :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
             :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
         />
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} / 2 )`" isGroup></Table>
-        <!-- 指标越限详情 -->
-        <OverLimitDetails ref="OverLimitDetailsRef" />
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"
+            isGroup
+        ></Table>
+        <!-- 指标日趋势图 -->
+        <DailyTrendChart v-if="dialogTrendChart" ref="dailyTrendChartRef" @close="dialogTrendChart = false" />
     </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 TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
 import { getTimeOfTheMonth } from '@/utils/formatTime'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import DailyTrendChart from '@/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    title: {
-        text: '指标越限严重度'
-    },
 
-    xAxis: {
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
+const TableHeaderRef = ref()
 
-    yAxis: {
-        name: '%', // 给X轴加单位
-        interval: 20
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 7.5, 36, 0, 80],
-                barMaxWidth: 30
+const headerHeight = ref(57)
 
-                // label: {
-                //     show: true,
-                //     position: 'top',
-                //     textStyle: {
-                //         //数值样式
-                //         color: '#000'
-                //     },
-                //     fontSize: 12
-                // }
-            }
-        ]
+const dialogTrendChart = ref(false)
+
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
     }
 })
-const OverLimitDetailsRef = ref()
+
+const echartList = ref()
+
+const dailyTrendChartRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/limitRateDetailD/limitExtentData',
     method: 'POST',
 
     showPage: false,
@@ -90,82 +97,106 @@ const tableStore: any = new TableStore({
 
         {
             title: '越限最大值',
-            field: 'type',
-            minWidth: '60',
+            field: 'maxValue',
+            minWidth: '70',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.type}</span>`
+                const extentValue =
+                    row.maxValue !== null && row.maxValue !== undefined && row.maxValue !== ''
+                        ? Math.floor(row.maxValue * 100) / 100
+                        : '/'
+                return `<span style='cursor: pointer;text-decoration: underline;'>${extentValue}</span>`
             }
         },
         {
             title: '国标限值',
-            field: 'type1',
+            field: 'internationalValue',
             minWidth: '60'
         },
         {
             title: '越限程度(%)',
-            field: 'type2',
-            minWidth: '60'
+            field: 'extent',
+            minWidth: '70',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                // 保留两个小数
+                const extentValue =
+                    row.extent !== null && row.extent !== undefined && row.extent !== ''
+                        ? Math.floor(row.extent * 100) / 100
+                        : '/'
+                return `<span>${extentValue}</span>`
+            }
         },
         {
-            title: '发生日期',
-            field: 'type3',
-            minWidth: '100'
+            title: '越限时间',
+            field: 'time',
+            minWidth: '60',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                if (row.time !== null && row.time !== undefined && row.time !== '') {
+                    return `<span>${row.time}</span>`
+                } else {
+                    return `<span>/</span>`
+                }
+            }
         },
         {
             title: '越限最高监测点',
-            field: 'type4',
-            minWidth: '90'
+            field: 'lineName',
+            minWidth: '90',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                if (row.lineName !== null && row.lineName !== undefined && row.lineName !== '') {
+                    return `<span>${row.lineName}</span>`
+                } else {
+                    return `<span>/</span>`
+                }
+            }
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '闪变',
-                type: '0.0',
-                type1: '2.0',
-                type2: '0.0',
-                type3: '/',
-                type4: '/'
-            },
-            {
-                name: '谐波电压',
-                type: '1.72',
-                type1: '1.6',
-                type2: '7.5',
-                type3: '2025-03-09',
-                type4: '10kV1#电动机'
-            },
-            {
-                name: '谐波电流',
-                type: '27.2',
-                type1: '20.0',
-                type2: '36.0',
-                type3: '2025-03-16',
-                type4: '380V电焊机(治理前)'
-            },
-            {
-                name: '电压偏差',
-                type: '0.0',
-                type1: '2.0',
-                type2: '0.0',
-                type3: '/',
-                type4: '/'
-            },
-            {
-                name: '三相不平衡',
-                type: '3.6',
-                type1: '2.0',
-                type2: '80.0',
-                type3: '2025-03-01',
-                type4: '380V电焊机(治理前)'
-            }
-        ]
+        // 定义 x 轴标签顺序
+        const xAxisLabels = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
 
+        // 根据指标名称顺序提取对应的 extent 数据
+        const chartData = xAxisLabels.map(label => {
+            // 在表格数据中查找对应指标名称的数据项
+            const item = tableStore.table.data.find((row: any) => row.name === label)
+            // 如果找到对应项，则返回 extent 值，否则返回 0，并保留两位小数
+            const extentValue = item ? item.extent || 0 : 0
+            return Math.round(extentValue * 100) / 100
+        })
+        echartList.value = {
+            title: {
+                text: '指标越限严重度'
+            },
+
+            xAxis: {
+                data: xAxisLabels
+            },
+
+            yAxis: {
+                name: '%' // 给X轴加单位
+                // interval: 20
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            options: {
+                series: [
+                    {
+                        type: 'bar',
+                        name: '越限占比',
+                        data: chartData,
+                        barMaxWidth: 30
+                    }
+                ]
+            }
+        }
     }
 })
 
@@ -176,9 +207,30 @@ provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field != 'name') {
-        console.log(row)
-        OverLimitDetailsRef.value.open(row)
+    dialogTrendChart.value = true
+    if (column.field == 'maxValue' && row.lineId) {
+        nextTick(() => {
+            dailyTrendChartRef.value.open(row)
+        })
+    }
+}
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
     }
 }
 
@@ -192,12 +244,12 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 

src/components/cockpit/governanceReport/index.vue

@@ -1,21 +1,16 @@
 <template>
     <div>
         <!--治理效果报表 -->
-        <TableHeader :showReset="false">
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
-                <el-form-item label="治理对象">
-                    <el-select
-                        v-model="tableStore.table.params.power"
-                        placeholder="请选择治理对象"
-                        clearable
-                        style="width: 130px"
-                    >
-                        <el-option
-                            v-for="item in powerList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                <el-form-item label="报表模板">
+                    <el-select filterable v-model="tableStore.table.params.tempId" placeholder="请选择报表模板" clearable>
+                        <el-option v-for="item in templateList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="监测对象">
+                    <el-select filterable v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
+                        <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
             </template>
@@ -26,78 +21,148 @@
         <div style="display: flex">
             <div
                 id="luckysheet"
-                :style="{ width: `calc(${prop.width} )`, height: `calc(${prop.height} - 57px )` }"
+                :style="{
+                    width: `calc(${prop.width} )`,
+                    height: `calc(${prop.height} - 57px + ${fullscreen ? 0 : 56}px)`
+                }"
             ></div>
         </div>
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h } 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 { 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 Json from './index.json'
+import { getTemplateList } from '@/api/harmonic-boot/luckyexcel'
+import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
-})
-const config = useConfig()
-const powerList: any = ref([
-    {
-        label: '1#变压器',
-        value: '1'
-    },
-    {
-        label: '2#变压器',
-        value: '2'
-    }
-])
-
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
-
-    showPage: false,
-    exportName: '主要监测点列表',
-    column: [],
-    beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
-    },
-    loadCallback: () => {}
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
-const tableRef = ref()
-provide('tableRef', tableRef)
-tableStore.table.params.power = '1'
+const TableHeaderRef = ref()
 
-provide('tableStore', tableStore)
+// 报表模板列表
+const templateList = ref()
+
+// 监测对象
+const idList = ref()
+
+// 监测对象
+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 templateListData = () => {
+    getTemplateList({}).then(res => {
+        templateList.value = res.data
+        if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
+            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]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    }
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/customReport/getSensitiveUserReport',
+    method: 'POST',
+    showPage: false,
+    exportName: '治理效果报表',
+    column: [],
+    beforeSearchFun: () => {
+        setTime()
+        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)
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
@@ -105,20 +170,17 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
-:deep(.el-select) {
-    min-width: 80px;
-}
-
+// :deep(.el-select) {
+//     min-width: 80px;
+// }
 </style>

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

@@ -0,0 +1,708 @@
+<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)"
+                            filterable
+                        >
+                            <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"
+                            filterable
+                        >
+                            <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"
+                                filterable
+                            >
+                                <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

@@ -0,0 +1,186 @@
+<template>
+    <div>
+        <!-- 指标越限详情  -->
+        <el-dialog draggable title="指标越限详情" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select
+                            v-model="tableStore.table.params.lineId"
+                            placeholder="请选择监测点"
+                            style="width: 150px"
+                            filterable
+                        >
+                            <el-option
+                                v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide,nextTick } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import HarmonicRatio‌ from '@/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue'
+import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+
+const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
+
+const options = ref()
+const height = mainHeight(0, 2).height as any
+const tableHeaderRef = ref()
+const dialogFlag = ref(false)
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 26; i++) {
+        list.push({
+            title: i + '次',
+            field: key + i + 'Overtime',
+            width: '60',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
+            }
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/totalLimitStatistics/details',
+    method: 'POST',
+    publicHeight: 30,
+    showPage: false,
+    exportName: '每日越限占比统计',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '日期',
+            field: 'time',
+            width: '150',
+            sortable: true
+        },
+        {
+            title: '名称',
+            field: 'lineName',
+            width: '150'
+        },
+        {
+            title: '闪变越限(%)',
+            field: 'flickerOvertime',
+            width: '90',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+        {
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '电压偏差越限(%)',
+            field: 'voltageDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '频率偏差越限(%)',
+            field: 'freqDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+            }
+        }
+    ],
+     beforeSearchFun: () => {
+    },
+    loadCallback: () => {
+    }
+})
+
+
+provide('tableStore', tableStore)
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+    dialogVisible.value = true
+    initCSlineList()
+    tableStore.table.params.lineId = row.lineId
+
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime =searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+    })
+
+}
+
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    if (column.field != 'name' && column.field != 'time') {
+        dialogFlag.value = true
+        dialogVisible.value = false
+        nextTick(() => {
+            harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        })
+
+    }
+}
+
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+     dialogFlag.value = false
+    // 重新打开指标越限详情弹窗
+    nextTick(() => {
+        dialogVisible.value = true
+    })
+}
+
+const initCSlineList = async () => {
+    const res = await cslineList({})
+    options.value = res.data
+}
+
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/gridSideStatistics/index.vue

@@ -1,13 +1,27 @@
 <template>
     <div>
-
         <!--电网侧指标越限统计 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker  :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} / 2 )`
+            }"
         />
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} / 2 )`" isGroup></Table>
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"
+            isGroup
+        ></Table>
         <!-- 指标越限详情 -->
         <OverLimitDetails ref="OverLimitDetailsRef" />
     </div>
@@ -16,60 +30,102 @@
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import OverLimitDetails from '@/components/cockpit/gridSideStatistics/components/overLimitDetails.vue'
+import { gridSideLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    title: {
-        text: '指标越限占比'
-    },
 
-    xAxis: {
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
+const headerHeight = ref(57)
 
-    yAxis: {
-        name: '%', // 给X轴加单位
-        interval: 20
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 45, 22, 0, 70],
-                barMaxWidth: 30,
+const echartList = ref({})
 
-                // label: {
-                //     show: true,
-                //     position: 'top',
-                //     textStyle: {
-                //         //数值样式
-                //         color: '#000'
-                //     },
-                //     fontSize: 12
-                // }
-            }
-        ]
+const TableHeaderRef = ref()
+
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
     }
 })
+
+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: '指标越限占比'
+            },
+
+            xAxis: {
+                // name: '(区域)',
+                data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+            },
+
+            yAxis: {
+                name: '%', // 给X轴加单位
+                interval: 20
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            options: {
+                series: [
+                    {
+                        //   name: '暂降次数',
+                        type: 'bar',
+                        name: '越限占比',
+                        data: dataArray,
+                        barMaxWidth: 30
+
+                        // label: {
+                        //     show: true,
+                        //     position: 'top',
+                        //     textStyle: {
+                        //         //数值样式
+                        //         color: '#000'
+                        //     },
+                        //     fontSize: 12
+                        // }
+                    }
+                ]
+            }
+        }
+    })
+}
+
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/gridSideLimitStatistics/list',
     method: 'POST',
 
     showPage: false,
@@ -85,7 +141,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '名称',
-            field: 'name',
+            field: 'lineName',
             minWidth: '90'
         },
         {
@@ -93,69 +149,58 @@ 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>`
                     }
                 }
             ]
         }
     ],
     beforeSearchFun: () => {
-       tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '1#变压器电网侧',
-                type: '0',
-                type1: '45',
-                type2: '22',
-                type3: '0',
-                type4: '70'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
+        initEcharts()
     }
 })
 
@@ -167,27 +212,50 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
-        OverLimitDetailsRef.value.open(row)
+        OverLimitDetailsRef.value.open(
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
     }
 }
 
 onMounted(() => {
     tableStore.index()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
 watch(
     () => prop.timeKey,
     val => {
         tableStore.index()
+        initEcharts()
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 

src/components/cockpit/indicatorDetails/index.vue

@@ -1,26 +1,38 @@
 <template>
     <div>
         <!--指标越限明细 -->
-
-        <el-calendar v-model="value" :style="{ height: prop.height, overflow: 'auto' }">
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker 
+            v-if="fullscreen"
+            :timeKeyList="prop.timeKey"
+        ></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
-                        effect="dark"
-                        placement="top"
-                        :hide-after="0"
-                        v-if="list?.filter(item => item.time == data.day)[0]?.text || false"
-                    >
+                    <el-tooltip effect="dark" placement="top" :hide-after="0" v-if="getTextForDate(data.day)">
                         <template #content>
-                            <span v-html="list?.filter(item => item.time == data.day)[0]?.text || ''"></span>
+                            <span v-html="getTextForDate(data.day)"></span>
                         </template>
-                        <div
-                            :style="{ height: `calc(${prop.height} / 5 - 47px)`, overflow: 'auto' }"
-                            v-html="list?.filter(item => item.time == data.day)[0]?.text || ''"
-                        ></div>
+                         <div class="details" v-html="fullscreen ? getTextForDate(data.day) : '有越限'"></div>
                     </el-tooltip>
                 </div>
             </template>
@@ -30,135 +42,161 @@
 <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 { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import { overflow } from 'html2canvas/dist/types/css/property-descriptors/overflow'
+import TableHeader from '@/components/table/header/index.vue'
 import { dayjs } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
+
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
+})
+
+const headerHeight = ref(57)
+
+const list = ref()
+
+const TableHeaderRef = ref()
 
 dayjs.en.weekStart = 1 //设置日历的周起始日为星期一
 const value = ref(new Date())
-const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
-})
-const list = ref([
-    {
-        time: '2025-10-01',
-        key: 81,
-        text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
-    },
-    {
-        time: '2025-10-31',
-        key: 81,
-        text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
-    },
-    {
-        time: '2025-10-08',
-        key: 20,
-        text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
-    },
-    {
-        time: '2025-10-16',
-        key: 20,
-        text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
-    },
-    {
-        time: '2025-10-23',
-        key: 20,
-        text: '3次谐波越限<br/>5次谐波越限<br/>三相不平衡越限'
-    },
-    {
-        time: '2025-10-04',
-        key: 0,
-        text: ''
-    },
-    {
-        time: '2025-10-05',
-        key: 0,
-        text: ''
+
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const getTextForDate = (date: string) => {
+    const item = list.value?.find((item: any) => item.time === date)
+    return item ? item.text : ''
+}
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/limitRateDetailD/limitCalendarData',
     method: 'POST',
-
     showPage: false,
-
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
-        // value.value = new Date(prop.timeValue?.[0])
+        setTime()
     },
     loadCallback: () => {
-        tableStore.table.data = []
+        value.value = tableStore.table.params.searchBeginTime
+        if (tableStore.table.data && tableStore.table.data.length > 0) {
+            list.value = tableStore.table.data.map((item: any) => {
+                // 将 items 数组转换为带换行的文本
+                const text = item.items && item.items.length > 0 ? item.items.join('<br/>') : ''
+
+                return {
+                    time: item.time,
+                    key: item.status || 0,
+                    text: text
+                }
+            })
+        } else {
+            list.value = []
+        }
     }
 })
 
-const tableRef = ref([])
-
 const setBackground = (value: string) => {
-    let data = []
-    data = list.value?.filter(item => item.time == value)
+    const data = list.value?.find((item: any) => item.time === value)
 
-    if (data && data?.length > 0) {
-        if (data[0].key < 10) {
-            return '#33996690'
-        } else if (data[0].key < 80) {
-            return '#FFCC3390'
-        } else if (data[0].key <= 100) {
-            return '#Ff660090'
+    if (data) {
+        // 根据 status 值返回对应的颜色
+        switch (data.key) {
+            case 0: // 无越限
+                return '#33996690'
+            case 1: // 一般越限
+                return '#FFCC3390'
+            case 2: // 严重越限
+                return '#Ff660090'
+            default:
+                return '#fff' // 默认白色背景
         }
     }
 
-    return '#fff'
+    return '#fff' // 默认白色背景
 }
 
-provide('tableRef', tableRef)
-
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
-})
-watch(
-    () => prop.timeKey,
-    val => {
+    nextTick(() => {
         tableStore.index()
+    })
+})
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
     }
-)
+}
+
+
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        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

@@ -1,377 +1,446 @@
 <template>
     <div>
         <!--指标越限概率分布 -->
-        <my-echart
-            class="tall"
-            :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
-        />
-        <my-echart
-            class="mt10"
-            :options="echartList1"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 - 10px)` }"
-        />
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" @selectChange="selectChange" datePicker v-if="fullscreen">
+            <template v-slot:select>
+                <el-form-item label="监测点">
+                    <el-select size="small" filterable v-model="tableStore.table.params.lineId">
+                        <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"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+                }"
+            />
+            <my-echart
+                class="mt10"
+                :options="echartList1"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+                }"
+            />
+        </div>
     </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 TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { limitProbabilityData, cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    options: {
-        xAxis: null,
-        yAxis: null,
-        dataZoom: null,
-        backgroundColor: '#fff',
-        tooltip: {
-            // trigger: 'axis'
-            textStyle: {
-                color: '#fff',
-                fontStyle: 'normal',
-                opacity: 0.35,
-                fontSize: 14
-            },
-            backgroundColor: 'rgba(0,0,0,0.55)',
-            borderWidth: 0,
-            formatter: function (params: any) {
-                console.log(params)
-                var tips = ''
-                for (var i = 0; i < params.length; i++) {
-                    tips += params[i].name + '</br/>'
-                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
-                }
-                return tips
-            }
-        },
-        title: {
-            text: '指标越限概率分布',
-            x: 'center'
-        },
 
-        visualMap: {
-            max: 20,
-            show: false,
-            inRange: {
-                color: ['#313695', '#00BB00', '#ff8000', '#a50026']
-            }
-        },
-        xAxis3D: {
-            type: 'category',
-            name: '指标越限',
-            data: ['0-10', '10-20', '20-30', '30-40', '40-50'],
-            axisLine: {
-                lineStyle: {
-                    color: '#111'
-                }
-            },
-            axisLabel: {
-                color: '#111'
-            }
-        },
-        yAxis3D: {
-            type: 'category',
-            name: '指标类型',
-            data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'],
-            nameTextStyle: {
-                color: '#111'
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#111'
-                }
-            },
-            axisLabel: {
-                color: '#111'
-            },
-            splitLine: {
-                lineStyle: {
-                    // 使用深浅的间隔色
-                    color: ['#111'],
-                    type: 'dashed',
-                    opacity: 0.5
-                }
-            }
-        },
-        zAxis3D: {
-            type: 'value',
-            splitNumber: 10,
-            minInterval: 10,
-            name: '越限占比'
-        },
-        grid3D: {
-            viewControl: {
-                projection: 'perspective',
-                distance: 250
-            },
-            boxWidth: 200,
-            boxDepth: 80,
-            light: {
-                main: {
-                    intensity: 1.2
-                },
-                ambient: {
-                    intensity: 0.3
-                }
-            }
-        },
-        series: [
-            {
-                type: 'bar3D',
-                data: [
-                    [0, 0, 1],
-                    [0, 1, 1],
-                    [0.2, 1]
-                ],
-                shading: 'realistic',
-                label: {
-                    show: false,
-                    textStyle: {
-                        fontSize: 16,
-                        borderWidth: 1
+// const options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
+
+const lineList = ref()
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const echartList = ref()
+
+const echartList1 = ref()
+
+const probabilityData = ref()
+
+const initLineList = async () => {
+    cslineList({}).then(res => {
+        lineList.value = res.data
+        tableStore.table.params.lineId = lineList.value[0].lineId
+        tableStore.index()
+    })
+}
+
+// 越限程度概率分布
+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
                     }
-                },
+                })
+            }
 
-                itemStyle: {
-                    opacity: 1
-                },
-                emphasis: {
-                    label: {
+            // 计算 z 轴最大值（最大值加 5）
+            const zAxisMax = Math.ceil(maxValue) + 5
+            // 构造 yAxis 数据（指标类型名称）
+            const yAxisData = sortedData.map(item => item.indexName)
+
+            echartList.value = {
+                options: {
+                    backgroundColor: '#fff',
+                    tooltip: {
                         textStyle: {
-                            fontSize: 20,
-                            color: '#900'
+                            color: '#fff',
+                            fontStyle: 'normal',
+                            opacity: 0.35,
+                            fontSize: 14
+                        },
+                        backgroundColor: 'rgba(0,0,0,0.55)',
+                        borderWidth: 0,
+                        formatter: function (params: any) {
+                            var yIndex = params.value[1] //获取y轴索引
+                            var tips = ''
+                            tips += '指标类型: ' + yAxisData[yIndex] + '</br>'
+                            tips += '越限程度: ' + params.seriesName + '</br>'
+                            tips += '越限次数: ' + params.value[2] + '</br>'
+                            return tips
                         }
                     },
-                    itemStyle: {
-                        color: '#900'
-                    }
+                    title: {
+                        text: '指标越限概率分布',
+                        x: 'center',
+                        textStyle: {
+                            fontSize: 16,
+                            fontWeight: 'normal'
+                        }
+                    },
+                    // 移除或隐藏 visualMap 组件
+                    visualMap: {
+                        show: false, // 设置为 false 隐藏右侧颜色条
+                        min: 0,
+                        // max: 100,
+                        max: zAxisMax, // 使用计算出的最大值加5
+                        inRange: {
+                            color: ['#313695', '#00BB00', '#ff8000', '#d73027', '#a50026']
+                        }
+                    },
+                    // 添加 legend 配置并设置为不显示
+                    legend: {
+                        show: false // 隐藏图例
+                    },
+                    xAxis3D: {
+                        type: 'category',
+                        name: '越限程度',
+                        nameLocation: 'middle',
+                        nameGap: 50,
+                        data: ['0-20%', '20-40%', '40-60%', '60-80%', '80-100%']
+                    },
+                    yAxis3D: {
+                        type: 'category',
+                        name: '指标类型',
+                        nameLocation: 'middle',
+                        nameGap: 50,
+                        data: yAxisData,
+
+                        splitLine: {
+                            lineStyle: {
+                                type: 'dashed',
+                                opacity: 0.5
+                            }
+                        }
+                    },
+                    zAxis3D: {
+                        type: 'value',
+                        name: '越限次数',
+                        nameLocation: 'middle',
+                        nameGap: 30,
+                        minInterval: 10
+
+                        // max: 100
+                    },
+                    grid3D: {
+                        viewControl: {
+                            projection: 'perspective',
+                            distance: 250,
+                            rotateSensitivity: 10,
+                            zoomSensitivity: 2
+                        },
+                        boxWidth: 150,
+                        boxDepth: 100,
+                        boxHeight: 100,
+                        light: {
+                            main: {
+                                intensity: 1.2
+                            },
+                            ambient: {
+                                intensity: 0.4
+                            }
+                        }
+                    },
+                    series: [
+                        {
+                            type: 'bar3D',
+                            name: '0-20%',
+                            data: seriesData.filter((item: any) => item[0] === 0),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '20-40%',
+                            data: seriesData.filter((item: any) => item[0] === 1),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '40-60%',
+                            data: seriesData.filter((item: any) => item[0] === 2),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '60-80%',
+                            data: seriesData.filter((item: any) => item[0] === 3),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '80-100%',
+                            data: seriesData.filter((item: any) => item[0] === 4),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        }
+                    ]
                 }
             }
-        ]
-    }
-})
-const echartList1 = ref({
-    title: {
-        text: '越限时间概率分布'
-    },
-
-    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 = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
+        // 只有当 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])
+            }
+        })
+
+        echartList1.value = {
+            title: {
+                text: '越限时间概率分布'
+            },
+            tooltip: {
+                trigger: 'axis'
+            },
+            legend: {
+                data: indexNames
+            },
+            xAxis: {
+                type: 'category',
+                name: '时间段',
+                data: timePeriods
+            },
+            yAxis: {
+                type: 'value'
+                // name: '次数'
+            },
+            series: seriesData
+        }
+        initProbabilityData()
     }
 })
 
-const tableRef = ref()
-provide('tableRef', tableRef)
-
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
+    initLineList()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
 watch(
     () => prop.timeKey,
     val => {
@@ -379,12 +448,12 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 

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

@@ -0,0 +1,709 @@
+<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)"
+                            filterable
+                        >
+                            <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"
+                            filterable
+                        >
+                            <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"
+                                filterable
+                            >
+                                <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/indicatorFittingChart/components/overLimitDetails.vue

@@ -0,0 +1,191 @@
+<template>
+    <div>
+        <!-- 指标越限详情  -->
+        <el-dialog draggable title="指标越限详情" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select
+                            v-model="tableStore.table.params.lineId"
+                            placeholder="请选择监测点"
+                            style="width: 150px"
+                            filterable
+                        >
+                            <el-option
+                                v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌
+            ref="harmonicRatio‌Ref"
+            @close="onHarmonicRatioClose"
+            v-if="dialogFlag"
+        />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide,nextTick } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import HarmonicRatio‌ from '@/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue'
+import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+
+const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
+
+const dialogFlag = ref(false)
+
+const options = ref()
+const height = mainHeight(0, 2).height as any
+const tableHeaderRef = ref()
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 26; i++) {
+        list.push({
+            title: i + '次',
+            field: key + i + 'Overtime',
+            width: '60',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
+            }
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/mainLine/statLimitRateDetails',
+    method: 'POST',
+    publicHeight: 30,
+    showPage: false,
+    exportName: '主要监测点列表',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '日期',
+            field: 'time',
+            width: '150',
+            sortable: true
+        },
+        {
+            title: '名称',
+            field: 'lineName',
+            width: '150'
+        },
+        {
+            title: '闪变越限(分钟)',
+            field: 'flickerOvertime',
+            width: '90',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('iharm')
+        },
+        {
+            title: '三相不平衡度越限(分钟)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '电压偏差越限(分钟)',
+            field: 'uaberranceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '频率偏差越限(分钟)',
+            field: 'freqDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+            }
+        }
+    ],
+     beforeSearchFun: () => {
+    },
+    loadCallback: () => {
+    }
+})
+
+
+provide('tableStore', tableStore)
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+    dialogVisible.value = true
+    initCSlineList()
+    tableStore.table.params.lineId = row.lineId
+
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime =searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+    })
+
+}
+
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    if (column.field != 'name' && column.field != 'time') {
+        dialogFlag.value = true
+        dialogVisible.value = false
+        nextTick(() => {
+            harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        })
+
+    }
+}
+
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+    dialogFlag.value = false
+    // 重新打开指标越限详情弹窗
+    nextTick(() => {
+        dialogVisible.value = true
+    })
+}
+
+const initCSlineList = async () => {
+    const res = await cslineList({})
+    options.value = res.data
+}
+
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/indicatorFittingChart/index.vue

@@ -1,41 +1,75 @@
 <template>
     <div>
         <!--主要监测点列表 -->
-        <TableHeader :showReset="false" >
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" @selectChange="selectChange" v-if="fullscreen" datePicker ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="关键词">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输关键字" />
+                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输关键字" />
                 </el-form-item>
             </template>
         </TableHeader>
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height}  - 58px)`"></Table>
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? -58 : 56}px )`"
+        ></Table>
         <!-- 指标越限详情 -->
         <OverLimitDetails ref="OverLimitDetailsRef" />
     </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 Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import { ElTag } from 'element-plus'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import { getTime } from '@/utils/formatTime'
+import OverLimitDetails from '@/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const dictData = useDictData()
 const OverLimitDetailsRef = ref()
+const headerHeight = ref(57)
+
+const route = useRoute()
+const timeCacheStore = useTimeCacheStore()
+
+const TableHeaderRef = ref()
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+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-harmonic-boot/mainLine/list',
     method: 'POST',
-  
-    showPage: false,
+    showPage: fullscreen.value ? true : false,
     exportName: '主要监测点列表',
     column: [
         {
@@ -48,95 +82,82 @@ const tableStore: any = new TableStore({
         },
         {
             title: '监测点名称',
-            field: 'name',
+            field: 'lineName',
             minWidth: '90',
-
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.name}</span>`
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
             }
         },
 
         {
             title: '监测对象类型',
-            field: 'type',
+            field: 'objType',
             minWidth: '90'
         },
         {
             title: '是否治理',
-            field: 'whetherToGovern',
+            field: 'govern',
             minWidth: '70'
         },
 
-        { title: '主要存在的电能质量问题', field: 'question', minWidth: '150' }
+        { title: '主要存在的电能质量问题', field: 'problems', minWidth: '150', showOverflow: true }
     ],
     beforeSearchFun: () => {
-    tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+       setTime()
     },
     loadCallback: () => {
-
-        tableStore.table.data = [
-            {
-                name: '10kV1#电动机',
-                type: '电动机',
-                whetherToGovern: '否',
-                question: '3次谐波电压、5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '10kV2#(治理后)',
-                type: '电焊机',
-                whetherToGovern: '100A APF',
-                question: '所有指标均合格'
-            },
-            {
-                name: '380V电焊机(治理前)',
-                type: '电焊机',
-                whetherToGovern: '100A APF',
-                question: '5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '380V水泵机',
-                type: '电动机',
-                whetherToGovern: '否',
-                question: '所有指标均合格'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
     }
 })
 
 const tableRef = ref()
 provide('tableRef', tableRef)
-tableStore.table.params.type = ''
-tableStore.table.params.searchValue = ''
+tableStore.table.params.keywords = ''
 provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field == 'name') {
-        console.log(row)
-        OverLimitDetailsRef.value.open(row)
+    if (column.field == 'lineName') {
+        OverLimitDetailsRef.value.open(
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
     }
 }
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        // TableHeaderRef.value?.setInterval(time[2] - 0)
+        // TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
+// 在组件挂载时设置缓存值到 DatePicker
 onMounted(() => {
     tableStore.index()
 })
+
 watch(
-    () => prop.timeKey,
-    val => {
-        tableStore.index()
-    }
-)
-watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 

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

@@ -0,0 +1,449 @@
+<template>
+    <!-- 总体指标占比详情谐波含有率 -->
+    <el-dialog draggable title="谐波电压/电流含有率" v-model="dialogVisible" append-to-body width="70%">
+        <TableHeader datePicker showExport :showReset="false" @selectChange="selectChange">
+            <template v-slot:select>
+                <el-form-item label="谐波次数">
+                    <el-select
+                        v-model="tableStore.table.params.searchValue"
+                        placeholder="请选择谐波次数"
+                        style="width: 150px"
+                    >
+                        <el-option
+                            v-for="item in harmonicOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="指标类型" v-show="!tableStore.table.params.checked">
+                    <el-select
+                        v-model="tableStore.table.params.indicatorType"
+                        placeholder="请选择指标类型"
+                        style="width: 150px"
+                    >
+                        <el-option
+                            v-for="item in indicatorList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="指标类型1" v-show="tableStore.table.params.checked == true">
+                    <el-select
+                        v-model="tableStore.table.params.indicatorType1"
+                        placeholder="请选择指标类型1"
+                        style="width: 150px"
+                    >
+                        <el-option
+                            v-for="item in indicatorList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="指标类型2" v-show="tableStore.table.params.checked == true">
+                    <el-select
+                        v-model="tableStore.table.params.indicatorType2"
+                        placeholder="请选择指标类型2"
+                        style="width: 150px"
+                    >
+                        <el-option
+                            v-for="item in indicatorList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-checkbox v-model="tableStore.table.params.checked">指标对比分析</el-checkbox>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <my-echart
+            class="tall"
+            v-if="!tableStore.table.params.checked"
+            :options="echartList"
+            style="width: 98%; height: 320px"
+        />
+        <my-echart class="tall" v-else :options="echartContrastList" style="width: 98%; height: 320px" />
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, h } from 'vue'
+import TableStore from '@/utils/tableStore'
+import TableHeader from '@/components/table/header/index.vue'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useConfig } from '@/stores/config'
+const prop = defineProps({
+    width: { type:  [String, Number]},
+    height: { type:  [String, Number]},
+    timeKey: { type:  [String, Number]},
+    timeValue: { type: Object }
+})
+
+const dialogVisible: any = ref(false)
+
+const options = [
+    {
+        value: '35kV进线',
+        label: '35kV进线'
+    }
+]
+
+const config = useConfig()
+
+const harmonicOptions = Array.from({ length: 50 }, (_, i) => ({
+    value: String(i + 1),
+    label: `${i + 1}次谐波`
+}))
+
+const exceedingTheLimitList: any = ref([
+    {
+        label: '越限',
+        value: '1'
+    },
+    {
+        label: '不越限',
+        value: '0'
+    }
+])
+const indicatorList: any = ref([
+    {
+        label: '谐波电压总畸变率',
+        value: '1'
+    },
+    {
+        label: '各次谐波电压',
+        value: '2'
+    },
+    {
+        label: '各次谐波电压',
+        value: '3'
+    },
+    {
+        label: '三相电压不平衡',
+        value: '4'
+    }
+])
+const echartList = ref({
+    title: {
+        text: '谐波电压含有率'
+    },
+    xAxis: {
+        type: 'time',
+        axisLabel: {
+            formatter: {
+                day: '{MM}-{dd}',
+                month: '{MM}',
+                year: '{yyyy}'
+            }
+        }
+    },
+    yAxis: [{}, {}],
+    grid: {
+        left: '10px',
+        right: '20px'
+    },
+    options: {
+        series: [
+            {
+                name: 'A相',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0.5],
+                    ['2025-10-16 07:15:00', 0.6],
+                    ['2025-10-16 07:30:00', 0.4],
+                    ['2025-10-16 07:45:00', 0.7],
+                    ['2025-10-16 08:00:00', 1.2],
+                    ['2025-10-16 08:15:00', 1.5],
+                    ['2025-10-16 08:30:00', 1.8],
+                    ['2025-10-16 08:45:00', 2.1],
+                    ['2025-10-16 09:00:00', 2.5],
+                    ['2025-10-16 09:15:00', 2.8],
+                    ['2025-10-16 09:30:00', 3.0],
+                    ['2025-10-16 09:45:00', 2.7],
+                    ['2025-10-16 10:00:00', 2.2],
+                    ['2025-10-16 10:15:00', 1.9],
+                    ['2025-10-16 10:30:00', 1.6],
+                    ['2025-10-16 10:45:00', 1.3],
+                    ['2025-10-16 11:00:00', 1.1],
+                    ['2025-10-16 11:15:00', 0.8],
+                    ['2025-10-16 11:30:00', 0.6],
+                    ['2025-10-16 11:45:00', 0.4],
+                    ['2025-10-16 12:00:00', 0.3],
+                    ['2025-10-16 12:15:00', 0.2],
+                    ['2025-10-16 12:30:00', 0.3],
+                    ['2025-10-16 12:45:00', 0.4]
+                ],
+                yAxisIndex: 0
+            },
+            {
+                name: 'B相',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0.4],
+                    ['2025-10-16 07:15:00', 0.5],
+                    ['2025-10-16 07:30:00', 0.3],
+                    ['2025-10-16 07:45:00', 0.6],
+                    ['2025-10-16 08:00:00', 1.0],
+                    ['2025-10-16 08:15:00', 1.3],
+                    ['2025-10-16 08:30:00', 1.6],
+                    ['2025-10-16 08:45:00', 1.9],
+                    ['2025-10-16 09:00:00', 2.2],
+                    ['2025-10-16 09:15:00', 2.5],
+                    ['2025-10-16 09:30:00', 2.7],
+                    ['2025-10-16 09:45:00', 2.4],
+                    ['2025-10-16 10:00:00', 2.0],
+                    ['2025-10-16 10:15:00', 1.7],
+                    ['2025-10-16 10:30:00', 1.4],
+                    ['2025-10-16 10:45:00', 1.1],
+                    ['2025-10-16 11:00:00', 0.9],
+                    ['2025-10-16 11:15:00', 0.7],
+                    ['2025-10-16 11:30:00', 0.5],
+                    ['2025-10-16 11:45:00', 0.3],
+                    ['2025-10-16 12:00:00', 0.2],
+                    ['2025-10-16 12:15:00', 0.1],
+                    ['2025-10-16 12:30:00', 0.2],
+                    ['2025-10-16 12:45:00', 0.3]
+                ],
+                yAxisIndex: 0
+            },
+            {
+                name: 'C相',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0.6],
+                    ['2025-10-16 07:15:00', 0.7],
+                    ['2025-10-16 07:30:00', 0.5],
+                    ['2025-10-16 07:45:00', 0.8],
+                    ['2025-10-16 08:00:00', 1.4],
+                    ['2025-10-16 08:15:00', 1.7],
+                    ['2025-10-16 08:30:00', 2.0],
+                    ['2025-10-16 08:45:00', 2.3],
+                    ['2025-10-16 09:00:00', 2.8],
+                    ['2025-10-16 09:15:00', 3.1],
+                    ['2025-10-16 09:30:00', 3.3],
+                    ['2025-10-16 09:45:00', 3.0],
+                    ['2025-10-16 10:00:00', 2.5],
+                    ['2025-10-16 10:15:00', 2.1],
+                    ['2025-10-16 10:30:00', 1.8],
+                    ['2025-10-16 10:45:00', 1.5],
+                    ['2025-10-16 11:00:00', 1.3],
+                    ['2025-10-16 11:15:00', 1.0],
+                    ['2025-10-16 11:30:00', 0.8],
+                    ['2025-10-16 11:45:00', 0.6],
+                    ['2025-10-16 12:00:00', 0.5],
+                    ['2025-10-16 12:15:00', 0.4],
+                    ['2025-10-16 12:30:00', 0.5],
+                    ['2025-10-16 12:45:00', 0.6]
+                ],
+                yAxisIndex: 0
+            },
+            {
+                name: '暂降触发点',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 3.14159],
+                    ['2025-10-16 07:15:00', 3.14159],
+                    ['2025-10-16 07:30:00', 3.14159],
+                    ['2025-10-16 07:45:00', 3.14159],
+                    ['2025-10-16 08:00:00', 3.14159],
+                    ['2025-10-16 08:15:00', 3.14159],
+                    ['2025-10-16 08:30:00', 3.14159],
+                    ['2025-10-16 08:45:00', 3.14159],
+                    ['2025-10-16 09:00:00', 3.14159],
+                    ['2025-10-16 09:15:00', 3.14159],
+                    ['2025-10-16 09:30:00', 3.14159],
+                    ['2025-10-16 09:45:00', 3.14159],
+                    ['2025-10-16 10:00:00', 3.14159],
+                    ['2025-10-16 10:15:00', 3.14159],
+                    ['2025-10-16 10:30:00', 3.14159],
+                    ['2025-10-16 10:45:00', 3.14159],
+                    ['2025-10-16 11:00:00', 3.14159],
+                    ['2025-10-16 11:15:00', 3.14159],
+                    ['2025-10-16 11:30:00', 3.14159],
+                    ['2025-10-16 11:45:00', 3.14159],
+                    ['2025-10-16 12:00:00', 3.14159],
+                    ['2025-10-16 12:15:00', 3.14159],
+                    ['2025-10-16 12:30:00', 3.14159],
+                    ['2025-10-16 12:45:00', 3.14159]
+                ],
+                lineStyle: {
+                    type: 'dashed',
+                    color: '#ff0000' // 红色
+                },
+                itemStyle: {
+                    color: '#ff0000' // 红色
+                },
+                yAxisIndex: 0
+            }
+        ]
+    }
+})
+
+const echartContrastList = ref({
+    title: {
+        text: 'A相谐波电压和A相谐波电流对比趋势图'
+    },
+    xAxis: {
+        type: 'time',
+        axisLabel: {
+            formatter: {
+                day: '{MM}-{dd}',
+                month: '{MM}',
+                year: '{yyyy}'
+            }
+        }
+    },
+    yAxis: [{}, {}],
+    grid: {
+        left: '10px',
+        right: '20px'
+    },
+    options: {
+        series: [
+            {
+                name: 'A相谐波电压',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0],
+                    ['2025-10-16 07:15:00', 0],
+                    ['2025-10-16 07:30:00', 0],
+                    ['2025-10-16 07:45:00', 0],
+                    ['2025-10-16 08:00:00', 0],
+                    ['2025-10-16 08:15:00', 0.1],
+                    ['2025-10-16 08:30:00', 0.1],
+                    ['2025-10-16 08:45:00', 0.1],
+                    ['2025-10-16 09:00:00', 1],
+                    ['2025-10-16 09:15:00', 1],
+                    ['2025-10-16 09:30:00', 1],
+                    ['2025-10-16 09:45:00', 1],
+                    ['2025-10-16 10:00:00', 0.8],
+                    ['2025-10-16 10:15:00', 0.8],
+                    ['2025-10-16 10:30:00', 0.8],
+                    ['2025-10-16 10:45:00', 0.8],
+                    ['2025-10-16 11:00:00', 0.8],
+                    ['2025-10-16 11:15:00', 0.1],
+                    ['2025-10-16 11:30:00', 0.1],
+                    ['2025-10-16 11:45:00', 0.1],
+                    ['2025-10-16 12:00:00', 0],
+                    ['2025-10-16 12:15:00', 0],
+                    ['2025-10-16 12:30:00', 0],
+                    ['2025-10-16 12:45:00', 0]
+                ],
+                yAxisIndex: 0
+            },
+            {
+                name: 'A相谐波电流',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0],
+                    ['2025-10-16 07:15:00', 0],
+                    ['2025-10-16 07:30:00', 0],
+                    ['2025-10-16 07:45:00', 0],
+                    ['2025-10-16 08:00:00', 0],
+                    ['2025-10-16 08:15:00', 0.05],
+                    ['2025-10-16 08:30:00', 0.05],
+                    ['2025-10-16 08:45:00', 0.05],
+                    ['2025-10-16 09:00:00', 0.5],
+                    ['2025-10-16 09:15:00', 0.5],
+                    ['2025-10-16 09:30:00', 0.5],
+                    ['2025-10-16 09:45:00', 0.5],
+                    ['2025-10-16 10:00:00', 0.4],
+                    ['2025-10-16 10:15:00', 0.4],
+                    ['2025-10-16 10:30:00', 0.4],
+                    ['2025-10-16 10:45:00', 0.4],
+                    ['2025-10-16 11:00:00', 0.4],
+                    ['2025-10-16 11:15:00', 0.05],
+                    ['2025-10-16 11:30:00', 0.05],
+                    ['2025-10-16 11:45:00', 0.05],
+                    ['2025-10-16 12:00:00', 0],
+                    ['2025-10-16 12:15:00', 0],
+                    ['2025-10-16 12:30:00', 0],
+                    ['2025-10-16 12:45:00', 0]
+                ],
+                yAxisIndex: 1
+            }
+        ]
+    }
+})
+
+const headerHeight = ref(57)
+const selectChange = (showSelect: any, height: any) => {
+    headerHeight.value = height
+}
+const tableStore: any = new TableStore({
+    url: '/user-boot/role/selectRoleDetail?id=0',
+    method: 'POST',
+
+    showPage: false,
+    exportName: '主要监测点列表',
+    column: [],
+    beforeSearchFun: () => {},
+    loadCallback: () => {
+        tableStore.table.height = `calc(${prop.height} - 80px)`
+    }
+})
+
+const tableRef = ref()
+provide('tableRef', tableRef)
+tableStore.table.params.power = '1'
+tableStore.table.params.indicator = '1'
+tableStore.table.params.exceedingTheLimit = '1'
+tableStore.table.params.searchValue = ''
+tableStore.table.params.checked = false
+tableStore.table.params.indicatorType = '' // 指标类型
+tableStore.table.params.indicatorType1 = '' // 指标类型1
+tableStore.table.params.indicatorType2 = '' // 指标类型2
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    (newVal, oldVal) => {
+        tableStore.index()
+    },
+    {
+        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+    }
+)
+
+const openDialog = async (row: any) => {
+    dialogVisible.value = true
+    tableStore.index()
+}
+
+defineExpose({ openDialog })
+</script>
+<style lang="scss" scoped>
+:deep(.el-select) {
+    min-width: 80px;
+}
+</style>

src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails copy.vue

@@ -0,0 +1,134 @@
+<template>
+    <!-- 综合评估详情 -->
+    <el-dialog draggable title="指标合格率统计" v-model="dialogVisible" append-to-body width="70%">
+        <TableHeader datePicker showExport :showReset="false">
+            <template v-slot:select>
+                <el-form-item label="监测点名称">
+                    <el-select
+                        v-model="tableStore.table.params.searchValue"
+                        placeholder="请选择监测点名称"
+                        style="width: 240px"
+                    >
+                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" isGroup :height="height"></Table>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, provide } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+const dialogVisible: any = ref(false)
+const options = [
+    {
+        value: '35kV进线',
+        label: '35kV进线'
+    }
+]
+const height = mainHeight(0, 2).height as any
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 51; i++) {
+        list.push({
+            title: i + '次',
+            // field: key + i,
+            field: 'flicker',
+            width: '80'
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/user-boot/role/selectRoleDetail?id=0',
+    method: 'POST',
+    publicHeight: 30,
+    showPage: false,
+    exportName: '主要监测点列表',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '日期',
+            field: 'time',
+            width: '150'
+        },
+        {
+            title: '名称',
+            field: 'name',
+            width: '150'
+        },
+        {
+            title: '闪变越限(分钟)',
+            field: 'flicker',
+            width: '80'
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('voltage')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('harmonicCurrent')
+        },
+        {
+            title: '三相不平衡度越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        },
+        {
+            title: '电压偏差越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        },
+        {
+            title: '频率偏差越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        }
+    ],
+    beforeSearchFun: () => {},
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                time: '2024-01-01 00:00:00',
+                name: '35kV进线',
+                flicker: '0',
+              
+            },
+            {
+                time: '2024-01-01 00:00:00',
+                name: '35kV进线',
+                flicker: '0',
+              
+            },
+            {
+                time: '2024-01-01 00:00:00',
+                name: '35kV进线',
+                flicker: '0',
+              
+            },
+        ]
+    }
+})
+
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+const open = async (row: any) => {
+    dialogVisible.value = true
+    tableStore.index()
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue

@@ -1,21 +1,30 @@
 <template>
-    <!-- 综合评估详情 -->
-    <el-dialog draggable title="指标合格率统计" v-model="dialogVisible" append-to-body width="70%">
-        <TableHeader datePicker showExport :showReset="false">
-            <template v-slot:select>
-                <el-form-item label="监测点名称">
-                    <el-select
-                        v-model="tableStore.table.params.searchValue"
-                        placeholder="请选择监测点名称"
-                        style="width: 240px"
-                    >
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-                    </el-select>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" isGroup :height="height"></Table>
-    </el-dialog>
+    <div>
+        <!-- 综合评估详情 -->
+        <el-dialog draggable title="指标合格率统计" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false">
+                <template v-slot:select>
+                    <el-form-item label="监测点名称">
+                        <el-select
+                            v-model="tableStore.table.params.searchValue"
+                            placeholder="请选择监测点名称"
+                            style="width: 150px"
+                        >
+                            <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" />
+    </div>
 </template>
 <script setup lang="ts">
 import { ref, provide } from 'vue'
@@ -23,7 +32,9 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
+import HarmonicRatio‌ from '@/components/cockpit/listOfMainMonitoringPoints/components/harmonicRatio‌.vue'
 const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
 const options = [
     {
         value: '35kV进线',
@@ -38,7 +49,11 @@ const loop50 = (key: string) => {
             title: i + '次',
             // field: key + i,
             field: 'flicker',
-            width: '80'
+            width: '80',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flicker}</span>`
+            }
         })
     }
     return list
@@ -71,7 +86,11 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(分钟)',
             field: 'flicker',
-            width: '80'
+            width: '80',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flicker}</span>`
+            }
         },
         {
             title: '谐波电压越限(分钟)',
@@ -103,21 +122,18 @@ const tableStore: any = new TableStore({
             {
                 time: '2024-01-01 00:00:00',
                 name: '35kV进线',
-                flicker: '0',
-              
+                flicker: '0'
             },
             {
                 time: '2024-01-01 00:00:00',
                 name: '35kV进线',
-                flicker: '0',
-              
+                flicker: '0'
             },
             {
                 time: '2024-01-01 00:00:00',
                 name: '35kV进线',
-                flicker: '0',
-              
-            },
+                flicker: '0'
+            }
         ]
     }
 })
@@ -129,6 +145,15 @@ const open = async (row: any) => {
     tableStore.index()
 }
 
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    console.log(row, '1111')
+    if (column.field != 'name' && column.field != 'time') {
+        harmonicRatio‌Ref.value.openDialog(row)
+    }
+}
+
+
 defineExpose({ open })
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/listOfMainMonitoringPoints/index.vue

@@ -1,89 +1,131 @@
 <template>
     <div>
         <!--指标拟合图 -->
-        <TableHeader :showReset="false" @selectChange="selectChange">
+        <TableHeader
+            datePicker
+            @selectChange="selectChange"
+            v-if="fullscreen"
+            ref="TableHeaderRef" 
+            :timeKeyList="prop.timeKey"
+        >
             <template v-slot:select>
+                <el-form-item label="监测点">
+                    <el-select filterable v-model="tableStore.table.params.lineId" placeholder="请选择监测点" clearable>
+                        <el-option
+                            v-for="item in lineList"
+                            :key="item.lineId"
+                            :label="item.name"
+                            :value="item.lineId"
+                        />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="用户功率">
                     <el-select
+                        filterable
                         v-model="tableStore.table.params.power"
                         placeholder="请选择用户功率"
                         clearable
-                        style="width: 130px"
                     >
-                        <el-option
-                            v-for="item in powerList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                        <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
+                        style="min-width: 120px !important"
+                        placeholder="请选择"
+                        v-model="tableStore.table.params.valueType"
+                        filterable
+                    >
+                        <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 label="电能质量指标">
                     <el-select
+                        filterable
                         v-model="tableStore.table.params.indicator"
                         placeholder="请选择电能质量指标"
                         clearable
-                        style="width: 130px"
                     >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                        <el-option v-for="item in indicatorList" :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.exceedingTheLimit"
-                        placeholder="请选择越限情况"
-                        clearable
-                        style="width: 90px"
-                    >
-                        <el-option
-                            v-for="item in exceedingTheLimitList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
+                <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="请选择谐波次数"
+                            style="min-width: 80px !important"
+                            filterable
+                        >
+                            <el-option
+                                v-for="num in harmonicCountOptions"
+                                :key="num"
+                                :label="num"
+                                :value="num"
+                            ></el-option>
+                        </el-select>
+                    </div>
                 </el-form-item>
             </template>
         </TableHeader>
-        <my-echart
-            class="tall"
-            :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} - ${headerHeight}px )` }"
-        />
+        <div v-loading="tableStore.table.loading">
+            <my-echart
+                class="tall"
+                :options="echartList"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`
+                }"
+            />
+        </div>
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h } 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 { cslineList, fittingData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { ElMessage } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
+
+const TableHeaderRef = ref()
+
 const config = useConfig()
-const powerList: any = ref([
-    {
-        label: '三相总有功功率',
-        value: '1'
-    },
-    {
-        label: '三相总无功功率',
-        value: '2'
+
+const lineList: any = ref()
+
+const powerList: any = ref()
+
+const chartsList = ref<any>([])
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
     }
-])
+})
 const exceedingTheLimitList: any = ref([
     {
         label: '越限',
@@ -94,178 +136,345 @@ const exceedingTheLimitList: any = ref([
         value: '0'
     }
 ])
-const indicatorList: any = ref([
-    {
-        label: '谐波电压总畸变率',
-        value: '1'
-    },
-    {
-        label: '各次谐波电压',
-        value: '2'
-    },
-    {
-        label: '各次谐波电压',
-        value: '3'
-    },
-    {
-        label: '三相电压不平衡',
-        value: '4'
+
+const indicatorList = ref()
+
+const initLineList = async () => {
+    cslineList({}).then(res => {
+        lineList.value = res.data
+        tableStore.table.params.lineId = lineList.value[0].lineId
+    })
+}
+
+const echartList = ref()
+
+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 echartList = ref({
-    title: {
-        text: '谐波电压总畸变率越限与功率负荷曲线拟合图'
-    },
+}
 
-    xAxis: {
-        type: 'time',
-        axisLabel: {
-            formatter: {
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
+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}负荷曲线拟合图`
+        },
+        tooltip: {
+            trigger: 'axis',
+            formatter: function (params: any) {
+                let result = params[0].name
+                params.forEach((item: any) => {
+                    if (item.seriesName === indicatorName) {
+                        // 对于电能质量指标，格式化Y轴值显示
+                        let valueText = ''
+                        if (item.value[1] == 0) {
+                            valueText = '不越限'
+                        } else if (item.value[1] == 1) {
+                            valueText = '越限'
+                        } else {
+                            valueText = item.value[1]
+                        }
+                        result += `<br/>${item.marker}${item.seriesName}: ${valueText}`
+                    } else {
+                        // 对于功率数据，正常显示数值
+                        result += `<br/>${item.marker}${item.seriesName}: ${item.value[1]}`
+                    }
+                })
+                return result
             }
-        }
-    },
-
-    yAxis: [{}, {}],
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                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]
-                ],
-                itemStyle: {
-                    normal: {
-                        //这里是颜色
-                        color: function (params: any) {
-                            if (params.value[1] == 0 || params.value[1] == 3.14159) {
-                                return '#ccc'
-                            } else {
-                                return config.layout.elementUiPrimary[0]
+        },
+        xAxis: {
+            type: 'time',
+            axisLabel: {
+                formatter: {
+                    day: '{MM}-{dd}',
+                    month: '{MM}',
+                    year: '{yyyy}'
+                }
+            }
+        },
+        yAxis: [
+            {},
+            indicatorName
+                ? {
+                      min: 0,
+                      max: 1,
+                      axisLabel: {
+                          formatter: function (value: number) {
+                              if (value === 0) {
+                                  return '不越限'
+                              } else if (value === 1) {
+                                  return '越限'
+                              }
+                              return value
+                          }
+                      }
+                  }
+                : {}
+        ],
+        grid: {
+            left: '10px',
+            right: '20px'
+        },
+        options: {
+            series: [
+                {
+                    type: 'bar',
+                    name: powerName, // 动态设置功率名称
+                    data: [],
+                    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
                 },
-                yAxisIndex: 0
-            },
-            {
-                name: '谐波总畸变率',
-                type: 'line',
-                showSymbol: false,
-                smooth: true,
-                data: [
-                    ['2025-10-16 07:00:00', 0],
-                    ['2025-10-16 07:15:00', 0],
-                    ['2025-10-16 07:30:00', 0],
-                    ['2025-10-16 07:45:00', 0],
-                    ['2025-10-16 08:00:00', 0],
-                    ['2025-10-16 08:15:00', 0.1],
-                    ['2025-10-16 08:30:00', 0.1],
-                    ['2025-10-16 08:45:00', 0.1],
-                    ['2025-10-16 09:00:00', 1],
-                    ['2025-10-16 09:15:00', 1],
-                    ['2025-10-16 09:30:00', 1],
-                    ['2025-10-16 09:45:00', 1],
-                    ['2025-10-16 10:00:00', 0.8],
-                    ['2025-10-16 10:15:00', 0.8],
-                    ['2025-10-16 10:30:00', 0.8],
-                    ['2025-10-16 10:45:00', 0.8],
-                    ['2025-10-16 11:00:00', 0.8],
-                    ['2025-10-16 11:15:00', 0.1],
-                    ['2025-10-16 11:30:00', 0.1],
-                    ['2025-10-16 11:45:00', 0.1],
-                    ['2025-10-16 12:00:00', 0],
-                    ['2025-10-16 12:15:00', 0],
-                    ['2025-10-16 12:30:00', 0],
-                    ['2025-10-16 12:45:00', 0]
-                ],
-                yAxisIndex: 1
-            }
-        ]
+                {
+                    name: indicatorName, // 动态设置指标名称
+                    type: 'line',
+                    step: 'end',
+                    showSymbol: false,
+                    // smooth: true,
+                    data: [],
+                    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(() => {
+                // setTime()
+                tableStore.index()
+            })
+        })
+    })
+}
+
+const tableStore: any = new TableStore({
+    url: '/cs-device-boot/csGroup/fittingData',
+    method: 'POST',
     showPage: false,
     exportName: '主要监测点列表',
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
+        // 只有当 lineList 已加载且有数据时才设置默认 lineId
+        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,
     val => {
         tableStore.index()
     }
 )
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
-:deep(.el-select) {
-    min-width: 80px;
-}
+// :deep(.el-select) {
+//     min-width: 80px;
+// }
 </style>

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

@@ -0,0 +1,186 @@
+<template>
+    <div>
+        <!-- 指标越限详情  -->
+        <el-dialog draggable title="指标越限详情" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select
+                            v-model="tableStore.table.params.lineId"
+                            placeholder="请选择监测点"
+                            style="width: 150px"
+                            filterable
+                        >
+                            <el-option
+                                v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide,nextTick } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import HarmonicRatio‌ from '@/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue'
+import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+
+const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
+
+const options = ref()
+const height = mainHeight(0, 2).height as any
+const tableHeaderRef = ref()
+const dialogFlag = ref(false)
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 26; i++) {
+        list.push({
+            title: i + '次',
+            field: key + i + 'Overtime',
+            width: '60',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
+            }
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/totalLimitStatistics/details',
+    method: 'POST',
+    publicHeight: 30,
+    showPage: false,
+    exportName: '每日越限占比统计',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '日期',
+            field: 'time',
+            width: '150',
+            sortable: true
+        },
+        {
+            title: '名称',
+            field: 'lineName',
+            width: '150'
+        },
+        {
+            title: '闪变越限(%)',
+            field: 'flickerOvertime',
+            width: '90',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+        {
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '电压偏差越限(%)',
+            field: 'voltageDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '频率偏差越限(%)',
+            field: 'freqDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+            }
+        }
+    ],
+     beforeSearchFun: () => {
+    },
+    loadCallback: () => {
+    }
+})
+
+
+provide('tableStore', tableStore)
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+    dialogVisible.value = true
+    initCSlineList()
+    tableStore.table.params.lineId = row.lineId
+
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime =searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+    })
+
+}
+
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    if (column.field != 'name' && column.field != 'time') {
+        dialogFlag.value = true
+        dialogVisible.value = false
+        nextTick(() => {
+            harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        })
+
+    }
+}
+
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+     dialogFlag.value = false
+    // 重新打开指标越限详情弹窗
+    nextTick(() => {
+        dialogVisible.value = true
+    })
+}
+
+const initCSlineList = async () => {
+    const res = await cslineList({})
+    options.value = res.data
+}
+
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/monitoringPointList/index.vue

@@ -1,36 +1,107 @@
 <template>
     <div>
-        <!--监测点列表 -->
-
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height}  )`"></Table>
+        <!-- 监测点列表 -->
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
+        <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 TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import { ElTag } from 'element-plus'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import OverLimitDetails from '@/components/cockpit/monitoringPointList/components/overLimitDetails.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { uploadReport, getReportUrl } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const dictData = useDictData()
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+// 上传相关
+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
+
+    if (datePickerValue && datePickerValue.timeValue) {
+        // 更新时间参数
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    }
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-device-boot/csline/getSensitiveUserLineList',
     method: 'POST',
-
-    showPage: false,
-    exportName: '主要监测点列表',
+    showPage: fullscreen.value ? true : false,
+    exportName: '监测点列表',
     column: [
         {
             field: 'index',
@@ -41,107 +112,224 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '治理对象名称',
-            field: 'name',
-            minWidth: '80'
+            title: '监测点名称',
+            field: 'lineName',
+            minWidth: '120',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
+            }
+        },
+        { title: '监测类型', field: 'position', minWidth: '80' },
+        {
+            title: '监测点状态',
+            field: 'runStatus',
+            minWidth: '90',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='color: ${row.runStatus === '中断' ? '#FF0000' : ''}'>${row.runStatus}</span>`
+            }
+        },
+        {
+            title: '治理对象',
+            field: 'sensitiveUser',
+            minWidth: '90'
         },
 
         {
             title: '电压等级',
-            field: 'type',
-            minWidth: '70'
+            field: 'volGrade',
+            minWidth: '80'
         },
         {
-            title: '治理设备详情',
-            field: 'type1',
-            minWidth: '70'
+            title: '是否治理',
+            field: 'govern',
+            minWidth: '80'
         },
 
         {
-            title: '治理前报告',
-            field: 'type2',
-            minWidth: '80',
+            title: '最新数据时间',
+            field: 'latestTime',
+            minWidth: '140',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.type2}</span>`
+                if (row.latestTime) {
+                    return `<span>${row.latestTime}</span>`
+                } else {
+                    return `<span>/</span>`
+                }
             }
         },
-        { title: '监测点名称', field: 'type3', minWidth: '70' },
-        { title: '监测类型', field: 'type4', minWidth: '60' },
         {
-            title: '监测点状态',
-            field: 'type5',
-            minWidth: '60',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                return `<span style='color: ${row.type5 === '中断' ? '#FF0000' : ''}'>${row.type5}</span>`
-            }
-        },
-        { title: '最新数据时间', field: 'type6', minWidth: '140' }
+            title: '操作',
+            minWidth: 80,
+            // 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 = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
     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.searchValue = ''
+tableStore.table.params.keywords = ''
 provide('tableStore', tableStore)
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field == 'name') {
-        console.log(row)
-        OverLimitDetailsRef.value.open(row)
+    if (column.field == 'lineName') {
+        OverLimitDetailsRef.value.open(
+            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)
     }
 }
 
@@ -155,15 +343,13 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

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

@@ -0,0 +1,708 @@
+<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)"
+                            filterable
+                        >
+                            <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"
+                            filterable
+                        >
+                            <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"
+                                filterable
+                            >
+                                <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/overLimitStatistics/components/overLimitDetails.vue

@@ -0,0 +1,186 @@
+<template>
+    <div>
+        <!-- 指标越限详情  -->
+        <el-dialog draggable title="指标越限详情" v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select
+                            v-model="tableStore.table.params.lineId"
+                            placeholder="请选择监测点"
+                            style="width: 150px"
+                            filterable
+                        >
+                            <el-option
+                                v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+        </el-dialog>
+        <!-- 谐波电流、谐波电压占有率 -->
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide,nextTick } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import HarmonicRatio‌ from '@/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue'
+import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+
+const dialogVisible: any = ref(false)
+const harmonicRatio‌Ref: any = ref(null)
+
+const options = ref()
+const height = mainHeight(0, 2).height as any
+const tableHeaderRef = ref()
+const dialogFlag = ref(false)
+const loop50 = (key: string) => {
+    let list: any[] = []
+    for (let i = 2; i < 26; i++) {
+        list.push({
+            title: i + '次',
+            field: key + i + 'Overtime',
+            width: '60',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
+            }
+        })
+    }
+    return list
+}
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/totalLimitStatistics/details',
+    method: 'POST',
+    publicHeight: 30,
+    showPage: false,
+    exportName: '每日越限占比统计',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '日期',
+            field: 'time',
+            width: '150',
+            sortable: true
+        },
+        {
+            title: '名称',
+            field: 'lineName',
+            width: '150'
+        },
+        {
+            title: '闪变越限(%)',
+            field: 'flickerOvertime',
+            width: '90',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+        {
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '电压偏差越限(%)',
+            field: 'voltageDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '频率偏差越限(%)',
+            field: 'freqDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+            }
+        }
+    ],
+     beforeSearchFun: () => {
+    },
+    loadCallback: () => {
+    }
+})
+
+
+provide('tableStore', tableStore)
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+    dialogVisible.value = true
+    initCSlineList()
+    tableStore.table.params.lineId = row.lineId
+
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime =searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+    })
+
+}
+
+// 点击行
+const cellClickEvent = ({ row, column }: any) => {
+    if (column.field != 'name' && column.field != 'time') {
+        dialogFlag.value = true
+        dialogVisible.value = false
+        nextTick(() => {
+            harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        })
+
+    }
+}
+
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+     dialogFlag.value = false
+    // 重新打开指标越限详情弹窗
+    nextTick(() => {
+        dialogVisible.value = true
+    })
+}
+
+const initCSlineList = async () => {
+    const res = await cslineList({})
+    options.value = res.data
+}
+
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/overLimitStatistics/index.vue

@@ -1,13 +1,27 @@
 <template>
     <div>
-
         <!--总体指标越限统计 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} / 2 )`
+            }"
         />
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} / 2 )`" isGroup></Table>
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"
+            isGroup
+        ></Table>
         <!-- 指标越限详情 -->
         <OverLimitDetails ref="OverLimitDetailsRef" />
     </div>
@@ -16,60 +30,104 @@
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import OverLimitDetails from '@/components/cockpit/overLimitStatistics/components/overLimitDetails.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { totalLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    title: {
-        text: '指标越限占比'
-    },
 
-    xAxis: {
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
+const headerHeight = ref(57)
 
-    yAxis: {
-        name: '%', // 给X轴加单位
-        interval: 20
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 45, 22, 0, 70],
-                barMaxWidth: 30,
+const TableHeaderRef = ref()
 
-                // label: {
-                //     show: true,
-                //     position: 'top',
-                //     textStyle: {
-                //         //数值样式
-                //         color: '#000'
-                //     },
-                //     fontSize: 12
-                // }
-            }
-        ]
+const echartList = ref({})
+
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
     }
 })
+
+const initEcharts = () => {
+    totalLimitStatisticsData({
+        searchBeginTime: tableStore.table.params.searchBeginTime,
+        searchEndTime: tableStore.table.params.searchEndTime
+    }).then((res: any) => {
+        const dataArray = [res.data.flicker, res.data.uharm, res.data.iharm, res.data.voltageDev, res.data.ubalance]
+        echartList.value = {
+            title: {
+                text: '指标越限占比'
+            },
+
+            xAxis: {
+                // name: '(区域)',
+                data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+            },
+
+            yAxis: {
+                name: '%', // 给X轴加单位
+                interval: 20
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            options: {
+                series: [
+                    {
+                        //   name: '暂降次数',
+                        type: 'bar',
+                        name: '越限占比',
+                        data: dataArray,
+                        barMaxWidth: 30
+
+                        // label: {
+                        //     show: true,
+                        //     position: 'top',
+                        //     textStyle: {
+                        //         //数值样式
+                        //         color: '#000'
+                        //     },
+                        //     fontSize: 12
+                        // }
+                    }
+                ]
+            }
+        }
+    })
+}
+
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/totalLimitStatistics/list',
     method: 'POST',
 
     showPage: false,
@@ -85,7 +143,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '名称',
-            field: 'name',
+            field: 'lineName',
             minWidth: '90'
         },
         {
@@ -93,69 +151,58 @@ 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>`
                     }
                 }
             ]
         }
     ],
     beforeSearchFun: () => {
-       tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '10kV1#电动机',
-                type: '0',
-                type1: '45',
-                type2: '22',
-                type3: '0',
-                type4: '70'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
+        initEcharts()
     }
 })
 
@@ -167,27 +214,51 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
-        OverLimitDetailsRef.value.open(row)
+        OverLimitDetailsRef.value.open(
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
     }
 }
 
 onMounted(() => {
     tableStore.index()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
         tableStore.index()
+        initEcharts()
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
-        tableStore.index()
+         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 

src/components/cockpit/sensitiveLoad/index.vue

@@ -1,32 +1,73 @@
 <template>
     <div>
         <!--敏感负荷列表 -->
-
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height})`" isGroup></Table>
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
+        <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 MyEchart from '@/components/echarts/MyEchart.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 { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const dictData = useDictData()
+const sensitiveUserType = dictData.getBasicData('Sensitive_User_Type')
+
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
 })
 
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/pqSensitiveUser/getList',
     method: 'POST',
-
-    showPage: false,
-
+    showPage: fullscreen.value ? true : false,
     column: [
         {
             field: 'index',
@@ -44,40 +85,28 @@ const tableStore: any = new TableStore({
 
         {
             title: '敏感负荷类型',
-            field: 'type',
-            minWidth: '70'
+            field: 'loadType',
+            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'
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '10kV1#变压器',
-                type: '机房',
-                type1: '是',
-                type2: '100A APF'
-            },
-            {
-                name: '380kV1#母线',
-                type: 'PLC',
-                type1: '是',
-                type2: 'UPS'
-            }
-        ]
-    }
+
+    loadCallback: () => {}
 })
 
 const tableRef = ref()
@@ -93,6 +122,25 @@ const cellClickEvent = ({ row, column }: any) => {
     }
 }
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 onMounted(() => {
     setTimeout(() => {
         tableStore.index()
@@ -105,15 +153,13 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

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

@@ -0,0 +1,225 @@
+<template>
+    <div>
+        <!-- 暂态事件详情 -->
+        <el-dialog draggable title="暂态事件详情 " v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
+                            <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" 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>
+<script setup lang="ts">
+import { ref, provide } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import 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)
+// 波形
+const isWaveCharts = ref(false)
+const loading = ref(false)
+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 getSimpleLineList = async () => {
+    const res = await getSimpleLine()
+    options.value = res.data
+}
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/event/pageEvent',
+    method: 'POST',
+    showPage: true,
+    exportName: '暂态事件详情',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '暂态时间',
+            field: 'startTime',
+            minWidth: '180'
+        },
+        {
+            title: '测点名称',
+            field: 'lineName',
+            minWidth: '150'
+        },
+        {
+            title: '暂态类型',
+            field: 'tag',
+            minWidth: '100'
+        },
+        {
+            title: '特征幅值(%)',
+            field: 'amplitude',
+            minWidth: '100'
+        },
+        {
+            title: '暂降深度(%)',
+            field: 'depth',
+            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: 'persistTime',
+            minWidth: '100'
+        },
+        {
+            title: '严重度',
+            field: 'severity',
+            minWidth: '80'
+        },
+        {
+            title: '波形',
+            minWidth: '100',
+            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)
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    text: '暂无波形',
+                    type: 'info',
+                    icon: 'el-icon-DataLine',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !!row.wavePath
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
+})
+
+provide('tableStore', tableStore)
+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 = () => {
+    isWaveCharts.value = false
+    dialogVisible.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/transientDetails/index.vue

@@ -1,129 +1,147 @@
 <template>
     <div>
         <!--暂态事件明细 -->
-
-        <el-calendar v-model="value" :style="{ height: prop.height, overflow: 'auto' }">
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+             :timeKeyList="prop.timeKey"
+        ></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
-                        effect="dark"
-                        placement="top"
-                        :hide-after="0"
-                        v-if="list?.filter(item => item.time == data.day)[0]?.type || false"
-                    >
+                    <el-tooltip effect="dark" placement="top" :hide-after="0" v-if="hasEventData(data.day)">
                         <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>电压暂降：{{ item.type || '' }}</div>
-                                <div>电压中断：{{ item.type1 || '' }}</div>
-                                <div>电压暂升：{{ item.type2 || '' }}</div>
+                            <div v-for="item in list?.filter((item:any) => item.name == data.day)">
+                                <div>电压暂降：{{ item.eventDown || 0 }}</div>
+                                <div>电压中断：{{ item.eventOff || 0 }}</div>
+                                <div>电压暂升：{{ item.eventUp || 0 }}</div>
                             </div>
                         </template>
                         <div
-                            :style="{ height: `calc(${prop.height} / 5 - 47px)`, overflow: 'auto' }"
-                            v-for="item in list?.filter(item => item.time == data.day)"
+                            style="text-decoration: underline"
+                            class="details"
+                            v-for="item in list?.filter((item:any) => item.name == data.day)"
+                            @click="descentClick(item)"
                         >
-                            <div>电压暂降:{{ item.type || '' }}</div>
-                            <div>电压中断:{{ item.type1 || '' }}</div>
-                            <div>电压暂升:{{ item.type2 || '' }}</div>
+                            <!-- <div>电压暂降:{{ item.eventDown || 0 }}</div>
+                                <div>电压中断:{{ item.eventOff || 0 }}</div>
+                                <div>电压暂升:{{ item.eventUp || 0 }}</div> -->
+                            <template v-if="fullscreen">
+                                <div>电压暂降:{{ item.eventDown || 0 }}</div>
+                                <div>电压中断:{{ item.eventOff || 0 }}</div>
+                                <div>电压暂升:{{ item.eventUp || 0 }}</div>
+                            </template>
+                            <template v-else>暂态事件</template>
                         </div>
                     </el-tooltip>
                 </div>
             </template>
         </el-calendar>
+        <!-- 暂态事件列表  -->
+        <TransientList ref="transientListRef" />
     </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 Table from '@/components/table/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
-import { overflow } from 'html2canvas/dist/types/css/property-descriptors/overflow'
 import { dayjs } from 'element-plus'
+import TransientList from './components/transientList.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { getTime } from '@/utils/formatTime'
+
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+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
+
+    if (datePickerValue && datePickerValue.timeValue) {
+        // 更新时间参数
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    }
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
 
 dayjs.en.weekStart = 1 //设置日历的周起始日为星期一
 const value = ref(new Date())
-const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
-})
-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 transientListRef = ref()
+const list = ref()
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/getEventDate',
     method: 'POST',
 
     showPage: false,
 
     column: [],
+
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
-        // value.value = new Date(prop.timeValue?.[0])
+        setTime()
     },
+
     loadCallback: () => {
-        tableStore.table.data = []
+        value.value = tableStore.table.params.searchBeginTime
+        list.value = tableStore.table.data
     }
 })
 
-const tableRef = ref([])
-
 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'
         }
     }
@@ -131,47 +149,69 @@ const setBackground = (value: string) => {
     return '#fff'
 }
 
-provide('tableRef', tableRef)
-
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
-})
-watch(
-    () => prop.timeKey,
-    val => {
+    nextTick(() => {
         tableStore.index()
+    })
+})
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
     }
-)
+}
+
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 
-const addMenu = () => {}
+// 电压暂降点击事件
+const descentClick = (item: any) => {
+    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

@@ -1,318 +1,260 @@
 <template>
     <div>
         <!--暂态事件概率分布 -->
+        <TableHeader ref="TableHeaderRef"  :timeKeyList="prop.timeKey" :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+            }"
         />
         <my-echart
             class="mt10"
             :options="echartList1"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 - 10px)` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} / 2  - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+            }"
         />
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h } from 'vue'
+import { ref, onMounted, provide, reactive, watch } from 'vue'
 import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { useConfig } from '@/stores/config'
-const config = useConfig()
+import TableHeader from '@/components/table/header/index.vue'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    options: {
-        xAxis: null,
-        yAxis: null,
-        dataZoom: null,
-        backgroundColor: '#fff',
-        tooltip: {
-            // trigger: 'axis'
-            textStyle: {
-                color: '#fff',
-                fontStyle: 'normal',
-                opacity: 0.35,
-                fontSize: 14
-            },
-            backgroundColor: 'rgba(0,0,0,0.55)',
-            borderWidth: 0,
-            formatter: function (params: any) {
-                console.log(params)
-                var tips = ''
-                for (var i = 0; i < params.length; i++) {
-                    tips += params[i].name + '</br/>'
-                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
-                }
-                return tips
-            }
-        },
-        title: {
-            text: '暂态事件概率分布',
-            x: 'center'
-        },
 
-        visualMap: {
-            max: 20,
-            show: false,
-            inRange: {
-                color: ['#313695', '#00BB00', '#ff8000', '#a50026']
-            }
-        },
-        xAxis3D: {
-            type: 'category',
-            name: '特征幅值',
-            data: [
-                '0-10%',
-                '10%-20%',
-                '20%-30%',
-                '30%-40%',
-                '40%-50%',
-                '50%-60%',
-                '60%-70%',
-                '70%-80%',
-                '80%-90%',
-                '90%-100%'
-            ],
-            axisLine: {
-                lineStyle: {
-                    color: '#111'
-                }
-            },
-            axisLabel: {
-                color: '#111'
-            }
-        },
-        yAxis3D: {
-            type: 'category',
-            name: '持续时间',
-            data: ['0-0.01s', '0.01s-0.1s', '0.1s-1s', '1s-10s', '10s'],
-            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
-                    }
-                },
+const TableHeaderRef = ref()
 
-                itemStyle: {
-                    opacity: 1
-                },
-                emphasis: {
-                    label: {
-                        textStyle: {
-                            fontSize: 20,
-                            color: '#900'
-                        }
-                    },
-                    itemStyle: {
-                        color: '#900'
-                    }
-                }
-            }
-        ]
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
     }
 })
-const echartList1 = ref({
-    title: {
-        text: '越限时间概率分布'
-    },
 
-    xAxis: {
-        // name: '时间',
-        // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-        type: 'time',
-        axisLabel: {
-            formatter: {
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
-            }
-        }
-    },
+const config = useConfig()
+
+const echartList = ref({})
+
+const echartList1 = ref({})
+
+
+const processDataForChart = (rawData: any[]) => {
+    // 将后端返回的扁平数据转换为 ECharts 需要的三维坐标格式 [x, y, z]
+    const chartData = rawData.map(item => [item.x, item.y, item.z])
+
+    return chartData
+}
 
-    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 tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/getEventCoords',
     method: 'POST',
     showPage: false,
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+       setTime()
     },
     loadCallback: () => {
-        tableStore.table.data = []
+        const processedData = processDataForChart(tableStore.table.data.innerList || [])
+        const trendList = tableStore.table.data.trendList || []
+        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%',
+            '30%-40%',
+            '40%-50%',
+            '50%-60%',
+            '60%-70%',
+            '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,
+                      nameGap: 40,
+                   
+                },
+                yAxis3D: {
+                    type: 'category',
+                    name: '持续时间',
+                    data: yLabels,
+                     nameGap: 40,
+                  
+                    splitLine: {
+                        lineStyle: {
+                            type: 'dashed',
+                            opacity: 0.5
+                        }
+                    }
+                },
+                zAxis3D: {
+                    type: 'value',
+                    minInterval: 10,
+                    name: '暂态事件次数',
+                       nameGap: 30,
+                },
+                grid3D: {
+                    viewControl: {
+                        projection: 'perspective',
+                        distance: 250
+                    },
+                     
+                    boxWidth: 200,
+                    boxDepth: 80,
+                    light: {
+                        main: {
+                            intensity: 1.2
+                        },
+                        ambient: {
+                            intensity: 0.3
+                        }
+                    }
+                },
+                series: [
+                    {
+                        type: 'bar3D',
+                        data: processedData,
+                        shading: 'realistic',
+                        label: {
+                            show: false,
+                            textStyle: {
+                                fontSize: 16,
+                                borderWidth: 1
+                            }
+                        },
+                      
+                        
+                    }
+                ]
+            }
+        }
+
+        echartList1.value = {
+            title: {
+                text: '越限时间概率分布'
+            },
+            xAxis: {
+                type: 'category',
+                data: xlist,
+                axisLabel: {
+                    formatter: '{value}'
+                }
+            },
+            yAxis: {
+                name: '次'
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            series: seriesData
+        }
     }
 })
 
@@ -324,22 +266,41 @@ provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
         tableStore.index()
     }
 )
+
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
-        tableStore.index()
+         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

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

@@ -0,0 +1,224 @@
+<template>
+    <div>
+        <!-- 暂态事件详情 -->
+        <el-dialog draggable title="暂态事件详情 " v-model="dialogVisible" append-to-body width="70%">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
+                <template v-slot:select>
+                    <el-form-item label="监测点">
+                        <el-select filterable v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
+                            <el-option
+                                v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" isGroup :height="heightRef"></Table>
+        </el-dialog>
+        <!-- 查看波形 -->
+        <el-dialog
+            v-model="isWaveCharts"
+            draggable
+            title="波形分析"
+            append-to-body
+            width="70%"
+            @close="handleHideCharts"
+        >
+            <waveFormAnalysis
+                v-loading="loading"
+                v-if="isWaveCharts"
+                ref="waveFormAnalysisRef"
+                @handleHideCharts="handleHideCharts"
+                :wp="wp"
+            />
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, provide } from 'vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
+import 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)
+// 波形
+const isWaveCharts = ref(false)
+const loading = ref(false)
+const wp = ref({})
+const boxoList: any = ref({})
+
+const tableHeaderRef = ref()
+
+const options = ref()
+const heightRef = ref(mainHeight(168, 2.2).height)
+const selectChange = (flag: boolean, h: any) => {
+    heightRef.value = mainHeight(h, 2.2).height
+}
+
+const getSimpleLineList = async () => {
+    const res = await getSimpleLine()
+    options.value = res.data
+}
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/event/pageEvent',
+    method: 'POST',
+    showPage: true,
+    exportName: '主要监测点列表',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            title: '暂态时间',
+            field: 'startTime',
+            minWidth: '180'
+        },
+        {
+            title: '测点名称',
+            field: 'lineName',
+            minWidth: '150'
+        },
+        {
+            title: '暂态类型',
+            field: 'tag',
+            minWidth: '100'
+        },
+        {
+            title: '特征幅值(%)',
+            field: 'amplitude',
+            minWidth: '100'
+        },
+        {
+            title: '暂降深度(%)',
+            field: 'depth',
+            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: 'persistTime',
+            minWidth: '100'
+        },
+        {
+            title: '严重度',
+            field: 'severity',
+            minWidth: '80'
+        },
+        {
+            title: '波形',
+            width: '90',
+            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)
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    text: '暂无波形',
+                    type: 'info',
+                    icon: 'el-icon-DataLine',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !!row.wavePath
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
+})
+
+provide('tableStore', tableStore)
+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 = () => {
+    isWaveCharts.value = false
+    dialogVisible.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/transientStatistics/index.vue

@@ -1,12 +1,28 @@
 <template>
     <div>
         <!--暂态事件统计 -->
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+            }"
         />
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} / 2 )`" isGroup></Table>
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`"
+            isGroup
+        ></Table>
+        <TransientStatisticsDetail ref="transientStatisticsDetailRef"></TransientStatisticsDetail>
     </div>
 </template>
 <script setup lang="ts">
@@ -14,90 +30,135 @@ 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 { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { useConfig } from '@/stores/config'
-const config = useConfig()
-const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
-})
-const data = [
-    {
-        name: '电压中断',
-        value: 4
-    },
-    {
-        name: '电压暂降',
-        value: 41
-    },
-    {
-        name: '电压暂升',
-        value: 46
-    }
-]
-const echartList = ref({
-    title: {},
+import TransientStatisticsDetail from '@/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { netEventEcharts } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
-    tooltip: {
-        trigger: 'item'
-    },
-    legend: {
-        orient: 'vertical',
-        top: 'center',
-        right: '5%',
-        formatter: function (e: any) {
-            return e + '   ' + data.filter(item => item.name == e)[0].value + '次'
-        }
-    },
-    xAxis: {
-        show: false
-    },
-    yAxis: {
-        show: false
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    color: ['#FF9100', '#FFBF00', config.layout.elementUiPrimary[0]],
-    options: {
-        dataZoom: null,
-        title: [
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
+})
+
+const TableHeaderRef = ref()
+
+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 fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+const config = useConfig()
+
+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 = [
             {
-                text: '暂态事件统计',
-                left: 'center'
+                name: '电压中断',
+                value: rawData.eventOff || 0
             },
             {
-                text: data[0].value + data[1].value + data[2].value + '次',
-                left: 'center',
-                top: 'center'
-            }
-        ],
-        series: [
+                name: '电压暂降',
+                value: rawData.eventDown || 0
+            },
             {
-                type: 'pie',
-                center: 'center',
-                radius: ['50%', '70%'],
-                label: {
-                    show: false,
-                    position: 'outside',
-                    textStyle: {
-                        //数值样式
-                    }
-                },
-                name: '事件统计',
-                data: data
+                name: '电压暂升',
+                value: rawData.eventUp || 0
             }
         ]
-    }
-})
-const OverLimitDetailsRef = ref()
+
+        echartList.value = {
+            title: {},
+            tooltip: {
+                trigger: 'item'
+            },
+            legend: {
+                orient: 'vertical',
+                top: '50',
+                right: '10',
+                formatter: function (e: any) {
+                    return e + '   ' + data.value.filter((item: any) => item.name == e)[0].value + '次'
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            color: ['#FF9100', '#FFBF00', config.layout.elementUiPrimary[0]],
+            options: {
+                dataZoom: null,
+                title: [
+                    {
+                        text: '暂态事件统计',
+                        left: 'center'
+                    },
+                    {
+                        text: rawData.eventOff + rawData.eventDown + rawData.eventUp + '次',
+                        left: 'center',
+                        top: 'center'
+                    }
+                ],
+                series: [
+                    {
+                        type: 'pie',
+                        center: 'center',
+                        radius: ['50%', '70%'],
+                        label: {
+                            show: false,
+                            position: 'outside'
+                        },
+                        name: '事件统计',
+                        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,
@@ -119,63 +180,40 @@ 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>`
             }
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                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'
-            }
-        ]
+        eventEcharts()
     }
 })
 
@@ -187,8 +225,30 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
-        OverLimitDetailsRef.value.open(row)
+        transientStatisticsDetailRef.value.open(
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
+    }
+}
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
     }
 }
 
@@ -204,15 +264,13 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/trendComparison/index.vue

@@ -1,260 +1,428 @@
 <template>
     <div>
         <!--趋势对比 -->
-        <TableHeader :showReset="false" @selectChange="selectChange">
+        <TableHeader
+            datePicker
+            ref="TableHeaderRef"
+            :timeKeyList="prop.timeKey"
+            :showReset="false"
+            @selectChange="selectChange"
+            v-if="fullscreen"
+        >
             <template v-slot:select>
-                <el-form-item label="监测点名称">
+                <el-form-item label="监测对象">
                     <el-select
-                        v-model="tableStore.table.params.power"
-                        placeholder="请选择监测点名称"
+                        filterable
+                        v-model="tableStore.table.params.sensitiveUserId"
+                        placeholder="请选择监测对象"
                         clearable
-                        style="width: 130px"
                     >
-                        <el-option
-                            v-for="item in powerList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                        <el-option v-for="item in idList" :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.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
-                        v-model="tableStore.table.params.indicator"
-                        placeholder="请选择电能质量指标"
-                        clearable
-                        style="width: 130px"
-                    >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                    <el-select v-model="tableStore.table.params.indicator" placeholder="请选择电能质量指标" clearable>
+                        <el-option v-for="item in indicatorList" :key="item.id" :label="item.name" :value="item.id" />
                     </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"
-                        placeholder="请选择谐波次数"
-                        clearable
-                        style="width: 90px"
+                        style="min-width: 120px !important"
+                        placeholder="请选择"
+                        v-model="tableStore.table.params.valueType"
                     >
-                        <el-option
-                            v-for="item in exceedingTheLimitList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                        <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="请选择谐波次数"
+                            style="min-width: 80px !important"
+                        >
+                            <el-option
+                                v-for="num in harmonicCountOptions"
+                                :key="num"
+                                :label="num"
+                                :value="num"
+                            ></el-option>
+                        </el-select>
+                    </div>
+                </el-form-item>
             </template>
         </TableHeader>
         <my-echart
+            v-loading="tableStore.table.loading"
             class="tall"
             :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} - ${headerHeight}px )` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+            }"
         />
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h } 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'
-const prop = defineProps({
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
-})
-const config = useConfig()
-const powerList: any = ref([
-    {
-        label: '1#变压器',
-        value: '1'
-    },
-    {
-        label: '2#变压器',
-        value: '2'
-    }
-])
-const exceedingTheLimitList: any = ref([
-    {
-        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: '趋势对比'
-    },
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
-    xAxis: {
-        type: 'time',
-        axisLabel: {
-            formatter: {
-                day: '{MM}-{dd}',
-                month: '{MM}',
-                year: '{yyyy}'
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
+})
+
+const TableHeaderRef = ref()
+const config = useConfig()
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+// 添加谐波次数选项（2-50）
+const harmonicCountOptions = ref(Array.from({ length: 49 }, (_, i) => i + 2))
+
+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
             }
         }
-    },
+    })
 
-    yAxis: {},
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        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
+    echartList.value = {
+        title: {
+            text: titleText
+        },
+        legend: {
+            data: legendData,
+            icon: 'rect',
+            itemWidth: 18,
+            itemHeight: 3,
+            itemStyle: {
+                borderWidth: 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]
-                ]
+            lineStyle: {
+                width: 2 // 确保图例线条宽度与系列线条宽度一致
             }
-        ]
+        },
+        xAxis: {
+            type: 'time',
+            axisLabel: {
+                formatter: {
+                    day: '{MM}-{dd}',
+                    month: '{MM}',
+                    year: '{yyyy}'
+                }
+            }
+        },
+        yAxis: {
+            name: beforeData.length > 0 ? beforeData[0].unit : afterData.length > 0 ? afterData[0].unit : ''
+        },
+        grid: {
+            left: '10px',
+            right: '20px'
+        },
+        series: series
     }
-})
-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',
 
+const tableStore: any = new TableStore({
+    url: '/cs-device-boot/csGroup/sensitiveUserTrendData',
+    method: 'POST',
     showPage: false,
-    exportName: '主要监测点列表',
+    exportName: '趋势对比',
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        setTime()
+        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()
+        }
     }
 })
 
-const tableRef = ref()
-provide('tableRef', tableRef)
-tableStore.table.params.power = '1'
 tableStore.table.params.indicator = '1'
 tableStore.table.params.exceedingTheLimit = '1'
-tableStore.table.params.searchValue = ''
+tableStore.table.params.dataLevel = 'Primary'
+tableStore.table.params.valueType = 'avg'
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
+    initListByIds()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
+// 判断是否应该显示谐波次数选择框
+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 => {
@@ -262,19 +430,33 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 
-const addMenu = () => {}
+// 监听指标变化，当指标变化时重置谐波次数
+watch(
+    () => tableStore.table.params.indicator,
+    newVal => {
+        if (shouldShowHarmonicCount()) {
+            // 如果之前没有设置过谐波次数，则默认设置为2
+            if (!tableStore.table.params.harmonicCount) {
+                tableStore.table.params.harmonicCount = 2
+            }
+        } else {
+            // 如果不是谐波含有率指标，则清除谐波次数设置
+            tableStore.table.params.harmonicCount = ''
+        }
+    }
+)
 </script>
 <style lang="scss" scoped>
-:deep(.el-select) {
-    min-width: 80px;
-}
+// :deep(.el-select) {
+//     min-width: 80px;
+// }
 </style>

src/components/echarts/MyEchart.vue

@@ -15,6 +15,7 @@ import { color, gradeColor3 } from './color'
 import { useConfig } from '@/stores/config'
 // import { nextTick } from 'process'
 
+const emit = defineEmits(['chartClick'])
 const config = useConfig()
 color[0] = config.layout.elementUiPrimary[0]
 const chartRef = ref<HTMLDivElement>()
@@ -89,7 +90,7 @@ const initChart = () => {
             ...(props.options?.legend || null)
         },
         grid: {
-           top: '50px',
+            top: '50px',
             left: '30px',
             right: '70px',
             bottom: props.options?.options?.dataZoom === null ? '10px' : '40px',
@@ -131,6 +132,10 @@ const initChart = () => {
     // 处理柱状图
     chart.setOption(options, true)
     chart.group = 'group'
+    // 添加点击事件
+    chart.on('click', function (params: any) {
+        emit('chartClick', params)
+    })
     setTimeout(() => {
         chart.resize()
     }, 0)

src/components/echarts/rmsWorker.js

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

src/components/echarts/shuWorker.js

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

src/components/form/datePicker/index.vue

@@ -1,13 +1,26 @@
 <template>
     <div style="width: 540px">
-        <el-select v-model.trim="interval" style="min-width: 90px; width: 90px; margin-right: 10px"
-            @change="timeChange">
-            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        <el-select
+            v-model.trim="interval"
+            style="min-width: 90px; width: 90px; margin-right: 10px"
+            @change="timeChange"
+        >
+            <el-option v-for="item in filteredTimeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
+        <el-date-picker
+            v-model.trim="timeValue"
+            type="daterange"
+            :disabled="disabledPicker"
+            style="width: 220px; margin-right: 10px"
+            unlink-panels
+            :clearable="false"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="YYYY-MM-DD"
+            :shortcuts="shortcuts"
+        />
 
-        <el-date-picker v-model.trim="timeValue" type="daterange" :disabled="disabledPicker"
-            style="width: 220px; margin-right: 10px" unlink-panels :clearable="false" range-separator="至"
-            start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" :shortcuts="shortcuts" />
         <el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
         <el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button>
         <el-button :disabled="preDisabled" type="primary" :icon="DArrowRight" @click="next"></el-button>
@@ -21,13 +34,21 @@ import { ref, onMounted, nextTick, watch } from 'vue'
 interface Props {
     nextFlag?: boolean
     theCurrentTime?: boolean
+    initialInterval?: number
+    initialTimeValue?: any
+    timeKeyList?: string[] //日期下拉
 }
 
 const props = withDefaults(defineProps<Props>(), {
     nextFlag: false,
-    theCurrentTime: true
+    theCurrentTime: true,
+    initialInterval: 3,
+    initialTimeValue: undefined,
+    timeKeyList: () => []
 })
 
+const emit = defineEmits(['change'])
+
 const interval = ref(3)
 const timeFlag = ref(1)
 const count = ref(0)
@@ -71,17 +92,67 @@ const shortcuts = [
         }
     }
 ]
+
+// 计算过滤后的 timeOptions
+const filteredTimeOptions = computed(() => {
+    if (!props.timeKeyList || props.timeKeyList.length === 0) {
+        return timeOptions.value
+    }
+
+    return timeOptions.value.filter((option: any) => props.timeKeyList.includes(option.value.toString()))
+})
+
 onMounted(() => {
+    // 使用传入的初始值
+    if (props.initialInterval !== undefined) {
+        interval.value = props.initialInterval
+    }
+
+    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')
+
+        // 只有当 props.nextFlag 为 false 时才应用限制
+        if (!props.nextFlag) {
+            // 如果结束时间早于当前日期，则按钮可用（preDisabled = false）
+            // 如果结束时间晚于或等于当前日期，则按钮禁用（preDisabled = true）
+            const endDateTime = new Date(endTime).getTime()
+            const currentDateTime = new Date(currentDate).getTime()
+            preDisabled.value = endDateTime >= currentDateTime
+        }
+    }
+}
+
+// 添加统一的事件触发方法
+const emitChange = () => {
+    nextTick(() => {
+        emit('change', {
+            interval: interval.value,
+            timeValue: timeValue.value,
+            timeFlag: timeFlag.value
+        })
+    })
+}
 // 选择时间范围
 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
@@ -102,7 +173,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) {
@@ -110,6 +180,14 @@ const timeChange = (e: number) => {
     } else {
         timeFlag.value = 1
     }
+
+   nextTick(() => {
+        // 检查按钮状态
+    checkInitialButtonStatus()
+   })
+
+    // 触发 change 事件
+    emitChange()
 }
 
 // 当前
@@ -178,6 +256,9 @@ const preClick = () => {
     // 判断向后键的状态
     // var temp = NowgetEndTime()
     // timeStatus(temp, endTime)
+
+    // 触发 change 事件
+    emitChange()
 }
 //下一个
 const next = () => {
@@ -383,7 +464,6 @@ const next = () => {
         if (year >= presentY && !props.nextFlag) {
             startTime = presentY + '-01-01'
             if (presentM < 10) {
-
                 if (presentD < 10) {
                     endTime = presentY + '-0' + presentM + '-0' + presentD
                 } else {
@@ -400,18 +480,31 @@ const next = () => {
             startTime = year + '-01-01'
             endTime = year + '-12-31'
         }
-
     }
     if (!props.nextFlag) {
-        if (new Date(endTime + ' 00:00:00').getTime() >= new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()) {
+        if (
+            new Date(endTime + ' 00:00:00').getTime() >=
+            new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()
+        ) {
             preDisabled.value = true
         }
     }
 
-
     timeValue.value = [startTime, endTime]
+
+    // 触发 change 事件
+    emitChange()
 }
 
+// 监听值变化并触发事件
+watch(
+    [interval, timeValue],
+    () => {
+        emitChange()
+    },
+    { deep: true }
+)
+
 const setTime = (flag = 0, e = 0) => {
     let dd = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'dd')
 

src/components/table/header/index.vue

@@ -10,7 +10,13 @@
                 :inline="true"
             >
                 <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 570px">
-                    <DatePicker ref="datePickerRef" :nextFlag="nextFlag" :theCurrentTime="theCurrentTime"></DatePicker>
+                    <DatePicker
+                        ref="datePickerRef"
+                        :nextFlag="nextFlag"
+                        :theCurrentTime="theCurrentTime"
+                        @change="handleDatePickerChange"
+                        :timeKeyList="props.timeKeyList"
+                    ></DatePicker>
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
@@ -57,6 +63,9 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import { Search, RefreshLeft } from '@element-plus/icons-vue'
 import { defineProps } from 'vue'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useRoute } from 'vue-router'
+
 const emit = defineEmits(['selectChange'])
 
 const tableStore = inject('tableStore') as TableStore
@@ -67,6 +76,11 @@ const areaRef = ref()
 const headerForm = ref()
 const headerFormSecond = ref()
 const num = ref(0)
+
+// 获取路由和缓存 store
+const route = useRoute()
+const timeCacheStore = useTimeCacheStore()
+
 interface Props {
     datePicker?: boolean
     area?: boolean
@@ -75,6 +89,8 @@ interface Props {
     theCurrentTime?: boolean //控制时间前3天展示上个月时间
     showReset?: boolean //是否显示重置
     showExport?: boolean //导出控制
+    timeCacheFlag?: boolean //是否取缓存时间
+    timeKeyList?: string[] //日期下拉列表
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -84,8 +100,22 @@ const props = withDefaults(defineProps<Props>(), {
     nextFlag: false,
     theCurrentTime: true,
     showReset: true,
-    showExport: false
+    showExport: false,
+    timeCacheFlag: true,
+    timeKeyList: () => ['1', '2', '3', '4', '5'] // 修改为箭头函数返回空数组
 })
+
+// 处理 DatePicker 值变化事件
+const handleDatePickerChange = (value: any) => {
+    // 将值缓存到 timeCache
+    // if (value) {
+    //     timeCacheStore.setCache(route.path, value.interval, value.timeValue)
+    // }
+
+    // 将 datePicker 的变化传递给父组件
+    emit('selectChange', true, tableHeader.value.offsetHeight, value)
+}
+
 // 动态计算table高度
 let resizeObserver = new ResizeObserver(entries => {
     for (const entry of entries) {
@@ -105,16 +135,31 @@ const headerFormSecondStyleClose = {
     padding: '0'
 }
 onMounted(() => {
-    if (props.datePicker && tableStore) {
-        tableStore.table.params.searchBeginTime = datePickerRef.value?.timeValue[0]
-        tableStore.table.params.searchEndTime = datePickerRef.value?.timeValue[1]
-        tableStore.table.params.startTime = datePickerRef.value?.timeValue[0]
-        tableStore.table.params.endTime = datePickerRef.value?.timeValue[1]
+    // 设置初始值到 DatePicker
+    if (props.datePicker && datePickerRef.value) {
+        // 从缓存中获取值并设置
+        const cached = timeCacheStore.getCache(route.path)
+        if (props.timeCacheFlag && cached) {
+            if (cached.interval !== undefined) {
+                datePickerRef.value.setInterval(cached.interval)
+            }
+            if (cached.timeValue) {
+                datePickerRef.value.timeValue = cached.timeValue
+            }
+        }
+
+        // 更新 tableStore 参数
+        tableStore.table.params.searchBeginTime = datePickerRef.value?.timeValue?.[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value?.timeValue?.[1]
+        tableStore.table.params.startTime = datePickerRef.value?.timeValue?.[0]
+        tableStore.table.params.endTime = datePickerRef.value?.timeValue?.[1]
         tableStore.table.params.timeFlag = datePickerRef.value?.timeFlag
     }
+
     if (props.area) {
         tableStore.table.params.deptIndex = dictData.state.area[0].id
     }
+
     nextTick(() => {
         resizeObserver.observe(tableHeader.value)
         computedSearchRow()
@@ -189,12 +234,29 @@ const onResetForm = () => {
 const setInterval = (val: any) => {
     datePickerRef.value.setInterval(val)
 }
+
+const setTimeInterval = (val: any) => {
+    datePickerRef.value.timeValue = val
+    tableStore.table.params.searchBeginTime = val[0]
+    tableStore.table.params.searchEndTime = val[1]
+    tableStore.table.params.startTime = val[0]
+    tableStore.table.params.endTime = val[1]
+}
 // 导出
 const onExport = () => {
     tableStore.onTableAction('export', { showAllFlag: true })
 }
 
-defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange, computedSearchRow })
+defineExpose({
+    onComSearch,
+    areaRef,
+    setDatePicker,
+    setInterval,
+    setTimeInterval,
+    datePickerRef,
+    showSelectChange,
+    computedSearchRow
+})
 </script>
 
 <style scoped lang="scss">

src/components/table/index.vue

@@ -1,24 +1,45 @@
 <template>
     <div :style="{ height: typeof props.height === 'string' ? props.height : tableStore.table.height }">
-        <vxe-table ref="tableRef" height="auto" :key="key" :data="tableStore.table.data"
-            v-loading="tableStore.table.loading" v-bind="Object.assign({}, defaultAttribute, $attrs)"
-            @checkbox-all="selectChangeEvent" @checkbox-change="selectChangeEvent" :showOverflow="showOverflow"
-            :sort-config="{ remote: true }" @sort-change="handleSortChange">
+        <vxe-table
+            ref="tableRef"
+            height="auto"
+            :key="key"
+            :data="tableStore.table.data"
+            v-loading="tableStore.table.loading"
+            v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            @checkbox-all="selectChangeEvent"
+            @checkbox-change="selectChangeEvent"
+            :showOverflow="showOverflow"
+            :sort-config="{ remote: true }"
+            @sort-change="handleSortChange"
+        >
+        
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
                 <GroupColumn :column="tableStore.table.column" />
             </template>
             <template v-else>
-                <Column :attr="item" :key="key + '-column'" v-for="(item, key) in tableStore.table.column"
-                    :tree-node="item.treeNode">
+                <Column
+                    :attr="item"
+                    :key="key + '-column'"
+                    v-for="(item, key) in tableStore.table.column"
+                    :tree-node="item.treeNode"
+                >
                     <!-- tableStore 预设的列 render 方案 -->
                     <template v-if="item.render" #default="scope">
-                        <FieldRender :field="item" :row="scope.row" :column="scope.column" :index="scope.rowIndex" :key="key +
-                            '-' +
-                            item.render +
-                            '-' +
-                            (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            " />
+                        <FieldRender
+                            :field="item"
+                            :row="scope.row"
+                            :column="scope.column"
+                            :index="scope.rowIndex"
+                            :key="
+                                key +
+                                '-' +
+                                item.render +
+                                '-' +
+                                (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
+                            "
+                        />
                     </template>
                 </Column>
             </template>
@@ -27,11 +48,16 @@
     </div>
 
     <div v-if="tableStore.showPage" class="table-pagination">
-        <el-pagination :currentPage="tableStore.table.params!.pageNum" :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes" background
+        <el-pagination
+            :currentPage="tableStore.table.params!.pageNum"
+            :page-size="tableStore.table.params!.pageSize"
+            :page-sizes="pageSizes"
+            background
             :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
-            :total="tableStore.table.total" @size-change="onTableSizeChange"
-            @current-change="onTableCurrentChange"></el-pagination>
+            :total="tableStore.table.total"
+            @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"
+        ></el-pagination>
     </div>
     <slot name="footer"></slot>
 </template>
@@ -66,6 +92,8 @@ const props = withDefaults(defineProps<Props>(), {
 })
 onMounted(() => {
     tableStore.table.ref = tableRef.value as VxeTableInstance
+
+    
 })
 // console.log(props)
 const onTableSizeChange = (val: number) => {
@@ -125,6 +153,7 @@ watch(
     () => tableStore.table.allFlag,
     newVal => {
         if (tableStore.table.allFlag) {
+            console.log('🚀 ~ tableStore.table.allData:', tableStore.table.allData)
 
             tableRef.value?.exportData({
                 filename: tableStore.exportName || document.querySelectorAll('.ba-nav-tab.active')[0].textContent || '', // 文件名字

src/components/tree/cloudDevice.vue

@@ -14,8 +14,8 @@
                     :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
-            <el-tree :style="{ height:  'calc(100vh - 200px)' }"
-            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current 
+            <el-tree :style="{ height:  'calc(100vh - 110px)' }"
+            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current :default-expand-all="false"
                 @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
@@ -75,7 +75,6 @@ const filterNode = (value: string, data: any, node: any) => {
 
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
-
     if (data.name.indexOf(value) !== -1) {
         return true
     }

src/components/tree/device.vue

@@ -31,7 +31,7 @@
                     <el-tree
                         :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 278px)' }"
                         ref="treeRef1" :props="defaultProps" highlight-current :filter-node-method="filterNode"
-                        node-key="id" default-expand-all v-bind="$attrs" :data="zlDevList" style="overflow: auto">
+                        node-key="id" :default-expand-all="false" v-bind="$attrs" :data="zlDevList" style="overflow: auto">
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
                                 <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
@@ -44,7 +44,7 @@
                 <el-collapse-item title="便携式设备" name="1" v-if="bxsDeviceData.length != 0">
                     <el-tree
                         :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 280px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef2" :props="defaultProps" highlight-current default-expand-all
+                        ref="treeRef2" :props="defaultProps" highlight-current :default-expand-all="false"
                         :filter-node-method="filterNode" node-key="id" :data="bxsDeviceData" v-bind="$attrs"
                         style="overflow: auto">
                         <template #default="{ node, data }">
@@ -59,7 +59,7 @@
                 <el-collapse-item title="在线设备" name="2" v-if="frontDeviceData.length != 0">
                     <el-tree
                         :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 280px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef3" :props="defaultProps" highlight-current default-expand-all
+                        ref="treeRef3" :props="defaultProps" highlight-current :default-expand-all="false"
                         :filter-node-method="filterNode" node-key="id" :data="frontDeviceData" v-bind="$attrs"
                         style="overflow: auto">
                         <template #default="{ node, data }">
@@ -124,6 +124,7 @@ watch(
                     item.children.map((vv: any) => {
                         zlDeviceData.value.push(vv)
                     })
+                    zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))    
                 } else if (item.name == '便携式设备') {
                     bxsDeviceData.value = []
                     item.children.map((vv: any) => {
@@ -156,8 +157,6 @@ watch(filterText, val => {
     }
 })
 watch(process, val => {
-
-
     if (val == '') {
         zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
     } else {
@@ -177,10 +176,10 @@ function filterProcess(nodes: any) {
             const children = node.children ? filterProcess(node.children) : []
 
             // 如果当前节点的process=4，或者有子节点满足条件，则保留当前节点
-            if (node.process == process.value || children.length > 0) {
+            if (  node.process == process.value || children.length > 0) {
                 return {
                     ...node,
-                    children: node.children
+                    children: children
                 }
             }
 

src/components/tree/govern/cloudDeviceEntryTree.vue

@@ -1,5 +1,5 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree ref="treRef" :width="width" :showPush="props.showPush"  :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
 </template>
 
 <script lang="ts" setup>
@@ -12,9 +12,11 @@ import { useDictData } from '@/stores/dictData'
 
 interface Props {
     template?: boolean
+    showPush?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
-    template: false
+    template: false,
+    showPush: false
 })
 defineOptions({
     name: 'govern/deviceTree'
@@ -95,13 +97,16 @@ const info = (selectedNodeId?: string) => {
                 tree.value = []
             }
             nextTick(() => {
+              
                 if (arr1.length) {
-                    // 安全检查 treRef 和 treeRef1 是否存在
-                    if (treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey) {
+                    // 安全检查 treRef 和 treeRef 是否存在
+                        console.log("🚀 ~ info ~ treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey:", treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey)
+
+                    if (treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey) {
                         // 如果传入了要选中的节点ID，则选中该节点，否则选中第一个节点
                         console.log('selectedNodeId:', selectedNodeId);
                         if (selectedNodeId) {
-                            treRef.value.treeRef1.setCurrentKey(selectedNodeId);
+                            treRef.value.treeRef.setCurrentKey(selectedNodeId);
                             // 查找对应的节点数据并触发事件
                             let selectedNode = null;
                             const findNode = (nodes: any[]) => {
@@ -127,7 +132,7 @@ const info = (selectedNodeId?: string) => {
                             }
                         } else {
                             // 初始化选中第一个节点
-                            treRef.value.treeRef1.setCurrentKey(arr1[0].id);
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id);
                             emit('init', {
                                 level: 2,
                                 ...arr1[0]

src/components/tree/govern/deviceTree.vue

@@ -50,6 +50,7 @@ getDeviceTree().then(res => {
                     item2.color = config.getColorVal('elementUiPrimary')
                     item2.children.forEach((item3: any) => {
                         item3.icon = 'el-icon-Platform'
+                         item3.level = 2
                         item3.color = config.getColorVal('elementUiPrimary')
                         if (item3.comFlag === 1) {
                             item3.color = '#e26257 !important'
@@ -123,9 +124,7 @@ getDeviceTree().then(res => {
             })
             return
         }
-        console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3.length)
         if (arr3.length) {
-            console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3)
             treRef.value.treeRef3.setCurrentKey(arr3[0].id)
             // 注册父组件事件
             emit('init', {

src/components/tree/govern/getMarketList.vue

@@ -3,7 +3,7 @@
 </template>
 <script setup lang="ts">
 import { getMarketList } from '@/api/user-boot/user'
-import Tree from '../index.vue'
+import Tree from '../cloudDevice.vue'
 import { useConfig } from '@/stores/config'
 import { ref, reactive, nextTick } from 'vue'
 const config = useConfig()

src/components/tree/govern/officialUserTree.vue

@@ -0,0 +1,29 @@
+<template>
+    <Tree ref="treRef" :data="tree" />
+</template>
+<script setup lang="ts">
+import { getFormalUserList } from '@/api/user-boot/official'
+import Tree from '../cloudDevice.vue'
+import { useConfig } from '@/stores/config'
+import { ref, reactive, nextTick } from 'vue'
+const config = useConfig()
+const tree = ref()
+const treRef = ref()
+const emit = defineEmits(['selectUser'])
+getFormalUserList().then((res: any) => {
+    if (res.code === 'A0000') {
+        tree.value = res.data.map((item: any) => {
+            return {
+                ...item,
+                icon: 'el-icon-User',
+                color: 'royalblue'
+            }
+        })
+        emit('selectUser', tree.value[0])
+        nextTick(() => {
+            treRef.value.treeRef.setCurrentKey(tree.value[0].id)
+        })
+    }
+})
+</script>
+<style lang="scss" scoped></style>

src/components/tree/govern/pointTree.vue

@@ -46,7 +46,7 @@ const info = () => {
                         item2.color = config.getColorVal('elementUiPrimary')
                         item2.children.forEach((item3: any) => {
                             item3.icon = 'el-icon-Platform'
-                            item3.level = 1
+                            item3.level = 2
                             item3.color =
                                 item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
                             item3.children.forEach((item4: any) => {

src/components/tree/govern/pointTreeWx.vue

@@ -1,181 +1,196 @@
-<template>
-    <div>
-        <div style="transition: all 0.3s; overflow: hidden; height: 100%">
-
-            <div class="cn-tree">
-                <div style="display: flex; align-items: center" class="mb10">
-                    <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
-                        <template #prefix>
-                            <Icon name="el-icon-Search" style="font-size: 16px" />
-                        </template>
-                    </el-input>
-                </div>
-                <el-tree style="flex: 1; overflow: auto" :props="defaultProps" highlight-current
-                    :filter-node-method="filterNode" node-key="id" v-bind="$attrs" default-expand-all :data="tree"
-                    ref="treRef" @node-click="clickNode" :expand-on-click-node="false">
-                    <template #default="{ node, data }">
-                        <span class="custom-tree-node">
-                            <div class="left">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
-                                <span>{{ node.label }}</span>
-                            </div>
-
-                        </span>
-                    </template>
-                </el-tree>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, nextTick, watch, defineProps, defineEmits } from 'vue'
-import { getSchemeTree, getTestRecordInfo } from '@/api/cs-device-boot/planData'
-import { useConfig } from '@/stores/config'
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import { ElTree } from 'element-plus'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
-import { useDictData } from '@/stores/dictData'
-defineOptions({
-    name: 'govern/schemeTree'
-})
-
-interface Props {
-    template?: boolean
-
-}
-const dictData = useDictData()
-const props = withDefaults(defineProps<Props>(), {
-    template: false,
-
-})
-const filterText = ref('')
-watch(filterText, val => {
-    treRef.value!.filter(val)
-})
-
-const filterNode = (value: string, data: any, node: any) => {
-    if (!value) return true
-    // return data.name.includes(value)
-    if (data.name) {
-        return chooseNode(value, data, node)
-    }
-}
-const chooseNode = (value: string, data: any, node: any) => {
-    if (data.name.indexOf(value) !== -1) {
-        return true
-    }
-    const level = node.level
-    // 如果传入的节点本身就是一级节点就不用校验了
-    if (level === 1) {
-        return false
-    }
-    // 先取当前节点的父节点
-    let parentData = node.parent
-    // 遍历当前节点的父节点
-    let index = 0
-    while (index < level - 1) {
-        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
-        if (parentData.data.name.indexOf(value) !== -1) {
-            return true
-        }
-        // 否则的话再往上一层做匹配
-        parentData = parentData.parent
-        index++
-    }
-    // 没匹配到返回false
-    return false
-}
-/** 树形结构数据 */
-const defaultProps = {
-    children: 'children',
-    label: 'name',
-    value: 'id'
-}
-
-
-const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
-const config = useConfig()
-const tree = ref()
-const treRef = ref()
-const id: any = ref(null)
-const treeData = ref({})
-//获取方案树形数据
-const getTreeList = () => {
-    getSchemeTree().then(res => {
-        let arr: any[] = []
-
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-Menu'
-            item.color = config.getColorVal('elementUiPrimary')
-            item?.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-Document'
-                item2.color = config.getColorVal('elementUiPrimary')
-                arr.push(item2)
-            })
-        })
-        tree.value = res.data
-        nextTick(() => {
-            if (arr.length) {
-                treRef.value.setCurrentKey(id.value || arr[0].id)
-                let list = id.value ? arr.find((item: any) => item.id == id.value) : arr[0]
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...list
-                })
-            } else {
-                emit('init')
-            }
-        })
-    })
-}
-
-//方案id
-const planId: any = ref('')
-
-const clickNode = (e: anyObj) => {
-    e?.children ? (planId.value = e.id) : (planId.value = e.pid)
-    id.value = e.id
-    emit('nodeChange', e)
-}
-
-
-if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
-        emit('Policy', res.data)
-        getTreeList()
-    }).catch(err => {
-        getTreeList()
-    })
-} else {
-    getTreeList()
-}
-
-</script>
-<style lang="scss" scoped>
-.cn-tree {
-    flex-shrink: 0;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    padding: 10px;
-    height: 100%;
-    width: 100%;
-    height: calc(100vh - 125px);
-    overflow-y: auto;
-
-    :deep(.el-tree) {
-        border: 1px solid var(--el-border-color);
-    }
-
-    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
-        background-color: var(--el-color-primary-light-7);
-    }
-
-    .menu-collapse {
-        color: var(--el-color-primary);
-    }
-}
-</style>
+<template>
+    <div>
+        <div style="transition: all 0.3s; overflow: hidden; height: 100%">
+            <div class="cn-tree">
+                <div style="display: flex; align-items: center" class="mb10">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="filterText"
+                        placeholder="请输入内容"
+                        clearable
+                    >
+                        <template #prefix>
+                            <Icon name="el-icon-Search" style="font-size: 16px" />
+                        </template>
+                    </el-input>
+                </div>
+                <el-tree
+                    style="flex: 1; overflow: auto"
+                    :props="defaultProps"
+                    highlight-current
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    v-bind="$attrs"
+                    default-expand-all
+                    :data="tree"
+                    ref="treRef"
+                    @node-click="clickNode"
+                    :expand-on-click-node="false"
+                >
+                    <template #default="{ node, data }">
+                        <span class="custom-tree-node">
+                            <div class="left" style="display: flex; align-items: center">
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
+                                <span style="margin-left: 5px;">{{ node.label }}</span>
+                            </div>
+                        </span>
+                    </template>
+                </el-tree>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, watch, defineProps, defineEmits } from 'vue'
+import { getSchemeTree, getTestRecordInfo } from '@/api/cs-device-boot/planData'
+import { useConfig } from '@/stores/config'
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+defineOptions({
+    name: 'govern/schemeTree'
+})
+
+interface Props {
+    template?: boolean
+}
+const dictData = useDictData()
+const props = withDefaults(defineProps<Props>(), {
+    template: false
+})
+const filterText = ref('')
+watch(filterText, val => {
+    treRef.value!.filter(val)
+})
+
+const filterNode = (value: string, data: any, node: any) => {
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.name.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
+        if (parentData.data.name.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+/** 树形结构数据 */
+const defaultProps = {
+    children: 'children',
+    label: 'name',
+    value: 'id'
+}
+
+const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
+const config = useConfig()
+const tree = ref()
+const treRef = ref()
+const id: any = ref(null)
+const treeData = ref({})
+//获取方案树形数据
+const getTreeList = () => {
+    getSchemeTree().then(res => {
+        let arr: any[] = []
+
+        res.data.forEach((item: any) => {
+            item.icon = 'el-icon-Menu'
+            item.color = config.getColorVal('elementUiPrimary')
+            item?.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-Document'
+                item2.color = config.getColorVal('elementUiPrimary')
+                arr.push(item2)
+            })
+        })
+        tree.value = res.data
+        nextTick(() => {
+            if (arr.length) {
+                treRef.value.setCurrentKey(id.value || arr[0].id)
+                let list = id.value ? arr.find((item: any) => item.id == id.value) : arr[0]
+                // 注册父组件事件
+                emit('init', {
+                    level: 2,
+                    ...list
+                })
+            } else {
+                emit('init')
+            }
+        })
+    })
+}
+
+//方案id
+const planId: any = ref('')
+
+const clickNode = (e: anyObj) => {
+    e?.children ? (planId.value = e.id) : (planId.value = e.pid)
+    id.value = e.id
+    emit('nodeChange', e)
+}
+
+if (props.template) {
+    getTemplateByDept({ id: dictData.state.area[0].id })
+        .then((res: any) => {
+            emit('Policy', res.data)
+            getTreeList()
+        })
+        .catch(err => {
+            getTreeList()
+        })
+} else {
+    getTreeList()
+}
+</script>
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+</style>

src/components/tree/govern/selectTree.vue

@@ -63,7 +63,7 @@ const info = () => {
         nextTick(() => {
             if (arr3.length) {
                 //初始化选中
-                treRef.value.treeRef1.setCurrentKey(arr3[0].id)
+                treRef.value.treeRef.setCurrentKey(arr3[0].id)
                 // 注册父组件事件
                 emit('init', {
                     level: 2,

src/components/tree/index.vue

@@ -10,7 +10,7 @@
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>
                 </el-input>
-                <el-tooltip placement="bottom" :hide-after="0">
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
                         <template #content>
                             <span>台账推送</span>
                         </template>
@@ -23,13 +23,13 @@
                         :style="{ color: config.getColorVal('elementUiPrimary') }" 
                         @click="onAdd" />
                 </el-tooltip>
-                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
                     :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
 
             <el-tree :style="{ height:  'calc(100vh - 200px)' }"
-            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current 
+            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current :default-expand-all="false"
                 @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
@@ -58,11 +58,13 @@ defineOptions({
 interface Props {
     width?: string
     canExpand?: boolean
+    showPush?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
     width: '280px',
-    canExpand: true
+    canExpand: true,
+    showPush: false
 })
 const config = useConfig()
 const { proxy } = useCurrentInstance()

src/components/tree/point.vue

@@ -28,7 +28,8 @@
                     <el-tree
                         :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 278px)' }"
                         ref="treeRef1" :props="defaultProps" highlight-current :filter-node-method="filterNode"
-                        node-key="id" default-expand-all v-bind="$attrs" :data="zlDevList" style="overflow: auto">
+                        node-key="id"  v-bind="$attrs" :data="zlDevList" style="overflow: auto"
+                        :default-expand-all="false">
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
                                 <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
@@ -41,9 +42,9 @@
                 <el-collapse-item title="便携式设备" name="1" v-if="bxsDeviceData.length != 0">
                     <el-tree
                         :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 330px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef2" :props="defaultProps" highlight-current default-expand-all
+                        ref="treeRef2" :props="defaultProps" highlight-current :default-expand-all="false"
                         :filter-node-method="filterNode" node-key="id" :data="bxsDeviceData" v-bind="$attrs"
-                        style="overflow: auto">
+                        style="overflow: auto" >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
                                 <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
@@ -56,7 +57,7 @@
                 <el-collapse-item title="在线设备" name="2" v-if="yqfDeviceData.length != 0">
                     <el-tree
                         :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 330px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef3" :props="defaultProps" highlight-current default-expand-all
+                        ref="treeRef3" :props="defaultProps" highlight-current :default-expand-all="false"
                         :filter-node-method="filterNode" node-key="id" :data="yqfDeviceData" v-bind="$attrs"
                         style="overflow: auto">
                         <template #default="{ node, data }">
@@ -76,7 +77,7 @@
 <script lang="ts" setup>
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
-import { el } from 'element-plus/es/locale'
+import { el, fa } from 'element-plus/es/locale'
 import { ref, watch, defineEmits, onMounted, nextTick, computed } from 'vue'
 import { useRoute } from 'vue-router'
 defineOptions({
@@ -117,13 +118,14 @@ watch(
     () => props.data,
     (val, oldVal) => {
         if (val && val.length != 0) {
+            
             val.map((item: any) => {
                 if (item.name == '治理设备') {
                     zlDeviceData.value = []
                     item.children.map((vv: any) => {
                         zlDeviceData.value.push(vv)
                     })
-                    // console.log('🚀 ~ item.children.map ~  zlDeviceData.value:', zlDeviceData.value)
+                zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))    
                 } else if (item.name == '便携式设备') {
                     bxsDeviceData.value = []
                     item.children.map((vv: any) => {
@@ -155,18 +157,23 @@ watch(filterText, val => {
     }
 })
 watch(process, val => {
+    
     if (val == '') {
         zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
     } else {
         zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
+      
     }
+
     setTimeout(() => {
         changeDevice(activeName.value)
     }, 0)
 })
 
+
+
 const changeDevice = (val: any) => {
-    console.log('changeDevice', val)
+
     let arr1: any = []
     //zlDeviceData
     zlDevList.value.forEach((item: any) => {
@@ -231,6 +238,7 @@ const filterNode = (value: string, data: any, node: any) => {
         return chooseNode(value, data, node)
     }
 }
+
 function filterProcess(nodes: any) {
     if (process.value == '') {
         return nodes
@@ -240,20 +248,58 @@ function filterProcess(nodes: any) {
             // 递归处理子节点
             const children = node.children ? filterProcess(node.children) : []
 
-            // 如果当前节点的process=4，或者有子节点满足条件，则保留当前节点
+            // 对于装置层级（level=2），只保留 process 值匹配的节点
+            if (node.level === 2) {
+                if (node.process == process.value) {
+                    return {
+                        ...node,
+                        children: children
+                    }
+                }
+                return null
+            }
 
-            if (node.process == process.value || children.length > 0) {
+            // 对于其他节点：
+            // 1. 如果有满足条件的子节点则保留
+            // 2. 如果本身 process 值匹配则保留
+            // 3. 如果是叶子节点也保留（监测点通常没有子节点）
+            if (children.length > 0 || node.process == process.value || 
+                (!node.children || node.children.length === 0)) {
                 return {
                     ...node,
-                    children: node.children
+                    children: children
                 }
             }
 
-            // 否则过滤掉当前节点
             return null
         })
         .filter(Boolean) // 移除null节点
 }
+
+
+// function filterProcess(nodes: any) {
+//     if (process.value == '') {
+//         return nodes
+//     }
+//     return nodes
+//         .map(node => {
+//             // 递归处理子节点
+//             const children = node.children ? filterProcess(node.children) : []
+
+//             // 如果当前节点的process=4，或者有子节点满足条件，则保留当前节点
+
+//             if (node.process == process.value || children.length > 0) {
+//                 return {
+//                     ...node,
+//                     children: node.children
+//                 }
+//             }
+
+//             // 否则过滤掉当前节点
+//             return null
+//         })
+//         .filter(Boolean) // 移除null节点
+// }
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
     if (data.name.indexOf(value) !== -1) {
@@ -288,7 +334,9 @@ const treeRef2 = ref<InstanceType<typeof ElTree>>()
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
 defineExpose({ treeRef1, treeRef2 })
 onMounted(() => {
+     
     setTimeout(() => {
+       
         if (zlDeviceData.value.length != 0) {
             zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
             activeName.value = '0'

src/components/tree/select.vue

@@ -24,8 +24,7 @@
                 @node-click="handleNodeClick"
                 :default-checked-keys="defaultCheckedKeys"
                 v-bind='$attrs'
-           
-            
+                :default-expand-all="false"
                 >
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
@@ -121,8 +120,69 @@ const handleNodeClick = (data: any, node: any, event: any) => {
 // 存储所有勾选的节点
 const checkedNodes = ref<any[]>([])
 const defaultCheckedKeys = ref<string[]>([])
+
 // 处理节点勾选变化
 const handleCheckChange = (data: any, checkInfo: any) => {
+    const { checkedNodes: nodes } = checkInfo
+    // 过滤出监测点层级(level=3)的节点
+    const monitoringPointNodes = nodes.filter((node: any) => {
+        return node.level === 3 
+    })
+    
+    
+    // 限制最多只能勾选5个监测点
+    if (monitoringPointNodes.length > 5) {
+        // 获取之前选中的节点
+        const previousCheckedNodes = checkedNodes.value || []
+        
+        // 计算新增的节点
+        const newNodes = monitoringPointNodes.filter(
+            (node: any) => !previousCheckedNodes.some((prev: any) => prev.id === node.id)
+        )
+        
+        // 如果是从父级勾选导致超过限制，保留前几个直到达到限制数量
+        if (newNodes.length > 0) {
+            const allowedNewCount = 5 - previousCheckedNodes.length
+            if (allowedNewCount > 0) {
+                // 允许添加allowedNewCount个新节点
+                const allowedNewNodes = newNodes.slice(0, allowedNewCount)
+                const finalNodes = [...previousCheckedNodes, ...allowedNewNodes]
+                
+                checkedNodes.value = finalNodes
+                
+                // 设置树的勾选状态为正确的节点
+                treeRef.value?.setCheckedNodes(finalNodes)
+                
+                // 将勾选的监测点节点暴露出去
+                emit('checkedNodesChange', finalNodes)
+                
+                // 更新节点的可勾选状态
+                updateNodeCheckStatus(finalNodes.length)
+                
+                // 只有在真正超过5个时才提示警告
+                if (monitoringPointNodes.length > 5) {
+                    ElMessage.warning('最多只能选择5个监测点')
+                }
+                return
+            }
+        }
+        
+        // 其他情况回滚到之前的状态
+        ElMessage.warning('最多只能选择5个监测点')
+        treeRef.value?.setCheckedNodes(checkedNodes.value)
+        return
+    }
+    
+    checkedNodes.value = monitoringPointNodes
+    
+    // 将勾选的监测点节点暴露出去
+    emit('checkedNodesChange', monitoringPointNodes)
+    
+    // 更新节点的可勾选状态
+    updateNodeCheckStatus(monitoringPointNodes.length)
+}
+// 处理节点勾选变化
+const handleCheckChange2 = (data: any, checkInfo: any) => {
     const { checkedNodes: nodes } = checkInfo
     // 过滤出监测点层级(level=3)的节点
     const monitoringPointNodes = nodes.filter((node: any) => {

src/layouts/admin/index.vue

@@ -1,125 +1,126 @@
-<template>
-    <component :is='config.layout.layoutMode'></component>
-</template>
-
-<script setup lang='ts'>
-import { reactive } from 'vue'
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { useRoute } from 'vue-router'
-import Default from '@/layouts/admin/container/default.vue'
-import Classic from '@/layouts/admin/container/classic.vue'
-import Streamline from '@/layouts/admin/container/streamline.vue'
-import Double from '@/layouts/admin/container/double.vue'
-import { onMounted, onBeforeMount } from 'vue'
-import { handleAdminRoute, getFirstRoute, routePush } from '@/utils/router'
-import router from '@/router/index'
-import { useEventListener } from '@vueuse/core'
-import { isEmpty } from 'lodash-es'
-import { setNavTabsWidth } from '@/utils/layout'
-import { adminBaseRoutePath } from '@/router/static'
-import { getRouteMenu, dictDataCache } from '@/api/auth'
-import { getAreaList, areaSelect } from '@/api/common'
-import { BasicDictData } from '@/stores/interface'
-import { getAllUserSimpleList, getUserById } from '@/api/user-boot/user'
-
-defineOptions({
-    components: { Default, Classic, Streamline, Double }
-})
-
-const navTabs = useNavTabs()
-const config = useConfig()
-const route = useRoute()
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const state = reactive({
-    autoMenuCollapseLock: false
-})
-
-onMounted(() => {
-    // if (!adminInfo.token) return router.push({ name: 'login' })
-
-    init()
-    setNavTabsWidth()
-    useEventListener(window, 'resize', setNavTabsWidth)
-})
-onBeforeMount(() => {
-    onAdaptiveLayout()
-    useEventListener(window, 'resize', onAdaptiveLayout)
-})
-
-const init = async () => {
-    await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
-        dictData.state.area = res[0].data
-        dictData.state.basic = res[1].data
-        // dictData.state.userList=res[4].data
-        adminInfo.dataFill(res[2].data)
-        // dictData.state.areaTree = res[3].data
-    })
-    /**
-     * 后台初始化请求，获取站点配置，动态路由等信息
-     */
-    getRouteMenu().then((res: any) => {
-        const handlerMenu = (data: any) => {
-            data.forEach((item: any) => {
-                item.routePath =
-                    item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
-                item.path = item.routePath
-                item.name = item.routePath
-                item.keepalive = item.routePath
-                item.component = item.routeName
-                    ? item.routeName.indexOf('/src/views/') > -1
-                        ? item.routeName
-                        : `/src/views/${item.routeName}/index.vue`
-                    : ''
-                item.type = item.children && item.children.length > 0 ? 'menu_dir' : 'menu'
-                item.menu_type = item.children && item.children.length > 0 ? null : 'tab'
-                if (item.children) {
-                    handlerMenu(item.children)
-                }
-            })
-        }
-        handlerMenu(res.data)
-        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 })
-                return
-            }
-        }
-        // 跳转到第一个菜单
-        let firstRoute = getFirstRoute(navTabs.state.tabsViewRoutes)
-        if (firstRoute) routePush(firstRoute.path)
-    })
-}
-
-const onAdaptiveLayout = () => {
-    let defaultBeforeResizeLayout = {
-        layoutMode: config.layout.layoutMode,
-        menuCollapse: config.layout.menuCollapse
-    }
-
-    const clientWidth = document.body.clientWidth
-    if (clientWidth < 1024) {
-        /**
-         * 锁定窗口改变自动调整 menuCollapse
-         * 避免已是小窗且打开了菜单栏时，意外的自动关闭菜单栏
-         */
-        if (!state.autoMenuCollapseLock) {
-            state.autoMenuCollapseLock = true
-            config.setLayout('menuCollapse', true)
-        }
-        config.setLayout('shrink', true)
-        config.setLayoutMode('Classic')
-    } else {
-        state.autoMenuCollapseLock = false
-        config.setLayout('menuCollapse', defaultBeforeResizeLayout.menuCollapse)
-        config.setLayout('shrink', false)
-        config.setLayoutMode(defaultBeforeResizeLayout.layoutMode)
-    }
-}
-</script>
+<template>
+    <component :is='config.layout.layoutMode'></component>
+</template>
+
+<script setup lang='ts'>
+import { reactive } from 'vue'
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { useRoute } from 'vue-router'
+import Default from '@/layouts/admin/container/default.vue'
+import Classic from '@/layouts/admin/container/classic.vue'
+import Streamline from '@/layouts/admin/container/streamline.vue'
+import Double from '@/layouts/admin/container/double.vue'
+import { onMounted, onBeforeMount } from 'vue'
+import { handleAdminRoute, getFirstRoute, routePush } from '@/utils/router'
+import router from '@/router/index'
+import { useEventListener } from '@vueuse/core'
+import { isEmpty } from 'lodash-es'
+import { setNavTabsWidth } from '@/utils/layout'
+import { adminBaseRoutePath } from '@/router/static'
+import { getRouteMenu, dictDataCache } from '@/api/auth'
+import { getAreaList, areaSelect } from '@/api/common'
+import { BasicDictData } from '@/stores/interface'
+import { getAllUserSimpleList, getUserById } from '@/api/user-boot/user'
+
+defineOptions({
+    components: { Default, Classic, Streamline, Double }
+})
+
+const navTabs = useNavTabs()
+const config = useConfig()
+const route = useRoute()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const state = reactive({
+    autoMenuCollapseLock: false
+})
+
+onMounted(() => {
+    // if (!adminInfo.token) return router.push({ name: 'login' })
+
+    init()
+    setNavTabsWidth()
+    useEventListener(window, 'resize', setNavTabsWidth)
+})
+onBeforeMount(() => {
+    onAdaptiveLayout()
+    useEventListener(window, 'resize', onAdaptiveLayout)
+})
+
+const init = async () => {
+    await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
+        dictData.state.area = res[0].data
+        dictData.state.basic = res[1].data
+        // dictData.state.userList=res[4].data
+        adminInfo.dataFill(res[2].data)
+        // dictData.state.areaTree = res[3].data
+    })
+    /**
+     * 后台初始化请求，获取站点配置，动态路由等信息
+     */
+    getRouteMenu().then((res: any) => {
+        const handlerMenu = (data: any) => {
+            data.forEach((item: any) => {
+                item.routePath =
+                    item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
+                item.path = item.routePath
+                item.name = item.routePath
+                item.keepalive = item.routePath
+                item.component = item.routeName
+                    ? item.routeName.indexOf('/src/views/') > -1
+                        ? item.routeName
+                        : `/src/views/${item.routeName}/index.vue`
+                    : ''
+                item.type = item.children && item.children.length > 0 ? 'menu_dir' : 'menu'
+                item.menu_type = item.children && item.children.length > 0 ? null : 'tab'
+                if (item.children) {
+                    handlerMenu(item.children)
+                }
+            })
+        }
+        handlerMenu(res.data)
+        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 })
+                return
+            }
+        }
+        // 跳转到第一个菜单
+        let firstRoute = getFirstRoute(navTabs.state.tabsViewRoutes)
+        if (firstRoute) routePush(firstRoute.path)
+    })
+}
+
+const onAdaptiveLayout = () => {
+    let defaultBeforeResizeLayout = {
+        layoutMode: config.layout.layoutMode,
+        menuCollapse: config.layout.menuCollapse
+    }
+
+    const clientWidth = document.body.clientWidth
+    if (clientWidth < 1024) {
+        /**
+         * 锁定窗口改变自动调整 menuCollapse
+         * 避免已是小窗且打开了菜单栏时，意外的自动关闭菜单栏
+         */
+        if (!state.autoMenuCollapseLock) {
+            state.autoMenuCollapseLock = true
+            config.setLayout('menuCollapse', true)
+        }
+        config.setLayout('shrink', true)
+        config.setLayoutMode('Classic')
+    } else {
+        state.autoMenuCollapseLock = false
+        config.setLayout('menuCollapse', defaultBeforeResizeLayout.menuCollapse)
+        config.setLayout('shrink', false)
+        config.setLayoutMode(defaultBeforeResizeLayout.layoutMode)
+    }
+}
+</script>

src/layouts/admin/router-view/main.vue

@@ -1,104 +1,104 @@
-<template>
-    <el-main class="layout-main" :style="mainHeight()">
-        <router-view v-slot="{ Component }">
-            <transition :name="config.layout.mainAnimation" mode="out-in">
-                <keep-alive :include="state.keepAliveComponentNameList">
-                    <component :is="Component" :key="state.componentKey" />
-                </keep-alive>
-            </transition>
-        </router-view>
-    </el-main>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted, watch, onBeforeMount, onUnmounted, nextTick, provide } from 'vue'
-import { useRoute, type RouteLocationNormalized } from 'vue-router'
-import { mainHeight } from '@/utils/layout'
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-
-defineOptions({
-    name: 'layout/main'
-})
-
-const { proxy } = useCurrentInstance()
-
-const route = useRoute()
-const config = useConfig()
-const navTabs = useNavTabs()
-
-const state: {
-    componentKey: string
-    keepAliveComponentNameList: string[]
-} = reactive({
-    componentKey: route.path,
-    keepAliveComponentNameList: []
-})
-
-const addKeepAliveComponentName = function (keepAliveName: string | undefined) {
-    if (keepAliveName) {
-        let exist = state.keepAliveComponentNameList.find((name: string) => {
-            return name === keepAliveName
-        })
-        if (exist) return
-        state.keepAliveComponentNameList.push(keepAliveName)
-    }
-}
-
-onBeforeMount(() => {
-    proxy.eventBus.on('onTabViewRefresh', (menu: RouteLocationNormalized) => {
-        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
-            (name: string) => menu.meta.keepalive !== name
-        )
-        state.componentKey = ''
-        nextTick(() => {
-            state.componentKey = menu.path
-            addKeepAliveComponentName(menu.meta.keepalive as string)
-        })
-    })
-    proxy.eventBus.on('onTabViewClose', (menu: RouteLocationNormalized) => {
-        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
-            (name: string) => menu.meta.keepalive !== name
-        )
-    })
-})
-
-onUnmounted(() => {
-    proxy.eventBus.off('onTabViewRefresh')
-    proxy.eventBus.off('onTabViewClose')
-})
-
-onMounted(() => {
-    // 确保刷新页面时也能正确取得当前路由 keepalive 参数
-    if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
-        addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
-    }
-})
-
-watch(
-    () => route.path,
-    () => {
-        state.componentKey = route.path
-        if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
-            addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
-        }
-    }
-)
-
-</script>
-
-<style scoped lang="scss">
-.layout-container .layout-main {
-    padding: 0 !important;
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-}
-
-.layout-main-scrollbar {
-    width: 100%;
-    position: relative;
-    //overflow: hidden;
-}
-</style>
+<template>
+    <el-main class="layout-main" :style="mainHeight()">
+        <router-view v-slot="{ Component }">
+            <transition :name="config.layout.mainAnimation" mode="out-in">
+                <keep-alive :include="state.keepAliveComponentNameList">
+                    <component :is="Component" :key="state.componentKey" />
+                </keep-alive>
+            </transition>
+        </router-view>
+    </el-main>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, watch, onBeforeMount, onUnmounted, nextTick, provide } from 'vue'
+import { useRoute, type RouteLocationNormalized } from 'vue-router'
+import { mainHeight } from '@/utils/layout'
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+
+defineOptions({
+    name: 'layout/main'
+})
+
+const { proxy } = useCurrentInstance()
+
+const route = useRoute()
+const config = useConfig()
+const navTabs = useNavTabs()
+
+const state: {
+    componentKey: string
+    keepAliveComponentNameList: string[]
+} = reactive({
+    componentKey: route.path,
+    keepAliveComponentNameList: []
+})
+
+const addKeepAliveComponentName = function (keepAliveName: string | undefined) {
+    if (keepAliveName) {
+        let exist = state.keepAliveComponentNameList.find((name: string) => {
+            return name === keepAliveName
+        })
+        if (exist) return
+        state.keepAliveComponentNameList.push(keepAliveName)
+    }
+}
+
+onBeforeMount(() => {
+    proxy.eventBus.on('onTabViewRefresh', (menu: RouteLocationNormalized) => {
+        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
+            (name: string) => menu.meta.keepalive !== name
+        )
+        state.componentKey = ''
+        nextTick(() => {
+            state.componentKey = menu.path
+            addKeepAliveComponentName(menu.meta.keepalive as string)
+        })
+    })
+    proxy.eventBus.on('onTabViewClose', (menu: RouteLocationNormalized) => {
+        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
+            (name: string) => menu.meta.keepalive !== name
+        )
+    })
+})
+
+onUnmounted(() => {
+    proxy.eventBus.off('onTabViewRefresh')
+    proxy.eventBus.off('onTabViewClose')
+})
+
+onMounted(() => {
+    // 确保刷新页面时也能正确取得当前路由 keepalive 参数
+    if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
+        addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
+    }
+})
+
+watch(
+    () => route.path,
+    () => {
+        state.componentKey = route.path
+        if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
+            addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
+        }
+    }
+)
+
+</script>
+
+<style scoped lang="scss">
+.layout-container .layout-main {
+    padding: 0 !important;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+}
+
+.layout-main-scrollbar {
+    width: 100%;
+    position: relative;
+    //overflow: hidden;
+}
+</style>

src/stores/timeCache.ts

@@ -0,0 +1,34 @@
+// src/stores/timeCache.ts
+import { defineStore } from 'pinia'
+import { RouteLocationNormalizedLoaded } from 'vue-router'
+
+// 时间组件的缓存值   用于驾驶舱放大的时候和内部的时间组件同步
+interface TimeCacheState {
+  cache: Map<string, {
+    interval: number | undefined  // 时间组件的月份、年份、时间、时间格式的缓存值
+    timeValue: any   // 时间组件的值
+  }>
+}
+
+export const useTimeCacheStore = defineStore('timeCache', {
+  state: (): TimeCacheState => ({
+    cache: new Map()
+  }),
+  
+  actions: {
+    setCache(routePath: string, interval: number | undefined, timeValue: any) {
+      this.cache.set(routePath, {
+        interval,
+        timeValue
+      })
+    },
+    
+    getCache(routePath: string) {
+      return this.cache.get(routePath)
+    },
+    
+    hasCache(routePath: string) {
+      return this.cache.has(routePath)
+    }
+  }
+})

src/utils/echartMethod.ts

@@ -1,157 +1,304 @@
-const dataProcessing = (arr: any[]) => {
-    return arr
-        .filter(item => typeof item === 'number' || (typeof item === 'string' && !isNaN(parseFloat(item))))
-        .map(item => (typeof item === 'number' ? item : parseFloat(item)))
-}
-
-const calculateValue = (o:number,value: number, num: number, isMin: boolean) => {
-    if (value === 0) {
-        return 0
-    }else if(value>0&& Math.abs(value)<1 && isMin==true){
-        return 0 
-    }else if(value>-1&& value<0 && isMin==false){
-        return 0 
-    }
-    let base
-    if (Math.abs(o) >= 100) {
-        base = 100
-    } else if (Math.abs(o) >= 10) {
-        base = 10
-    } else if (Math.abs(o) >= 1) {
-        base = 1
-    } else {
-        base = 0.1
-    }
-    let calculatedValue
-    if (isMin) {
-        if (value < 0) {
-            calculatedValue = value + num * value
-        } else {
-            calculatedValue = value - num * value
-        }
-    } else {
-        if (value < 0) {
-            calculatedValue = value - num * value
-        } else {
-            calculatedValue = value + num * value
-        }
-    }
-    if (base === 0.1) {
-        return parseFloat(calculatedValue.toFixed(1))
-    } else if (isMin) {
-        return Math.floor(calculatedValue / base) * base
-    } else {
-        return Math.ceil(calculatedValue / base) * base
-    }
-}
-
-// 处理y轴最大最小值
-export const yMethod = (arr: any) => {
-    let num = 0.2
-    let numList = dataProcessing(arr)
-    let maxValue = 0
-    let minValue = 0
-    let max = 0
-    let min = 0
-    maxValue = Math.max(...numList)
-    minValue = Math.min(...numList)
-   const o=maxValue-minValue
-    min = calculateValue( o,minValue, num, true)
-    max = calculateValue(o,maxValue, num,  false)
-    // if (-100 >= minValue) {
-    //     min = Math.floor((minValue + num * minValue) / 100) * 100
-    // } else if (-10 >= minValue && minValue > -100) {
-    //     min = Math.floor((minValue + num * minValue) / 10) * 10
-    // } else if (-1 >= minValue && minValue > -10) {
-    //     min = Math.floor(minValue + num * minValue)
-    // } else if (0 > minValue && minValue > -1) {
-    //     min = parseFloat((minValue + num * minValue).toFixed(1))
-    // } else if (minValue == 0) {
-    //     min = 0
-    // } else if (0 < minValue && minValue < 1) {
-    //     min = parseFloat((minValue - num * minValue).toFixed(1))
-    // } else if (1 <= minValue && minValue < 10) {
-    //     min = Math.floor(minValue - num * minValue)
-    // } else if (10 <= minValue && minValue < 100) {
-    //     min = Math.floor((minValue - num * minValue) / 10) * 10
-    // } else if (100 <= minValue) {
-    //     min = Math.floor((minValue - num * minValue) / 100) * 100
-    // }
-
-    // if (-100 >= maxValue) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 100) * 100
-    // } else if (-10 >= maxValue && maxValue > -100) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 10) * 10
-    // } else if (-1 >= maxValue && maxValue > -10) {
-    //     max = Math.ceil(maxValue - num * maxValue)
-    // } else if (0 > maxValue && maxValue > -1) {
-    //     max = parseFloat((maxValue - num * maxValue).toFixed(1))
-    // } else if (maxValue == 0) {
-    //     max = 0
-    // } else if (0 < maxValue && maxValue < 1) {
-    //     max = parseFloat((maxValue + num * maxValue).toFixed(1))
-    // } else if (1 <= maxValue && maxValue < 10) {
-    //     max = Math.ceil(maxValue + num * maxValue)
-    // } else if (10 <= maxValue && maxValue < 100) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 10) * 10
-    // } else if (100 <= maxValue) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 100) * 100
-    // }
-
-    // if (maxValue > 1000 || minValue < -1000) {
-    //     max = Math.ceil(maxValue / 100) * 100
-    //     if (minValue == 0) {
-    //         min = 0
-    //     } else {
-    //         min = Math.floor(minValue / 100) * 100
-    //     }
-    // } else if (maxValue < 60 && minValue > 40) {
-    //     max = 60
-    //     min = 40
-    // } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
-    //     max = Math.ceil(maxValue / 10 + 1) * 10
-    //     min = Math.floor(minValue / 10 - 1) * 10
-    // } else {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // }
-
-    // if (maxValue > 0 && maxValue < 1) {
-    //     max = 1
-    // } else if (max == 0 && minValue > -1 && minValue < 0) {
-    //     min = -1
-    // }
-
-    return [min, max]
-}
-
-
-/**
- * title['A相','B相',]
- * data[[1,2],[3,4]]
- */
-// 导出csv文件
-const convertToCSV = (title: object, data: any) => {
-    console.log('🚀 ~ convertToCSV ~ data:', data)
-    let csv = ''
-    // 添加列头
-    csv += ',' + title.join(',') + '\n'
-    // 遍历数据并添加到CSV字符串中
-    data?.map(item => {
-        csv += item.join(',') + '\n'
-    })
-    return csv
-}
-export const exportCSV = (title: object, data: any, filename: string) => {
-    const csv = convertToCSV(title, data)
-    const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
-    const link = document.createElement('a')
-    link.href = URL.createObjectURL(blob)
-    link.download = filename
-    link.click()
-    // 释放URL对象
-    URL.revokeObjectURL(link.href)
-}
+import { number } from 'vue-types'
+
+const dataProcessing = (arr: any[]) => {
+    return arr
+        .filter(item => typeof item === 'number' || (typeof item === 'string' && !isNaN(parseFloat(item))))
+        .map(item => (typeof item === 'number' ? item : parseFloat(item)))
+}
+
+const calculateValue = (o: number, value: number, num: number, isMin: boolean) => {
+    if (value === 0) {
+        return 0
+    } else if (value > 0 && Math.abs(value) < 1 && isMin == true) {
+        return 0
+    } else if (value > -1 && value < 0 && isMin == false) {
+        return 0
+    }
+
+    let base
+    if (Math.abs(o) >= 100) {
+        base = 100
+    } else if (Math.abs(o) >= 10) {
+        base = 10
+    } else if (Math.abs(o) >= 1) {
+        base = 1
+    } else {
+        const multiple = 1 / 0.1
+
+        base = Math.ceil(Math.abs(o) * multiple) / multiple
+    }
+
+    let calculatedValue
+    if (isMin) {
+        if (value < 0) {
+            calculatedValue = value + num * value
+        } else {
+            calculatedValue = value - num * value
+        }
+    } else {
+        if (value < 0) {
+            calculatedValue = value - num * value
+        } else {
+            calculatedValue = value + num * value
+        }
+    }
+
+    if (base === 0.1) {
+        return parseFloat(calculatedValue.toFixed(1))
+    } else if (isMin) {
+        return Math.floor(calculatedValue / base) * base
+    } else {
+        return Math.ceil(calculatedValue / base) * base
+    }
+}
+
+// 处理y轴最大最小值
+export const yMethod = (arr: any) => {
+    let num = 0.2
+    let numList = dataProcessing(arr)
+    let maxValue = 0
+    let minValue = 0
+    let max = 0
+    let min = 0
+    maxValue = Math.max(...numList)
+    minValue = Math.min(...numList)
+    const o = maxValue - minValue == 0 ? maxValue : maxValue - minValue
+    min = calculateValue(o, minValue, num, true)
+
+    max = calculateValue(o, maxValue, num, false)
+    // if (-100 >= minValue) {
+    //     min = Math.floor((minValue + num * minValue) / 100) * 100
+    // } else if (-10 >= minValue && minValue > -100) {
+    //     min = Math.floor((minValue + num * minValue) / 10) * 10
+    // } else if (-1 >= minValue && minValue > -10) {
+    //     min = Math.floor(minValue + num * minValue)
+    // } else if (0 > minValue && minValue > -1) {
+    //     min = parseFloat((minValue + num * minValue).toFixed(1))
+    // } else if (minValue == 0) {
+    //     min = 0
+    // } else if (0 < minValue && minValue < 1) {
+    //     min = parseFloat((minValue - num * minValue).toFixed(1))
+    // } else if (1 <= minValue && minValue < 10) {
+    //     min = Math.floor(minValue - num * minValue)
+    // } else if (10 <= minValue && minValue < 100) {
+    //     min = Math.floor((minValue - num * minValue) / 10) * 10
+    // } else if (100 <= minValue) {
+    //     min = Math.floor((minValue - num * minValue) / 100) * 100
+    // }
+
+    // if (-100 >= maxValue) {
+    //     max = Math.ceil((maxValue - num * maxValue) / 100) * 100
+    // } else if (-10 >= maxValue && maxValue > -100) {
+    //     max = Math.ceil((maxValue - num * maxValue) / 10) * 10
+    // } else if (-1 >= maxValue && maxValue > -10) {
+    //     max = Math.ceil(maxValue - num * maxValue)
+    // } else if (0 > maxValue && maxValue > -1) {
+    //     max = parseFloat((maxValue - num * maxValue).toFixed(1))
+    // } else if (maxValue == 0) {
+    //     max = 0
+    // } else if (0 < maxValue && maxValue < 1) {
+    //     max = parseFloat((maxValue + num * maxValue).toFixed(1))
+    // } else if (1 <= maxValue && maxValue < 10) {
+    //     max = Math.ceil(maxValue + num * maxValue)
+    // } else if (10 <= maxValue && maxValue < 100) {
+    //     max = Math.ceil((maxValue + num * maxValue) / 10) * 10
+    // } else if (100 <= maxValue) {
+    //     max = Math.ceil((maxValue + num * maxValue) / 100) * 100
+    // }
+
+    // if (maxValue > 1000 || minValue < -1000) {
+    //     max = Math.ceil(maxValue / 100) * 100
+    //     if (minValue == 0) {
+    //         min = 0
+    //     } else {
+    //         min = Math.floor(minValue / 100) * 100
+    //     }
+    // } else if (maxValue < 60 && minValue > 40) {
+    //     max = 60
+    //     min = 40
+    // } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
+    //     max = Math.ceil(maxValue / 10) * 10
+    //     min = Math.floor(minValue / 10) * 10
+    // } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
+    //     max = Math.ceil(maxValue / 10 + 1) * 10
+    //     min = Math.floor(minValue / 10 - 1) * 10
+    // } else {
+    //     max = Math.ceil(maxValue / 10) * 10
+    //     min = Math.floor(minValue / 10) * 10
+    // }
+
+    // if (maxValue > 0 && maxValue < 1) {
+    //     max = 1
+    // } else if (max == 0 && minValue > -1 && minValue < 0) {
+    //     min = -1
+    // }
+
+    return [min, max]
+}
+
+/**
+ * title['A相','B相',]
+ * data[[1,2],[3,4]]
+ */
+// 导出csv文件
+const convertToCSV = (title: object, data: any) => {
+    let csv = ''
+    // 添加列头
+    csv += ',' + title.join(',') + '\n'
+    // 遍历数据并添加到CSV字符串中
+    data?.map(item => {
+        csv += '\u200B' + item.join(',') + '\n'
+    })
+    return csv
+}
+export const exportCSV = (title: object, data: any, filename: string) => {
+    const csv = convertToCSV(title, data)
+    const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
+    const link = document.createElement('a')
+    link.href = URL.createObjectURL(blob)
+    link.download = filename
+    link.click()
+    // 释放URL对象
+    URL.revokeObjectURL(link.href)
+}
+
+/**
+ * 补全时间序列数据中缺失的条目
+ * @param rawData 原始数据，格式为 [["时间字符串", "数值", "单位", "类型"], ...]
+ * @returns 补全后的数据，缺失条目数值为 null
+ */
+export const completeTimeSeries = (rawData: string[][]): (string | null)[][] => {
+    // 步骤1：校验原始数据并解析时间
+    if (rawData.length < 2) {
+        console.warn('数据量不足2条，无法计算时间间隔，直接返回原始数据')
+        return rawData.map(item => [...item])
+    }
+
+    // 解析所有时间为Date对象，过滤无效时间并按时间排序
+    const validData = rawData
+        .map(item => {
+            // 确保至少有时间和数值字段
+            if (!item[0]) {
+                return { time: new Date(0), item, isValid: false }
+            }
+            const time = new Date(item[0])
+            return { time, item, isValid: !isNaN(time.getTime()) }
+        })
+        .filter(data => data.isValid)
+        .sort((a, b) => a.time.getTime() - b.time.getTime()) // 确保数据按时间排序
+        .map(data => data.item)
+
+    if (validData.length < 2) {
+        throw new Error('有效时间数据不足2条，无法继续处理')
+    }
+
+    // 步骤2：计算时间间隔（分析前几条数据确定最可能的间隔）
+    const intervals: number[] = []
+    // 分析前10条数据来确定间隔，避免单一间隔出错
+    const analyzeCount = Math.min(10, validData.length - 1)
+    for (let i = 0; i < analyzeCount; i++) {
+        const currentTime = new Date(validData[i][0]!).getTime()
+        const nextTime = new Date(validData[i + 1][0]!).getTime()
+        const interval = nextTime - currentTime
+        if (interval > 0) {
+            intervals.push(interval)
+        }
+    }
+
+    // 取最常见的间隔作为标准间隔
+    const timeInterval = getMostFrequentValue(intervals)
+    if (timeInterval <= 0) {
+        throw new Error('无法确定有效的时间间隔')
+    }
+
+    // 步骤3：生成完整的时间序列范围（从第一条到最后一条）
+    const startTime = new Date(validData[0][0]!).getTime()
+    const endTime = new Date(validData[validData.length - 1][0]!).getTime()
+    const completeTimes: Date[] = []
+
+    // 生成从 startTime 到 endTime 的所有间隔时间点
+    for (let time = startTime; time <= endTime; time += timeInterval) {
+        completeTimes.push(new Date(time))
+    }
+
+    // 步骤4：将原始数据转为时间映射表，使用精确的时间字符串匹配
+    const timeDataMap = new Map<string, (string | undefined)[]>()
+    validData.forEach(item => {
+        // 使用原始时间字符串作为键，避免格式转换导致的匹配问题
+        if (item[0]) {
+            timeDataMap.set(item[0], item)
+        }
+    })
+
+    // 提取模板数据（从第一条有效数据中提取单位和类型，处理可能的缺失）
+    const template = validData[0]
+
+    // 步骤5：对比补全数据，缺失条目数值为 null
+    const completedData = completeTimes.map(time => {
+        // 保持与原始数据相同的时间格式
+        const timeStr = formatTime(time)
+        const existingItem = timeDataMap.get(timeStr)
+
+        if (existingItem) {
+            // 存在该时间，返回原始数据
+            return [...existingItem]
+        } else {
+            // 缺失该时间，数值设为 null，其他字段沿用第一个有效数据的格式
+            // 处理可能缺失的单位和类型字段
+            const result: (string | null | undefined)[] = [timeStr, '/']
+            // 仅在原始数据有单位字段时才添加
+            if (template.length > 2) {
+                result.push(template[2])
+            }
+            // 仅在原始数据有类型字段时才添加
+            if (template.length > 3) {
+                result.push(template[3])
+            }
+            return result
+        }
+    })
+
+    return completedData
+}
+
+/**
+ * 格式化时间为 "YYYY-MM-DD HH:mm:ss" 格式
+ * @param date 日期对象
+ * @returns 格式化后的时间字符串
+ */
+function formatTime(date: Date): string {
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    const minutes = String(date.getMinutes()).padStart(2, '0')
+    const seconds = String(date.getSeconds()).padStart(2, '0')
+
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+}
+
+/**
+ * 获取数组中出现频率最高的值
+ * @param arr 数字数组
+ * @returns 出现频率最高的值
+ */
+function getMostFrequentValue(arr: number[]): number {
+    if (arr.length === 0) return 0
+
+    const frequencyMap = new Map<number, number>()
+    arr.forEach(num => {
+        frequencyMap.set(num, (frequencyMap.get(num) || 0) + 1)
+    })
+
+    let maxFrequency = 0
+    let mostFrequent = arr[0]
+
+    frequencyMap.forEach((frequency, num) => {
+        if (frequency > maxFrequency) {
+            maxFrequency = frequency
+            mostFrequent = num
+        }
+    })
+
+    return mostFrequent
+}

src/utils/formatTime.ts

@@ -352,7 +352,9 @@ export function getTimeOfTheMonth(key: any): [string, string] {
             const dayOfWeek = now.getDay() // 0是周日
             const diff = now.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1) // 调整为周一
             const weekStart = new Date(year, month, diff)
-            return [formatDate(weekStart, 'YYYY-MM-DD'), formatDate(now, 'YYYY-MM-DD')]
+            const weekEnd = new Date(weekStart)
+            weekEnd.setDate(weekEnd.getDate() + 6)
+            return [formatDate(weekStart, 'YYYY-MM-DD'), formatDate(weekEnd, 'YYYY-MM-DD')]
 
         case '5': // 日
             return [formatDate(now, 'YYYY-MM-DD'), formatDate(now, 'YYYY-MM-DD')]
@@ -361,3 +363,23 @@ export function getTimeOfTheMonth(key: any): [string, string] {
             throw new Error('Invalid key')
     }
 }
+
+/**
+ * 获取当月时间
+ * @param interval 组件外部时间 1 年 2 季 3 月 4 周 5 日
+ * @param timeList 驾驶舱里面组件勾选时间 []
+ * @param externalTime //外部传入时间
+ * @param fullscreen // 全屏是否全屏
+ */
+export function getTime(interval: number | 3, timeList: any, externalTime: any) {
+    // console.log('🚀 ~ getTime ~ timeList:', timeList)
+    // 1、先匹配时间
+    // 检查 interval 是否在 timeList 中
+    if (timeList && timeList.includes(interval.toString())) {
+        return [externalTime[0], externalTime[1], interval]
+    } else {
+        if (timeList && timeList.length > 0) {
+            return [...getTimeOfTheMonth(timeList[0]), timeList[0]]
+        }
+    }
+}

src/utils/pageBubble.ts

@@ -1,104 +1,114 @@
-// 页面气泡效果
-
-const bubble: {
-    width: number
-    height: number
-    bubbleEl: any
-    canvas: any
-    ctx: any
-    circles: any[]
-    animate: boolean
-    requestId: any
-} = {
-    width: 0,
-    height: 0,
-    bubbleEl: null,
-    canvas: null,
-    ctx: {},
-    circles: [],
-    animate: true,
-    requestId: null,
-}
-
-export const init = function (): void {
-    bubble.width = window.innerWidth
-    bubble.height = window.innerHeight
-
-    bubble.bubbleEl = document.getElementById('bubble')
-    bubble.bubbleEl.style.height = bubble.height + 'px'
-
-    bubble.canvas = document.getElementById('bubble-canvas')
-    bubble.canvas.width = bubble.width
-    bubble.canvas.height = bubble.height
-    bubble.ctx = bubble.canvas.getContext('2d')
-
-    // create particles
-    bubble.circles = []
-    for (let x = 0; x < bubble.width * 0.5; x++) {
-        const c = new Circle()
-        bubble.circles.push(c)
-    }
-    animate()
-    addListeners()
-}
-
-function scrollCheck() {
-    bubble.animate = document.body.scrollTop > bubble.height ? false : true
-}
-
-function resize() {
-    bubble.width = window.innerWidth
-    bubble.height = window.innerHeight
-    bubble.bubbleEl.style.height = bubble.height + 'px'
-    bubble.canvas.width = bubble.width
-    bubble.canvas.height = bubble.height
-}
-
-function animate() {
-    if (bubble.animate) {
-        bubble.ctx.clearRect(0, 0, bubble.width, bubble.height)
-        for (const i in bubble.circles) {
-            bubble.circles[i].draw()
-        }
-    }
-    bubble.requestId = requestAnimationFrame(animate)
-}
-
-class Circle {
-    pos: {
-        x: number
-        y: number
-    }
-    alpha: number
-    scale: number
-    velocity: number
-    draw: () => void
-    constructor() {
-        this.pos = {
-            x: Math.random() * bubble.width,
-            y: bubble.height + Math.random() * 100,
-        }
-        this.alpha = 0.1 + Math.random() * 0.3
-        this.scale = 0.1 + Math.random() * 0.3
-        this.velocity = Math.random()
-        this.draw = function () {
-            this.pos.y -= this.velocity
-            this.alpha -= 0.0005
-            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 + ')'
-            bubble.ctx.fill()
-        }
-    }
-}
-
-function addListeners() {
-    window.addEventListener('scroll', scrollCheck)
-    window.addEventListener('resize', resize)
-}
-
-export function removeListeners() {
-    window.removeEventListener('scroll', scrollCheck)
-    window.removeEventListener('resize', resize)
-    cancelAnimationFrame(bubble.requestId)
-}
+// 页面气泡效果
+
+const bubble: {
+    width: number
+    height: number
+    bubbleEl: any
+    canvas: any
+    ctx: any
+    circles: any[]
+    animate: boolean
+    requestId: any
+} = {
+    width: 0,
+    height: 0,
+    bubbleEl: null,
+    canvas: null,
+    ctx: {},
+    circles: [],
+    animate: true,
+    requestId: null
+}
+
+export const init = function (): void {
+    bubble.width = window.innerWidth
+    bubble.height = window.innerHeight
+
+    bubble.bubbleEl = document.getElementById('bubble')
+    bubble.bubbleEl.style.height = bubble.height + 'px'
+
+    bubble.canvas = document.getElementById('bubble-canvas')
+    bubble.canvas.width = bubble.width
+    bubble.canvas.height = bubble.height
+    bubble.ctx = bubble.canvas.getContext('2d')
+
+    // create particles
+    bubble.circles = []
+    for (let x = 0; x < bubble.width * 0.5; x++) {
+        const c = new Circle()
+        bubble.circles.push(c)
+    }
+    animate()
+    addListeners()
+}
+
+function scrollCheck() {
+    bubble.animate = document.body.scrollTop > bubble.height ? false : true
+}
+
+function resize() {
+    bubble.width = window.innerWidth
+    bubble.height = window.innerHeight
+    bubble.bubbleEl.style.height = bubble.height + 'px'
+    bubble.canvas.width = bubble.width
+    bubble.canvas.height = bubble.height
+}
+
+function animate() {
+    if (bubble.animate) {
+        bubble.ctx.clearRect(0, 0, bubble.width, bubble.height)
+        for (const i in bubble.circles) {
+            bubble.circles[i].draw()
+        }
+    }
+    bubble.requestId = requestAnimationFrame(animate)
+}
+
+class Circle {
+    pos: {
+        x: number
+        y: number
+    }
+    alpha: number
+    scale: number
+    velocity: number
+    draw: () => void
+    constructor() {
+        this.pos = {
+            x: Math.random() * bubble.width,
+            y: bubble.height + Math.random() * 100
+        }
+        this.alpha = 0.1 + Math.random() * 0.3
+        this.scale = 0.1 + Math.random() * 0.3
+        this.velocity = Math.random()
+        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 + ')'
+            bubble.ctx.fill()
+        }
+    }
+}
+
+function addListeners() {
+    window.addEventListener('scroll', scrollCheck)
+    window.addEventListener('resize', resize)
+}
+
+export function removeListeners() {
+    window.removeEventListener('scroll', scrollCheck)
+    window.removeEventListener('resize', resize)
+    cancelAnimationFrame(bubble.requestId)
+}

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

@@ -1,5 +1,5 @@
 import router from '@/router/index'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
+import { isNavigationFailure, NavigationFailureType ,useRouter} from 'vue-router'
 import type { RouteRecordRaw, RouteLocationRaw } from 'vue-router'
 import { ElNotification } from 'element-plus'
 import { useConfig } from '@/stores/config'
@@ -8,8 +8,9 @@ import { closeShade } from '@/utils/pageShade'
 import { adminBaseRoute } from '@/router/static'
 import { compact, isEmpty, reverse } from 'lodash-es'
 import { isAdminApp } from '@/utils/common'
-import { log } from 'console'
-
+import { getRouteMenu, dictDataCache } from '@/api/auth'
+import { adminBaseRoutePath } from '@/router/static'
+const route:any = useRouter()
 /**
  * 导航失败有错误消息的路由push
  * @param to — 导航位置，同 router.push
@@ -17,7 +18,7 @@ import { log } from 'console'
 export const routePush = async (to: RouteLocationRaw) => {
     try {
         const failure = await router.push(to)
-   
+
         if (isNavigationFailure(failure, NavigationFailureType.aborted)) {
             ElNotification({
                 message: 'utils.Navigation failed, navigation guard intercepted!',
@@ -279,6 +280,41 @@ export const addRouteItem = (
     }
 }
 
+// 刷新菜单
+export const getMenu = () => {
+    getRouteMenu().then((res: any) => {
+        const handlerMenu = (data: any) => {
+            data.forEach((item: any) => {
+                item.routePath =
+                    item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
+                item.path = item.routePath
+                item.name = item.routePath
+                item.keepalive = item.routePath
+                item.component = item.routeName
+                    ? item.routeName.indexOf('/src/views/') > -1
+                        ? item.routeName
+                        : `/src/views/${item.routeName}/index.vue`
+                    : ''
+                item.type = item.children && item.children.length > 0 ? 'menu_dir' : 'menu'
+                item.menu_type = item.children && item.children.length > 0 ? null : 'tab'
+                if (item.children) {
+                    handlerMenu(item.children)
+                }
+            })
+        }
+        handlerMenu(res.data)
+        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 })
+                return
+            }
+        }
+    })
+}
+
 /**
  * 根据name字符串，获取父级name组合的数组
  * @param name

src/utils/tableStore.ts

@@ -18,6 +18,7 @@ interface TableStoreParams {
     publicHeight?: number //计算高度
     resetCallback?: () => void // 重置
     loadCallback?: () => void // 接口调用后的回调
+    exportProcessingData?: () => void //导出处理数据
     beforeSearchFun?: () => void // 接口调用前的回调
 }
 
@@ -47,9 +48,11 @@ export default class TableStore {
         column: [],
         loadCallback: null,
         resetCallback: null,
+        exportProcessingData: null,
         beforeSearchFun: null,
         height: '',
-        publicHeight: 0
+        publicHeight: 0,
+        filename: ''
     })
 
     constructor(public options: TableStoreParams) {
@@ -64,6 +67,7 @@ export default class TableStore {
         this.table.publicHeight = options.publicHeight || 0
         this.table.resetCallback = options.resetCallback || null
         this.table.loadCallback = options.loadCallback || null
+        this.table.exportProcessingData = options.exportProcessingData || null
         this.table.beforeSearchFun = options.beforeSearchFun || null
         Object.assign(this.table.params, options.params)
         this.table.height = mainHeight(20 + (this.showPage ? 58 : 0) + this.table.publicHeight).height as string
@@ -94,14 +98,19 @@ export default class TableStore {
                     this.table.data = []
                     this.table.total = 0
                 }
-                this.table.copyData = filtration(this.table.data)
+                // 只有当 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]
                 }
+
                 this.table.loadCallback && this.table.loadCallback()
                 this.table.loading = false
             })
@@ -187,26 +196,21 @@ export default class TableStore {
             [
                 'export',
                 () => {
-                    ElMessage({
-                        message: '正在导出,请稍等...',
-                        type: 'info',
-                        duration: 1000
-                    })
+                    // this.index()
                     let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
-                    setTimeout(() => {
-                        createAxios(
-                            Object.assign(
-                                {
-                                    url: this.url,
-                                    method: this.method
-                                },
-                                requestPayload(this.method, params, this.paramsPOST)
-                            )
-                        ).then(res => {
-                            this.table.allData = filtration(res.data.records || res.data)
-                            this.table.allFlag = data.showAllFlag || true
-                        })
-                    }, 1500)
+                    createAxios(
+                        Object.assign(
+                            {
+                                url: this.url,
+                                method: this.method
+                            },
+                            requestPayload(this.method, params, this.paramsPOST)
+                        )
+                    ).then(res => {
+                        this.table.allData = filtration(res.data.records || res.data)
+                        this.table.exportProcessingData && this.table.exportProcessingData()
+                        this.table.allFlag = data.showAllFlag || true
+                    })
                 }
             ]
         ])

src/utils/webSocketClient.ts

@@ -0,0 +1,214 @@
+import { ElMessage, EVENT_CODE } from "element-plus";
+
+// 定义消息类型，用于类型检查
+type MessageType = {
+  [key: string]: any;
+};
+
+export default class SocketService {
+  // 单例模式实例
+  private static instance: SocketService | null = null;
+  // 和服务端连接的socket对象
+  private ws: WebSocket | null = null;
+  // 存储回调函数
+  private callBackMapping: {
+    [key: string]: ((message: MessageType) => void) | null;
+  } = {};
+  // 标识是否连接成功
+  private connected: boolean = false;
+  // 记录重试的次数
+  private sendRetryCount: number = 0;
+  // 重新连接尝试的次数
+  private connectRetryCount: number = 0;
+  // Web Worker 实例
+  private work: Worker | null = null;
+  // 临时的 Blob URL
+  private workerBlobUrl: string | null = null;
+  // 上次活动时间戳
+  private lastActivityTime: number = 0;
+  // 最后一次收到心跳回复时间
+  private lastResponseHeartTime: number = Date.now();
+  // 重新连接延迟，单位毫秒
+  private reconnectDelay: number = 5000;
+
+  // 单例模式获取实例
+  public static get Instance(): SocketService {
+    if (!this.instance) {
+      this.instance = new SocketService();
+    }
+    return this.instance;
+  }
+
+  // 定义连接服务器的方法
+  public async connect(id: any) {
+    if (!window.WebSocket) {
+      console.log("您的浏览器不支持WebSocket");
+      return;
+    }
+    let response = null;
+    if (import.meta.env.VITE_NAME == "beijing") {
+      response = await fetch("/vue/");
+    } else if (import.meta.env.VITE_NAME == "wuxi") {
+      response = await fetch("");
+    }
+    // const response = await fetch("/vue/");
+
+    const mqttUrl = response.headers.get("X-Mqtt-Url");
+    console.log("🚀 ~ SocketService ~ connect ~ mqttUrl:", mqttUrl);
+    setTimeout(() => {
+      //"ws://10.156.193.182:18093/ws/screen"  北京
+      //"ws://192.168.1.130:19001/ws/askRealTimeData/"  无锡
+      const url = (mqttUrl || "ws://192.168.1.127:19001/ws/") + id;
+      // const url = (mqttUrl || "ws://192.168.1.63:18093/ws/screen") + id;
+      console.log("🚀 ~ SocketService ~ connect ~ url:", url);
+      this.ws = new WebSocket(url);
+
+      this.ws.onopen = () => this.handleOpen();
+      this.ws.onclose = () => this.handleClose();
+      this.ws.onerror = () => this.handleError();
+      this.ws.onmessage = (event) => this.handleMessage(event);
+    }, 0);
+  }
+
+  // 处理连接成功事件
+  private handleOpen(): void {
+    ElMessage.success("webSocket连接服务端成功了");
+    console.log("连接服务端成功了");
+    this.connected = true;
+    this.connectRetryCount = 0;
+    this.updateLastActivityTime();
+    this.startHeartbeat();
+  }
+
+  // 处理连接关闭事件
+  private handleClose(): void {
+    console.log("连接webSocket服务端关闭");
+    this.connected = false;
+    this.connectRetryCount++;
+    this.clearHeartbeat();
+    // 可根据需要添加重连逻辑
+    // setTimeout(() => this.connect(), 500 * this.connectRetryCount);
+  }
+
+  // 处理连接错误事件
+  private handleError(): void {
+    ElMessage.error("webSocket连接异常！");
+  }
+
+  // 处理服务端发送过来的数据
+  private handleMessage(event: MessageEvent): void {
+    // console.log('🚀 ~ SocketService ~ handleMessage ~ event.data:', event.data)
+
+    if (event.data == "连接成功") {
+      this.sendHeartbeat();
+    } else if (event.data.length > 10) {
+      let message: MessageType;
+      try {
+        // console.log(
+        // 'Received message:', event.data)
+        message = JSON.parse(event.data);
+        this.callBackMapping["message"]!(message);
+      } catch (e) {
+        // console.error("消息解析失败", event.data, e);
+        return;
+      }
+      // console.log("🚀 ~ SocketService ~ handleMessage ~ message:", message)
+
+      //   this.callBackMapping["message"]!(message);
+    } else {
+      // ElMessage.error(event.data);
+    }
+  }
+
+  // 启动心跳检测
+  private startHeartbeat(): void {
+    this.lastResponseHeartTime = Date.now();
+    const url = window.URL.createObjectURL(
+      new Blob([
+        "(function(e){setInterval(function(){this.postMessage(null)},30000)})()",
+      ])
+    );
+    this.workerBlobUrl = url;
+    this.work = new Worker(url);
+    this.work.onmessage = (e) => this.handleWorkerMessage(e);
+  }
+
+  // 处理 Web Worker 消息
+  private handleWorkerMessage(e: MessageEvent): void {
+    // if (this.lastActivityTime - this.lastResponseHeartTime > 30000) {
+    //     // 说明已经三轮心跳没收到回复了，关闭检测，提示用户。
+    //     // ElMessage.error('业务主体模块发生未知异常，请尝试重新启动！')
+    //     this.clearHeartbeat()
+    //     return
+    // }
+    // console.log(123);
+
+    this.sendHeartbeat();
+  }
+
+  // 发送心跳消息
+  private sendHeartbeat(): void {
+    // console.log(new Date() + '进入心跳消息发送。。。。。。。。。。。。。')
+    if (this.ws) {
+      this.ws.send("alive");
+      this.updateLastActivityTime();
+    }
+  }
+
+  // 更新活动时间
+  private updateLastActivityTime(): void {
+    this.lastActivityTime = Date.now();
+  }
+
+  // 清除心跳检测
+  private clearHeartbeat(): void {
+    if (this.work) {
+      this.work.terminate();
+      this.work = null;
+    }
+    if (this.workerBlobUrl) {
+      window.URL.revokeObjectURL(this.workerBlobUrl);
+      this.workerBlobUrl = null;
+    }
+  }
+
+  // 回调函数的注册
+  public registerCallBack(
+    socketType: string,
+    callBack: (message: MessageType) => void
+  ): void {
+    this.callBackMapping[socketType] = callBack;
+  }
+
+  // 取消某一个回调函数
+  public unRegisterCallBack(socketType: string): void {
+    this.callBackMapping[socketType] = null;
+  }
+
+  // 发送数据的方法
+  public send(data: any): void {
+    if (this.connected) {
+      this.sendRetryCount = 0;
+      try {
+        if (this.ws) {
+          this.ws.send(JSON.stringify(data));
+        }
+      } catch (e) {
+        if (this.ws) {
+          this.ws.send(data);
+        }
+      }
+    } else {
+      this.sendRetryCount++;
+      setTimeout(() => this.send(data), this.sendRetryCount * 500);
+    }
+  }
+
+  // 断开方法
+  public closeWs(): void {
+    if (this.connected && this.ws) {
+      this.ws.close();
+    }
+    console.log("执行WS关闭命令..");
+  }
+}

src/views/auth/menu/popupMenu.vue

@@ -1,107 +1,108 @@
-<template>
-    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="上级菜单">
-                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps"
-                        style="width: 100%" />
-                </el-form-item>
-                <el-form-item label="菜单名称">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="图标">
-                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
-                </el-form-item>
-                <el-form-item label="菜单路由">
-                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="组件路径">
-                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
-                </el-form-item>
-                <el-form-item label="排序">
-                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
-                </el-form-item>
-                <el-form-item label="菜单描述">
-                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
-                        placeholder="请输入描述" />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <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 TableStore from '@/utils/tableStore'
-import IconSelector from '@/components/baInput/components/iconSelector.vue'
-import { updateMenu, addMenu } from '@/api/systerm'
-
-defineOptions({
-    name: 'auth/menu/popupMenu'
-})
-const emits = defineEmits<{
-    (e: 'init'): void
-}>()
-const tableStore = inject('tableStore') as TableStore
-const cascaderProps = {
-    label: 'title',
-    value: 'id',
-    checkStrictly: true,
-    emitPath: false
-}
-const form: any = reactive({
-    code: '',
-    icon: '',
-    id: '',
-    name: '',
-    path: '',
-    pid: '0',
-    remark: '',
-    routeName: '',
-    sort: 100,
-    type: 0
-})
-
-const dialogVisible = ref(false)
-const title = ref('新增菜单')
-const open = (text: string, data: anyObj) => {
-    title.value = text
-    // 重置表单
-    for (let key in form) {
-        form[key] = ''
-    }
-    form.pid = data.pid || '0'
-    form.sort = 100
-    form.type = 0
-
-    if (data.id) {
-        for (let key in form) {
-            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
-        }
-        form.path = data.routePath || ''
-        form.name = data.title || ''
-    }
-    dialogVisible.value = true
-}
-const submit = async () => {
-    if (form.id) {
-        await updateMenu(form)
-    } else {
-        form.code = 'menu'
-        let obj = JSON.parse(JSON.stringify(form))
-        delete obj.id
-        await addMenu(obj)
-    }
-    emits('init')
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
+                <el-form-item label="上级菜单">
+                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps" clearable
+                        style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="菜单名称">
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="图标">
+                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
+                </el-form-item>
+                <el-form-item label="菜单路由">
+                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="组件路径">
+                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
+                </el-form-item>
+                <el-form-item label="排序">
+                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
+                </el-form-item>
+                <el-form-item label="菜单描述">
+                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
+                        placeholder="请输入描述" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <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 TableStore from '@/utils/tableStore'
+import IconSelector from '@/components/baInput/components/iconSelector.vue'
+import { updateMenu, addMenu } from '@/api/systerm'
+
+defineOptions({
+    name: 'auth/menu/popupMenu'
+})
+const emits = defineEmits<{
+    (e: 'init'): void
+}>()
+const tableStore = inject('tableStore') as TableStore
+const cascaderProps = {
+    label: 'title',
+    value: 'id',
+    checkStrictly: true,
+    emitPath: false
+}
+const form: any = reactive({
+    code: '',
+    icon: '',
+    id: '',
+    name: '',
+    path: '',
+    pid: '0',
+    remark: '',
+    routeName: '',
+    sort: 100,
+    type: 0
+})
+
+const dialogVisible = ref(false)
+const title = ref('新增菜单')
+const open = (text: string, data: anyObj) => {
+    title.value = text
+    // 重置表单
+    for (let key in form) {
+        form[key] = ''
+    }
+    form.pid = data.pid || '0'
+    form.sort = 100
+    form.type = 0
+
+    if (data.id) {
+        for (let key in form) {
+            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
+        }
+        form.path = data.routePath || ''
+        form.name = data.title || ''
+    }
+    dialogVisible.value = true
+}
+const submit = async () => {
+    if (form.id) {
+        form.pid =  form.pid||'0'
+        await updateMenu(form)
+    } else {
+        form.code = 'menu'
+        let obj = JSON.parse(JSON.stringify(form))
+        delete obj.id
+        await addMenu(obj)
+    }
+    emits('init')
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>

src/views/auth/role/index.vue

@@ -1,162 +1,164 @@
-<template>
-    <div class="default-main" style="display: flex" :style="{ height: height }">
-        <div style="flex: 1; overflow: hidden">
-            <div class="custom-table-header">
-                <div class="title">角色列表</div>
-                <el-button :icon="Plus" type="primary" @click="addRole" class="ml10">新增</el-button>
-            </div>
-            <Table ref="tableRef" @currentChange="currentChange" />
-        </div>
-        <Tree
-            v-if="menuListId"
-            ref="treeRef"
-            show-checkbox
-            width="350px"
-            :data="menuTree"
-            :checkStrictly="checkStrictly"
-            @check-change="checkChange"
-        ></Tree>
-        <el-empty style="width: 350px; padding-top: 300px; box-sizing: border-box" description="请选择角色" v-else />
-        <PopupForm ref="popupRef"></PopupForm>
-    </div>
-</template>
-<script setup lang="ts">
-import { Plus } from '@element-plus/icons-vue'
-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 Tree from '@/components/tree/index.vue'
-import { functionTree } from '@/api/user-boot/function'
-import { getFunctionsByRoleIndex, updateRoleMenu } from '@/api/user-boot/roleFuction'
-import { mainHeight } from '@/utils/layout'
-import { del } from '@/api/user-boot/role'
-import { ElMessage } from 'element-plus'
-import PopupForm from './popupForm.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-
-const adminInfo = useAdminInfo()
-defineOptions({
-    name: 'auth/role'
-})
-const height = mainHeight(20).height
-const treeRef = ref()
-const menuTree = ref<treeData[]>([])
-const popupRef = ref()
-const checkStrictly = ref(true)
-const menuListId = ref('')
-const tableStore = new TableStore({
-    showPage: false,
-    url: '/user-boot/role/selectRoleDetail?id=' + adminInfo.$state.userType,
-    method: 'POST',
-    column: [
-        { title: '角色名称', field: 'name', align: 'center' },
-        { title: '角色编码', field: 'code', align: 'center' },
-        { title: '备注', field: 'remark', align: 'center' },
-        {
-            title: '状态',
-            field: 'state',
-            width: '80',
-            render: 'tag',
-            custom: {
-                0: 'danger',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '注销',
-                1: '正常'
-            }
-        },
-        {
-            title: '操作',
-            align: 'center',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        popupRef.value.open('编辑角色', row)
-                    }
-                },
-                {
-                    name: 'del',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除该角色吗？'
-                    },
-                    click: row => {
-                        del([row.id]).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ]
-})
-tableStore.table.params.searchValue = ''
-
-provide('tableStore', tableStore)
-const filterData = (arr: any[]) => {
-    // return arr.filter((item: any) => {
-    //     item.name = item.title
-    //     if (item.children.length) {
-    //         item.children = filterData(item.children)
-    //     }
-    //     return item.type === 0
-    // })
-    arr.forEach((item: any) => {
-        item.name = item.title
-        if (item.children.length) {
-            filterData(item.children)
-        }
-    })
-}
-functionTree().then((res: any) => {
-    filterData(res.data)
-    menuTree.value = res.data
-})
-
-const currentChange = (data: any) => {
-    checkStrictly.value = true
-    menuListId.value = data.row.id
-    getFunctionsByRoleIndex({ id: data.row.id }).then((res: any) => {
-        treeRef.value.treeRef.setCheckedKeys(res.data.map((item: any) => item.id))
-    })
-}
-
-const timeout = ref<NodeJS.Timeout>()
-const checkChange = (data: any) => {
-    if (checkStrictly.value) {
-        checkStrictly.value = false
-        return
-    }
-    if (timeout.value) {
-        clearTimeout(timeout.value)
-    }
-    timeout.value = setTimeout(() => {
-        updateRoleMenu({
-            id: menuListId.value,
-            idList: treeRef.value.treeRef.getCheckedNodes(false, true).map((node: any) => node.id)
-        })
-    }, 1000)
-}
-onMounted(() => {
-    tableStore.index()
-})
-const addRole = () => {
-    popupRef.value.open('新增角色')
-}
-</script>
+<template>
+    <div class="default-main" style="display: flex" :style="{ height: height }">
+        <div style="flex: 1; overflow: hidden">
+            <div class="custom-table-header">
+                <div class="title">角色列表</div>
+                <el-button :icon="Plus" type="primary" @click="addRole" class="ml10">新增</el-button>
+            </div>
+            <Table ref="tableRef" @currentChange="currentChange" />
+        </div>
+        <Tree
+            v-if="menuListId"
+            ref="treeRef"
+            show-checkbox
+            width="350px"
+            :data="menuTree"
+            :checkStrictly="checkStrictly"
+            @check-change="checkChange"
+        ></Tree>
+        <el-empty style="width: 350px; padding-top: 300px; box-sizing: border-box" description="请选择角色" v-else />
+        <PopupForm ref="popupRef"></PopupForm>
+    </div>
+</template>
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+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 Tree from '@/components/tree/index.vue'
+import { functionTree } from '@/api/user-boot/function'
+import { getFunctionsByRoleIndex, updateRoleMenu } from '@/api/user-boot/roleFuction'
+import { mainHeight } from '@/utils/layout'
+import { del } from '@/api/user-boot/role'
+import { ElMessage } from 'element-plus'
+import PopupForm from './popupForm.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'auth/role'
+})
+const height = mainHeight(20).height
+const treeRef = ref()
+const menuTree = ref<treeData[]>([])
+const popupRef = ref()
+const checkStrictly = ref(true)
+const menuListId = ref('')
+const tableStore = new TableStore({
+    showPage: false,
+    url: '/user-boot/role/selectRoleDetail?id=' + adminInfo.$state.userType,
+    method: 'POST',
+    column: [
+        { title: '角色名称', field: 'name', align: 'center' },
+        { title: '角色编码', field: 'code', align: 'center' },
+        { title: '备注', field: 'remark', align: 'center' },
+        {
+            title: '状态',
+            field: 'state',
+            width: '80',
+            render: 'tag',
+            custom: {
+                0: 'danger',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '注销',
+                1: '正常'
+            }
+        },
+        {
+            title: '操作',
+            align: 'center',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        popupRef.value.open('编辑角色', row)
+                    }
+                },
+                {
+                    name: 'del',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该角色吗？'
+                    },
+                    click: row => {
+                        del([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ]
+})
+tableStore.table.params.searchValue = ''
+
+provide('tableStore', tableStore)
+const filterData = (arr: any[]) => {
+    // return arr.filter((item: any) => {
+    //     item.name = item.title
+    //     if (item.children.length) {
+    //         item.children = filterData(item.children)
+    //     }
+    //     return item.type === 0
+    // })
+    arr.forEach((item: any) => {
+        item.name = item.title
+        if (item.children.length) {
+            filterData(item.children)
+        }
+    })
+}
+functionTree().then((res: any) => {
+    filterData(res.data)
+    menuTree.value = res.data
+})
+
+const currentChange = (data: any) => {
+    checkStrictly.value = true
+    menuListId.value = data.row.id
+    getFunctionsByRoleIndex({ id: data.row.id }).then((res: any) => {
+        treeRef.value.treeRef.setCheckedKeys(res.data.map((item: any) => item.id))
+    })
+}
+
+const timeout = ref<NodeJS.Timeout>()
+const checkChange = (data: any) => {
+    if (checkStrictly.value) {
+        checkStrictly.value = false
+        return
+    }
+    if (timeout.value) {
+        clearTimeout(timeout.value)
+    }
+    timeout.value = setTimeout(() => {
+        updateRoleMenu({
+            id: menuListId.value,
+            idList: treeRef.value.treeRef.getCheckedNodes(false, true).map((node: any) => node.id)
+        }).then(() => {
+            ElMessage.success('操作成功!')
+        })
+    }, 1000)
+}
+onMounted(() => {
+    tableStore.index()
+})
+const addRole = () => {
+    popupRef.value.open('新增角色')
+}
+</script>

src/views/auth/userList/index.vue

@@ -1,214 +1,214 @@
-<template>
-    <div class="default-main">
-        <TableHeader>
-            <template v-slot:select>
-                <el-form-item label="用户状态">
-                    <el-select v-model.trim="tableStore.table.params.searchState" placeholder="选择用户状态">
-                        <el-option v-for="(item, index) in userState" :label="item.label" :key="index"
-                            :value="item.value"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="用户类型:">
-                    <el-select v-model.trim="tableStore.table.params.casualUser" placeholder="选择用户类型">
-                        <el-option v-for="(item, index) in casualUser" :label="item.label" :key="index"
-                            :value="item.value"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="关键字筛选:">
-                    <el-input maxlength="32" show-word-limit style="width: 240px"
-                        v-model.trim="tableStore.table.params.searchValue" clearable placeholder="仅根据用户名/登录名" />
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <PopupEdit ref="popupEditRef"></PopupEdit>
-        <PopupPwd ref="popupPwdRef"></PopupPwd>
-    </div>
-</template>
-<script setup lang="ts">
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import { ElMessageBox, ElMessage } from 'element-plus'
-import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import PopupEdit from './popupEdit.vue'
-import PopupPwd from './popupPwd.vue'
-
-defineOptions({
-    name: 'auth/userlist'
-})
-const popupEditRef = ref()
-const popupPwdRef = ref()
-const tableStore = new TableStore({
-    url: '/user-boot/user/list',
-    method: 'POST',
-    column: [
-        { title: '用户名称', field: 'name', minWidth: '130' },
-        { title: '登录名', field: 'loginName', minWidth: '130' },
-        { title: '角色', field: 'roleName', minWidth: '130' },
-        // { title: '部门', field: 'deptName', minWidth: '200' },
-        { title: '电话', field: 'phoneShow', minWidth: '100' },
-        { title: '注册时间', field: 'registerTime', minWidth: '130', sortable: true },
-        { title: '登录时间', field: 'loginTime', minWidth: '130', sortable: true },
-        { title: '类型', field: 'casualUserName', minWidth: '80' },
-        {
-            title: '状态',
-            field: 'state',
-            width: '100',
-            render: 'tag',
-            custom: {
-                0: 'danger',
-                1: 'success',
-                2: 'warning',
-                3: 'warning',
-                4: 'info',
-                5: 'danger'
-            },
-            replaceValue: {
-                0: '注销',
-                1: '正常',
-                2: '锁定',
-                3: '待审核',
-                4: '休眠',
-                5: '密码过期'
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1
-                    },
-                    click: row => {
-                        popupEditRef.value.open('编辑用户', row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '修改密码',
-                    type: 'primary',
-                    icon: 'el-icon-Lock',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1
-                    },
-                    click: row => {
-                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
-                            confirmButtonText: '确认',
-                            cancelButtonText: '取消',
-                            inputType: 'password'
-                        }).then(({ value }) => {
-                            passwordConfirm(value).then(res => {
-                                popupPwdRef.value.open(row.id)
-                            })
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '激活',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
-                    },
-                    click: row => {
-                        activateUser({
-                            id: row.id
-                        }).then(() => {
-                            ElMessage.success('激活成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '注销',
-                    type: 'danger',
-                    icon: 'el-icon-SwitchButton',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1 && row.state !== 3
-                    },
-                    click: row => {
-                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
-                            confirmButtonText: '确认',
-                            cancelButtonText: '取消',
-                            inputType: 'password'
-                        }).then(({ value }) => {
-                            passwordConfirm(value).then(res => {
-                                deluser({
-                                    id: row.id
-                                }).then(() => {
-                                    ElMessage.success('注销成功')
-                                    tableStore.index()
-                                })
-                            })
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.deptName = item.deptName || '/'
-            item.phoneShow = item.phone || '/'
-            item.roleName = item.role.length ? item.role : '/'
-            switch (item.casualUser) {
-                case 0:
-                    item.casualUserName = '临时用户'
-                    break
-                case 1:
-                    item.casualUserName = '长期用户'
-                    break
-                default:
-                    item.casualUserName = '/'
-                    break
-            }
-        })
-    }
-})
-
-provide('tableStore', tableStore)
-tableStore.table.params.searchState = 1
-tableStore.table.params.casualUser = -1
-tableStore.table.params.orderBy = ''
-const userState = [
-    { label: '全部', value: -1 },
-    { label: '注销', value: 0 },
-    { label: '正常', value: 1 },
-    { label: '锁定', value: 2 },
-    { label: '待审核', value: 3 },
-    { label: '休眠', value: 4 },
-    { label: '密码过期', value: 5 }
-]
-const casualUser = [
-    { label: '全部', value: -1 },
-    { label: '临时用户', value: 0 },
-    { label: '长期用户', value: 1 }
-]
-onMounted(() => {
-    tableStore.index()
-})
-
-const addUser = () => {
-    popupEditRef.value.open('新增用户')
-}
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label="用户状态">
+                    <el-select v-model.trim="tableStore.table.params.searchState" placeholder="选择用户状态">
+                        <el-option v-for="(item, index) in userState" :label="item.label" :key="index"
+                            :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="用户类型:">
+                    <el-select v-model.trim="tableStore.table.params.casualUser" placeholder="选择用户类型">
+                        <el-option v-for="(item, index) in casualUser" :label="item.label" :key="index"
+                            :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="关键字筛选:">
+                    <el-input maxlength="32" show-word-limit style="width: 240px"
+                        v-model.trim="tableStore.table.params.searchValue" clearable placeholder="仅根据用户名/登录名" />
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <PopupEdit ref="popupEditRef"></PopupEdit>
+        <PopupPwd ref="popupPwdRef"></PopupPwd>
+    </div>
+</template>
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import { ElMessageBox, ElMessage } from 'element-plus'
+import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import PopupEdit from './popupEdit.vue'
+import PopupPwd from './popupPwd.vue'
+
+defineOptions({
+    name: 'auth/userlist'
+})
+const popupEditRef = ref()
+const popupPwdRef = ref()
+const tableStore = new TableStore({
+    url: '/user-boot/user/list',
+    method: 'POST',
+    column: [
+        { title: '用户名称', field: 'name', minWidth: '130' },
+        { title: '登录名', field: 'loginName', minWidth: '130' },
+        { title: '角色', field: 'roleName', minWidth: '130' },
+        // { title: '部门', field: 'deptName', minWidth: '200' },
+        { title: '电话', field: 'phoneShow', minWidth: '100' },
+        { title: '注册时间', field: 'registerTime', minWidth: '130', sortable: true },
+        { title: '登录时间', field: 'loginTime', minWidth: '130', sortable: true },
+        { title: '类型', field: 'casualUserName', minWidth: '80' },
+        {
+            title: '状态',
+            field: 'state',
+            width: '100',
+            render: 'tag',
+            custom: {
+                0: 'danger',
+                1: 'success',
+                2: 'warning',
+                3: 'warning',
+                4: 'info',
+                5: 'danger'
+            },
+            replaceValue: {
+                0: '注销',
+                1: '正常',
+                2: '锁定',
+                3: '待审核',
+                4: '休眠',
+                5: '密码过期'
+            }
+        },
+        {
+            title: '操作',
+            width: '180',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1
+                    },
+                    click: row => {
+                        popupEditRef.value.open('编辑用户', row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '修改密码',
+                    type: 'primary',
+                    icon: 'el-icon-Lock',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1
+                    },
+                    click: row => {
+                        ElMessageBox.prompt('二次校验密码确认', '修改密码', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            inputType: 'password'
+                        }).then(({ value }) => {
+                            passwordConfirm(value).then(res => {
+                                popupPwdRef.value.open(row.id)
+                            })
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '激活',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
+                    },
+                    click: row => {
+                        activateUser({
+                            id: row.id
+                        }).then(() => {
+                            ElMessage.success('激活成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '注销',
+                    type: 'danger',
+                    icon: 'el-icon-SwitchButton',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1 && row.state !== 3
+                    },
+                    click: row => {
+                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            inputType: 'password'
+                        }).then(({ value }) => {
+                            passwordConfirm(value).then(res => {
+                                deluser({
+                                    id: row.id
+                                }).then(() => {
+                                    ElMessage.success('注销成功')
+                                    tableStore.index()
+                                })
+                            })
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.deptName = item.deptName || '/'
+            item.phoneShow = item.phone || '/'
+            item.roleName = item.role.length ? item.role : '/'
+            switch (item.casualUser) {
+                case 0:
+                    item.casualUserName = '临时用户'
+                    break
+                case 1:
+                    item.casualUserName = '长期用户'
+                    break
+                default:
+                    item.casualUserName = '/'
+                    break
+            }
+        })
+    }
+})
+
+provide('tableStore', tableStore)
+tableStore.table.params.searchState = 1
+tableStore.table.params.casualUser = -1
+tableStore.table.params.orderBy = ''
+const userState = [
+    { label: '全部', value: -1 },
+    { label: '注销', value: 0 },
+    { label: '正常', value: 1 },
+    { label: '锁定', value: 2 },
+    { label: '待审核', value: 3 },
+    { label: '休眠', value: 4 },
+    { label: '密码过期', value: 5 }
+]
+const casualUser = [
+    { label: '全部', value: -1 },
+    { label: '临时用户', value: 0 },
+    { label: '长期用户', value: 1 }
+]
+onMounted(() => {
+    tableStore.index()
+})
+
+const addUser = () => {
+    popupEditRef.value.open('新增用户')
+}
+</script>

src/views/auth/userList/popupPwd.vue

@@ -1,99 +1,99 @@
-<template>
-    <el-dialog width=“500px” 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">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.newPwd" type="password"
-                        placeholder="请输入新密码" show-password />
-                </el-form-item>
-                <el-form-item label="确认密码" prop="confirmPwd">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.confirmPwd" type="password"
-                        placeholder="请输入确认密码" show-password />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <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 TableStore from '@/utils/tableStore'
-import { ElMessage } from 'element-plus'
-import { validatePwd } from '@/utils/common'
-import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
-import { debug } from 'console'
-
-const formRef = ref()
-const tableStore = inject('tableStore') as TableStore
-const form = reactive({
-    id: '',
-    newPwd: '',
-    confirmPwd: '',
-    loginName: ''
-})
-const rules = {
-    newPwd: [
-        { required: true, message: '请输入密码', trigger: 'blur' },
-        {
-            min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
-            trigger: 'blur'
-        },
-        { validator: validatePwd, trigger: 'blur' }
-    ],
-    confirmPwd: [
-        { required: true, message: '请确认密码', trigger: 'blur' },
-        {
-            min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
-            trigger: 'blur'
-        },
-        {
-            validator: (rule: any, value: string, callback: any) => {
-                if (value === '') {
-                    callback(new Error('请再次输入密码'))
-                } else if (value !== form.newPwd) {
-                    callback(new Error('两次输入密码不一致!'))
-                } else {
-                    callback()
-                }
-            },
-            trigger: 'blur',
-            required: true
-        }
-    ]
-}
-const dialogVisible = ref(false)
-const title = ref('新增菜单')
-const open = (id: string, loginName: string) => {
-    form.id = id
-    form.loginName = loginName
-    form.newPwd = ''
-    form.confirmPwd = ''
-    dialogVisible.value = true
-}
-const submit = async () => {
-    formRef.value.validate((valid: boolean) => {
-        if (valid) {
-            updatePassword({
-                id: form.id,
-                newPassword: form.newPwd
-            }).then((res: any) => {
-                ElMessage.success('密码修改成功')
-                dialogVisible.value = false
-            })
-        }
-    })
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <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">
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.newPwd" type="password"
+                        placeholder="请输入新密码" show-password />
+                </el-form-item>
+                <el-form-item label="确认密码" prop="confirmPwd">
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.confirmPwd" type="password"
+                        placeholder="请输入确认密码" show-password />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <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 TableStore from '@/utils/tableStore'
+import { ElMessage } from 'element-plus'
+import { validatePwd } from '@/utils/common'
+import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
+import { debug } from 'console'
+
+const formRef = ref()
+const tableStore = inject('tableStore') as TableStore
+const form = reactive({
+    id: '',
+    newPwd: '',
+    confirmPwd: '',
+    loginName: ''
+})
+const rules = {
+    newPwd: [
+        { required: true, message: '请输入密码', trigger: 'blur' },
+        {
+            min: 6,
+            max: 16,
+            message: '长度在 6 到 16 个字符',
+            trigger: 'blur'
+        },
+        { validator: validatePwd, trigger: 'blur' }
+    ],
+    confirmPwd: [
+        { required: true, message: '请确认密码', trigger: 'blur' },
+        {
+            min: 6,
+            max: 16,
+            message: '长度在 6 到 16 个字符',
+            trigger: 'blur'
+        },
+        {
+            validator: (rule: any, value: string, callback: any) => {
+                if (value === '') {
+                    callback(new Error('请再次输入密码'))
+                } else if (value !== form.newPwd) {
+                    callback(new Error('两次输入密码不一致!'))
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'blur',
+            required: true
+        }
+    ]
+}
+const dialogVisible = ref(false)
+const title = ref('新增菜单')
+const open = (id: string, loginName: string) => {
+    form.id = id
+    form.loginName = loginName
+    form.newPwd = ''
+    form.confirmPwd = ''
+    dialogVisible.value = true
+}
+const submit = async () => {
+    formRef.value.validate((valid: boolean) => {
+        if (valid) {
+            updatePassword({
+                id: form.id,
+                newPassword: form.newPwd
+            }).then((res: any) => {
+                ElMessage.success('密码修改成功')
+                dialogVisible.value = false
+            })
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

src/views/govern/alarm/Abnormal.vue

@@ -94,7 +94,15 @@ const tableStore = new TableStore({
         },
         { title: '设备名称', field: 'ndid', align: 'center' },
         { title: '异常时间', field: 'evtTime', align: 'center', sortable: true },
-        { title: '告警代码', field: 'code', align: 'center', sortable: true }
+        {
+            title: '告警代码',
+            field: 'code',
+            align: 'center',
+            sortable: true,
+            formatter: (row: any) => {
+                return row.cellValue ? '\u200B' + row.cellValue : '/'
+            }
+        }
     ]
 })
 

src/views/govern/alarm/Device.vue

@@ -86,7 +86,7 @@ const tableStore = new TableStore({
         { title: '设备名称', field: 'equipmentName', align: 'center' },
         { title: '工程名称', field: 'engineeringName', align: 'center' },
         { title: '项目名称', field: 'projectName', align: 'center' },
-        { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 110, sortable: true },
+        { title: '发生时刻', field: 'startTime', align: 'center', width: 180, sortable: true },
         {
             title: '模块信息',
             field: 'moduleNo',
@@ -99,20 +99,21 @@ const tableStore = new TableStore({
             title: '告警代码',
             field: 'code',
             align: 'center',
-
+            width: 100,
             formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
+                return row.cellValue ? '\u200B' + row.cellValue : '/'
             },
             sortable: true
         },
         {
             title: '事件描述',
+            minWidth: 220,
             field: 'showName'
         },
         {
             title: '级别',
             field: 'level',
-
+            width: 100,
             render: 'tag',
             custom: {
                 1: 'danger',
@@ -133,7 +134,8 @@ const tableStore = new TableStore({
         //     }
         // }
     ],
-    beforeSearchFun: () => {}
+    beforeSearchFun: () => {},
+  
 })
 
 provide('tableStore', tableStore)

src/views/govern/alarm/Front.vue

@@ -51,7 +51,7 @@ const tableStore = new TableStore({
             align: 'center',
 
             formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
+                 return row.cellValue ? '\u200B' + row.cellValue : '/'
             },
             sortable: true
         },

src/views/govern/alarm/Transient.vue

@@ -75,7 +75,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import shushiboxi from '@/components/echarts/shushiboxi.vue'
 import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
 import rmsboxi from '@/components/echarts/rmsboxi.vue'
-import { analyseWave } from '@/api/common'
+import { analyseWave, getFileByEventId } from '@/api/common'
 import { mainHeight } from '@/utils/layout'
 import { ElMessage } from 'element-plus'
 import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
@@ -153,7 +153,7 @@ const tableStore = new TableStore({
                     render: 'basicButton',
                     loading: 'loading1',
                     disabled: row => {
-                        return !row.wavePath && row.evtParamTm < 20
+                        return !row.wavePath 
                     },
                     click: async row => {
                         row.loading1 = true
@@ -212,7 +212,6 @@ const tableStore = new TableStore({
                     loading: 'loading2',
                     render: 'basicButton',
                     disabled: row => {
-                        // && row.evtParamTm < 20
                         return !row.wavePath
                     },
                     click: row => {
@@ -235,8 +234,24 @@ const tableStore = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return !(!row.wavePath && row.evtParamTm < 20)
+                        return  row.showName != '未知'; 
                     }
+                },
+                {
+                 name: 'edit',
+                 title: '波形补召',
+                 type: 'primary',
+                 icon: 'el-icon-Check',
+                 render: 'basicButton',
+                 disabled: row => {
+                     return  row.wavePath || row.showName === '未知';
+                 },
+                 click: row => {
+                        getFileByEventId(row.id).then(res => { 
+                            ElMessage.success(res.message)
+                            tableStore.index()
+                        })
+                 }   
                 }
             ]
         }
@@ -298,6 +313,7 @@ const sourceChange = (e: any) => {
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
         }
+        
     }
 
     // tableStore.table.params.engineeringid = e[1] || ''

src/views/govern/analyze/APF/index.vue

@@ -1,448 +1,469 @@
-<template>
-    <div class="default-main analyze-apf" :style="{ height: pageHeight.height }" v-loading="loading">
-        <DeviceTree @node-click="nodeClick" @init="nodeClick" @deviceTypeChange="deviceTypeChange"></DeviceTree>
-        <div class="analyze-apf-right" v-if="formInline.devId">
-            <div ref="headerRef">
-                <TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange">
-                    <template v-slot:select>
-                        <el-form-item label="时间:">
-                            <DatePicker ref="datePickerRef"></DatePicker>
-                        </el-form-item>
-                        <el-form-item label="统计指标:">
-                            <el-select
-                                style="width: 200px"
-                                v-model.trim="formInline.statisticalId"
-                                filterable
-                                @change="frequencyFlag"
-                                placeholder="请选择"
-                            >
-                                <el-option
-                                    v-for="item in zblist"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="谐波次数:" v-show="frequencyShow">
-                            <el-select
-                                v-model.trim="formInline.frequency"
-                                filterable
-                                placeholder="请选择"
-                                style="width: 100px"
-                            >
-                                <el-option
-                                    v-for="item in 49"
-                                    :key="item + 1"
-                                    :label="item + 1"
-                                    :value="item + 1"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="值类型:">
-                            <el-select v-model.trim="formInline.valueType" filterable placeholder="请选择">
-                                <el-option
-                                    v-for="item in typelist"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </template>
-                    <template v-slot:operation>
-                        <el-button type="primary" @click="search" icon="el-icon-Search">查询</el-button>
-                    </template>
-                </TableHeader>
-            </div>
-
-            <el-empty description="暂无数据" v-if="!echartsData" style="flex: 1"></el-empty>
-            <template v-else>
-                <div :style="echartHeight">
-                    <MyEchart :options="echartsData" />
-                </div>
-            </template>
-        </div>
-        <el-empty v-else description="请选择设备" class="analyze-apf-right" />
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { mainHeight } from '@/utils/layout'
-import DeviceTree from '@/components/tree/govern/deviceTree.vue'
-import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
-import { getDevCapacity } from '@/api/cs-device-boot/capacity'
-import { queryCommonStatisticalByTime } from '@/api/cs-harmonic-boot/stable'
-import DatePicker from '@/components/form/datePicker/index.vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
-import { yMethod } from '@/utils/echartMethod'
-import TableHeader from '@/components/table/header/index.vue'
-
-defineOptions({
-    name: 'govern/analyze/APF'
-})
-
-const tableHeaderRef = ref()
-const headerRef = ref()
-const pageHeight = mainHeight(20)
-const echartHeight = ref(mainHeight(80))
-const loading = ref(false)
-const echartsData = ref<any>(null)
-const datePickerRef = ref()
-const formInline = reactive({
-    statisticalId: '',
-    valueType: '',
-    startTime: '',
-    endTime: '',
-    devId: '',
-    frequency: ''
-})
-const timeFlag = ref(true)
-const frequencyShow = ref(false)
-const devCapacity = ref(0)
-const flag = ref(false)
-const typelist = [
-    {
-        label: '平均值',
-        value: 'avg'
-    },
-    {
-        label: '最大值',
-        value: 'max'
-    },
-    {
-        label: '最小值',
-        value: 'min'
-    },
-    {
-        label: 'CP95值',
-        value: 'cp95'
-    }
-]
-const zblist = ref<any[]>([])
-
-const init = () => {
-    return new Promise((resolve, reject) => {
-        queryByCode('Web_Apf').then(res => {
-            queryCsDictTree(res.data?.id).then(res => {
-                zblist.value = res.data.map((item: any) => {
-                    return {
-                        value: item.id,
-                        label: item.name,
-                        ...item
-                    }
-                })
-                formInline.statisticalId = zblist.value[0]?.value
-                formInline.valueType = typelist[0].value
-                resolve(null)
-            })
-        })
-    })
-}
-const deviceTypeChange = (val: any, obj: any) => {
-    flag.value = true
-    nodeClick(obj)
-}
-const nodeClick = async (e: anyObj) => {
-    if (e.level == 2 && flag.value) {
-        formInline.devId = e.id
-        loading.value = true
-        if (zblist.value.length === 0) {
-            await init()
-        }
-        getDevCapacity(formInline.devId)
-            .then(res => {
-                devCapacity.value = res.data
-                search()
-            })
-            .catch(() => {
-                loading.value = false
-            })
-    }
-}
-const lineStyle = [
-    { type: 'solid', width: 3 },
-    { type: 'dotted', width: 3 },
-    { type: 'dashed', width: 3 }
-]
-const search = () => {
-    if (timeFlag.value) {
-        datePickerRef.value && datePickerRef.value.setInterval(5)
-        timeFlag.value = false
-    }
-    loading.value = true
-    formInline.startTime = datePickerRef.value.timeValue[0]
-    formInline.endTime = datePickerRef.value.timeValue[1]
-    if (!frequencyShow.value) {
-        formInline.frequency = ''
-    }
-
-    queryCommonStatisticalByTime(formInline)
-        .then(({ data }: { data: any[] }) => {
-            if (data.length) {
-                let list = processingOfData(data, 'unit')
-
-                echartsData.value = {}
-                let legend: any[] = []
-                let xAxis: any[] = []
-                let yAxis: any[] = []
-                let series: any[] = []
-                let color: any[] = []
-                let title = ''
-                data.forEach(item => {
-                    if (!xAxis.includes(item.time)) {
-                        xAxis.push(item.time)
-                    }
-                    // if (!legend.includes(item.anotherName)) {
-                    //     legend.push(item.anotherName)
-                    // }
-                })
-                let units = Object.keys(list)
-                // console.log('🚀 ~ .then ~ units:', units)
-                for (let unit in list) {
-                    console.log('🚀 ~ .then ~ unit:', unit)
-                    let [min, max] = yMethod(list[unit].map((item: any) => item.statisticalData))
-                    yAxis.push({
-                        name: unit == 'null' ? '' : unit,
-                        type: 'value',
-                        // max: 10,
-                        min: min,
-                        max: max,
-                        // splitNumber: 5,
-                        // minInterval: 1,
-
-                        axisLine: {
-                            show: true,
-                            //symbol: ["none", "arrow"],
-                            lineStyle: {
-                                color: '#333'
-                            }
-                        }
-                    })
-                    // processingOfData(list[unit], 'anotherName')
-                    let anotherList = processingOfData(list[unit], 'anotherName')
-                    for (let k in anotherList) {
-                        title = k
-                        let lineName = lineStyle[Object.keys(anotherList).indexOf(k)]
-                        let phaseList = processingOfData(anotherList[k], 'phase')
-                        for (let j in phaseList) {
-                            color.push(j == 'A' ? '#DAA520' : j == 'B' ? '#2E8B57' : j == 'C' ? '#A52a2a' : '#0000CC')
-                            legend.push(
-                                j == 'M' ? k : j == 'A' ? `A相_${k}` : j == 'B' ? `B相_${k}` : j == 'C' ? `C相_${k}` : j
-                            )
-                            series.push({
-                                name:
-                                    j == 'M'
-                                        ? k
-                                        : j == 'A'
-                                        ? `A相_${k}`
-                                        : j == 'B'
-                                        ? `B相_${k}`
-                                        : j == 'C'
-                                        ? `C相_${k}`
-                                        : j,
-                                symbol: 'none',
-                                smooth: true,
-                                type: 'line',
-
-                                data: phaseList[j].map(item => [
-                                    item.time,
-                                    Math.floor(item.statisticalData * 100) / 100,
-                                    unit,
-                                    lineName.type
-                                ]),
-                                lineStyle: lineName,
-                                yAxisIndex: unit.indexOf(units)
-                            })
-                        }
-                    }
-                }
-
-                echartsData.value = {
-                    title: {
-                        text: zblist.value.filter(item => item.id == formInline.statisticalId)[0].name
-                    },
-                    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>`
-                                }
-
-                                str += `${marker}${el.seriesName.split('(')[0]}：${
-                                    el.value[1] != null
-                                        ? el.value[1] + ' ' + (el.value[2] == 'null' ? '' : el.value[2])
-                                        : '-'
-                                }<br>`
-                            })
-                            return str
-                        }
-                    },
-                    legend: {
-                        itemWidth: 20,
-                        itemHeight: 20,
-                        itemStyle: { opacity: 0 }, //去圆点
-                        type: 'scroll', // 开启滚动分页
-                        top: 25
-                        // data: legend
-                    },
-                    grid: {
-                        left: '20px',
-                        right: '40px',
-                        bottom: '50px',
-                        top: '80px',
-                        containLabel: true
-                    },
-                    toolbox: {
-                        feature: {
-                            saveAsImage: {}
-                        }
-                    },
-                    color: color,
-                    xAxis: {
-                        name: '',
-                        type: 'time',
-                        axisLabel: {
-                            formatter: {
-                                day: '{MM}-{dd}',
-                                month: '{MM}',
-                                year: '{yyyy}'
-                            }
-                        }
-
-                        // boundaryGap: false,
-                        // data: xAxis,
-                        // axisLabel: {
-                        //     formatter: function (value: string) {
-                        //         return value.split(' ').join('\n')
-                        //     }
-                        // },
-                        // axisLine: {
-                        //     show: true,
-                        //     // symbol: ["none", "arrow"],
-                        //     lineStyle: {
-                        //         color: '#333'
-                        //     }
-                        // }
-                    },
-                    yAxis: yAxis,
-                    //  [
-                    //     {
-                    //         name: '畸变率:(%)',
-                    //         type: 'value',
-                    //         // max: 10,
-                    //         min: min1,
-                    //         max: max1,
-                    //         splitNumber: 5,
-                    //         minInterval: 1,
-
-                    //         axisLine: {
-                    //             show: true,
-                    //             //symbol: ["none", "arrow"],
-                    //             lineStyle: {
-                    //                 color: '#333'
-                    //             }
-                    //         }
-                    //     },
-                    //     {
-                    //         name: '电流:(A)',
-                    //         type: 'value',
-                    //         min: min,
-                    //         max: max,
-                    //         splitNumber: 5,
-                    //         minInterval: 1,
-                    //         splitLine: {
-                    //             show: false
-                    //         },
-                    //         axisLine: {
-                    //             show: true,
-                    //             //symbol: ["none", "arrow"],
-                    //             lineStyle: {
-                    //                 color: '#333'
-                    //             }
-                    //         }
-                    //     }
-                    // ],
-                    options: {
-                        series: series
-                    }
-                }
-            } else {
-                echartsData.value = null
-            }
-            loading.value = false
-        })
-        .catch(() => {
-            loading.value = false
-        })
-}
-const processingOfData = (data: any, type: string) => {
-    let groupedData: any = {}
-
-    data.forEach(item => {
-        if (!groupedData[item[type]]) {
-            groupedData[item[type]] = []
-        }
-        groupedData[item[type]].push(item)
-    })
-    return groupedData
-}
-const frequencyFlag = () => {
-    let name = zblist.value.filter(item => item.id == formInline.statisticalId)[0].name
-    if (name.includes('含有率') || name.includes('幅值')) {
-        frequencyShow.value = true
-        formInline.frequency = 2
-    } else {
-        frequencyShow.value = false
-    }
-    tableHeaderRef.value && tableHeaderRef.value?.computedSearchRow()
-}
-const selectChange = (flag: boolean) => {
-    setTimeout(() => {
-        echartHeight.value = mainHeight(23 + headerRef.value.offsetHeight)
-    }, 100)
-}
-</script>
-
-<style lang="scss">
-.analyze-apf {
-    display: flex;
-
-    &-right {
-        height: 100%;
-        overflow: hidden;
-        flex: 1;
-        padding: 10px 10px 10px 0;
-        display: flex;
-        flex-direction: column;
-    }
-}
-</style>
-<style lang="scss" scoped>
-.el-select {
-    min-width: 100px;
-}
-</style>
+<template>
+    <div class="default-main analyze-apf" :style="{ height: pageHeight.height }" v-loading="loading">
+        <DeviceTree @node-click="nodeClick" @init="nodeClick" @deviceTypeChange="deviceTypeChange"></DeviceTree>
+        <div class="analyze-apf-right" v-if="formInline.devId">
+            <div ref="headerRef">
+                <TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange">
+                    <template v-slot:select>
+                        <el-form-item label="时间:">
+                            <DatePicker ref="datePickerRef"></DatePicker>
+                        </el-form-item>
+                        <el-form-item label="统计指标:">
+                            <el-select
+                                style="width: 200px"
+                                v-model.trim="formInline.statisticalId"
+                                filterable
+                                @change="frequencyFlag"
+                                placeholder="请选择"
+                            >
+                                <el-option
+                                    v-for="item in zblist"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="谐波次数:" v-show="frequencyShow">
+                            <el-select
+                                v-model.trim="formInline.frequency"
+                                filterable
+                                placeholder="请选择"
+                                style="width: 100px"
+                            >
+                                <el-option
+                                    v-for="item in 49"
+                                    :key="item + 1"
+                                    :label="item + 1"
+                                    :value="item + 1"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="值类型:">
+                            <el-select v-model.trim="formInline.valueType" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in typelist"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                    <template v-slot:operation>
+                        <el-button type="primary" @click="search" icon="el-icon-Search">查询</el-button>
+                        <el-button :type="timeControl ? 'primary' : ''" icon="el-icon-Sort" @click="setTimeControl">
+                            缺失数据
+                        </el-button>
+                    </template>
+                </TableHeader>
+            </div>
+
+            <el-empty description="暂无数据" v-if="!echartsData" style="flex: 1"></el-empty>
+            <template v-else>
+                <div :style="echartHeight">
+                    <MyEchart :options="echartsData" />
+                </div>
+            </template>
+        </div>
+        <el-empty v-else description="请选择设备" class="analyze-apf-right" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import DeviceTree from '@/components/tree/govern/deviceTree.vue'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { getDevCapacity } from '@/api/cs-device-boot/capacity'
+import { queryCommonStatisticalByTime } from '@/api/cs-harmonic-boot/stable'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { yMethod, completeTimeSeries } from '@/utils/echartMethod'
+import TableHeader from '@/components/table/header/index.vue'
+const timeControl = ref(false)
+defineOptions({
+    name: 'govern/analyze/APF'
+})
+
+const tableHeaderRef = ref()
+const headerRef = ref()
+const pageHeight = mainHeight(20)
+const echartHeight = ref(mainHeight(80))
+const loading = ref(false)
+const echartsData = ref<any>(null)
+const datePickerRef = ref()
+const formInline = reactive({
+    statisticalId: '',
+    valueType: '',
+    startTime: '',
+    endTime: '',
+    devId: '',
+    frequency: ''
+})
+const dataLists = ref<any[]>([])
+const timeFlag = ref(true)
+const frequencyShow = ref(false)
+const devCapacity = ref(0)
+const flag = ref(false)
+const typelist = [
+    {
+        label: '平均值',
+        value: 'avg'
+    },
+    {
+        label: '最大值',
+        value: 'max'
+    },
+    {
+        label: '最小值',
+        value: 'min'
+    },
+    {
+        label: 'CP95值',
+        value: 'cp95'
+    }
+]
+const zblist = ref<any[]>([])
+
+const init = () => {
+    return new Promise((resolve, reject) => {
+        queryByCode('Web_Apf').then(res => {
+            queryCsDictTree(res.data?.id).then(res => {
+                zblist.value = res.data.map((item: any) => {
+                    return {
+                        value: item.id,
+                        label: item.name,
+                        ...item
+                    }
+                })
+                formInline.statisticalId = zblist.value[0]?.value
+                formInline.valueType = typelist[0].value
+                resolve(null)
+            })
+        })
+    })
+}
+const deviceTypeChange = (val: any, obj: any) => {
+    flag.value = true
+    nodeClick(obj)
+}
+const nodeClick = async (e: anyObj) => {
+    if (e.level == 2 && flag.value) {
+        formInline.devId = e.id
+        loading.value = true
+        if (zblist.value.length === 0) {
+            await init()
+        }
+        getDevCapacity(formInline.devId)
+            .then(res => {
+                devCapacity.value = res.data
+                search()
+            })
+            .catch(() => {
+                loading.value = false
+            })
+    }
+}
+const lineStyle = [
+    { type: 'solid', width: 3 },
+    { type: 'dotted', width: 3 },
+    { type: 'dashed', width: 3 }
+]
+const search = () => {
+    if (timeFlag.value) {
+        datePickerRef.value && datePickerRef.value.setInterval(5)
+        timeFlag.value = false
+    }
+    loading.value = true
+    formInline.startTime = datePickerRef.value.timeValue[0]
+    formInline.endTime = datePickerRef.value.timeValue[1]
+    if (!frequencyShow.value) {
+        formInline.frequency = ''
+    }
+
+    queryCommonStatisticalByTime(formInline)
+        .then(({ data }: { data: any[] }) => {
+            dataLists.value = data
+            setEchart()
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+const setEchart = () => {
+    loading.value = true
+    let data = JSON.parse(JSON.stringify(dataLists.value))
+    if (data.length) {
+        let list = processingOfData(data, 'unit')
+
+        echartsData.value = {}
+        let legend: any[] = []
+        let xAxis: any[] = []
+        let yAxis: any[] = []
+        let series: any[] = []
+        let color: any[] = []
+        let title = ''
+        data.forEach(item => {
+            if (!xAxis.includes(item.time)) {
+                xAxis.push(item.time)
+            }
+            // if (!legend.includes(item.anotherName)) {
+            //     legend.push(item.anotherName)
+            // }
+        })
+        let units = Object.keys(list)
+        // console.log('🚀 ~ .then ~ units:', units)
+        for (let unit in list) {
+            console.log('🚀 ~ .then ~ unit:', unit)
+            let [min, max] = yMethod(list[unit].map((item: any) => item.statisticalData))
+            yAxis.push({
+                name: unit == 'null' ? '' : unit,
+                type: 'value',
+                // max: 10,
+                min: min,
+                max: max,
+                // splitNumber: 5,
+                // minInterval: 1,
+
+                axisLine: {
+                    show: true,
+                    //symbol: ["none", "arrow"],
+                    lineStyle: {
+                        color: '#333'
+                    }
+                }
+            })
+            // processingOfData(list[unit], 'anotherName')
+            let anotherList = processingOfData(list[unit], 'anotherName')
+            for (let k in anotherList) {
+                title = k
+                let lineName = lineStyle[Object.keys(anotherList).indexOf(k)]
+                let phaseList = processingOfData(anotherList[k], 'phase')
+                for (let j in phaseList) {
+                    color.push(j == 'A' ? '#DAA520' : j == 'B' ? '#2E8B57' : j == 'C' ? '#A52a2a' : '#0000CC')
+                    legend.push(
+                        j == 'M' ? k : j == 'A' ? `A相_${k}` : j == 'B' ? `B相_${k}` : j == 'C' ? `C相_${k}` : j
+                    )
+                    series.push({
+                        name: j == 'M' ? k : j == 'A' ? `A相_${k}` : j == 'B' ? `B相_${k}` : j == 'C' ? `C相_${k}` : j,
+                        symbol: 'none',
+                        smooth: true,
+                        type: 'line',
+
+                        // data: phaseList[j].map(item => [
+                        //     item.time,
+                        //     Math.floor(item.statisticalData * 100) / 100,
+                        //     unit,
+                        //     lineName.type
+                        // ]),
+                        data: timeControl.value
+                            ? completeTimeSeries(
+                                  phaseList[j].map(item => [
+                                      item.time,
+                                      Math.floor(item.statisticalData * 100) / 100,
+                                      unit,
+                                      lineName.type
+                                  ])
+                              )
+                            : phaseList[j].map(item => [
+                                  item.time,
+                                  Math.floor(item.statisticalData * 100) / 100,
+                                  unit,
+                                  lineName.type
+                              ]),
+
+                        lineStyle: lineName,
+                        yAxisIndex: unit.indexOf(units)
+                    })
+                }
+            }
+        }
+
+        echartsData.value = {
+            title: {
+                text: zblist.value.filter(item => item.id == formInline.statisticalId)[0].name
+            },
+            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>`
+                        }
+
+                        str += `${marker}${el.seriesName.split('(')[0]}：${
+                            el.value[1] != null ? el.value[1] + ' ' + (el.value[2] == 'null' ? '' : el.value[2]) : '-'
+                        }<br>`
+                    })
+                    return str
+                }
+            },
+            legend: {
+                itemWidth: 20,
+                itemHeight: 20,
+                itemStyle: { opacity: 0 }, //去圆点
+                type: 'scroll', // 开启滚动分页
+                top: 25
+                // data: legend
+            },
+            grid: {
+                left: '20px',
+                right: '40px',
+                bottom: '50px',
+                top: '80px',
+                containLabel: true
+            },
+            toolbox: {
+                feature: {
+                    saveAsImage: {}
+                }
+            },
+            color: color,
+            xAxis: {
+                name: '',
+                type: 'time',
+                axisLabel: {
+                    formatter: {
+                        day: '{MM}-{dd}',
+                        month: '{MM}',
+                        year: '{yyyy}'
+                    }
+                }
+
+                // boundaryGap: false,
+                // data: xAxis,
+                // axisLabel: {
+                //     formatter: function (value: string) {
+                //         return value.split(' ').join('\n')
+                //     }
+                // },
+                // axisLine: {
+                //     show: true,
+                //     // symbol: ["none", "arrow"],
+                //     lineStyle: {
+                //         color: '#333'
+                //     }
+                // }
+            },
+            yAxis: yAxis,
+            //  [
+            //     {
+            //         name: '畸变率:(%)',
+            //         type: 'value',
+            //         // max: 10,
+            //         min: min1,
+            //         max: max1,
+            //         splitNumber: 5,
+            //         minInterval: 1,
+
+            //         axisLine: {
+            //             show: true,
+            //             //symbol: ["none", "arrow"],
+            //             lineStyle: {
+            //                 color: '#333'
+            //             }
+            //         }
+            //     },
+            //     {
+            //         name: '电流:(A)',
+            //         type: 'value',
+            //         min: min,
+            //         max: max,
+            //         splitNumber: 5,
+            //         minInterval: 1,
+            //         splitLine: {
+            //             show: false
+            //         },
+            //         axisLine: {
+            //             show: true,
+            //             //symbol: ["none", "arrow"],
+            //             lineStyle: {
+            //                 color: '#333'
+            //             }
+            //         }
+            //     }
+            // ],
+            options: {
+                series: series
+            }
+        }
+    } else {
+        echartsData.value = null
+    }
+    loading.value = false
+}
+const setTimeControl = () => {
+    timeControl.value = !timeControl.value
+    setEchart()
+}
+
+const processingOfData = (data: any, type: string) => {
+    let groupedData: any = {}
+
+    data.forEach(item => {
+        if (!groupedData[item[type]]) {
+            groupedData[item[type]] = []
+        }
+        groupedData[item[type]].push(item)
+    })
+    return groupedData
+}
+const frequencyFlag = () => {
+    let name = zblist.value.filter(item => item.id == formInline.statisticalId)[0].name
+    if (name.includes('含有率') || name.includes('幅值')) {
+        frequencyShow.value = true
+        formInline.frequency = 2
+    } else {
+        frequencyShow.value = false
+    }
+    tableHeaderRef.value && tableHeaderRef.value?.computedSearchRow()
+}
+const selectChange = (flag: boolean) => {
+    setTimeout(() => {
+        echartHeight.value = mainHeight(23 + headerRef.value.offsetHeight)
+    }, 100)
+}
+</script>
+
+<style lang="scss">
+.analyze-apf {
+    display: flex;
+
+    &-right {
+        height: 100%;
+        overflow: hidden;
+        flex: 1;
+        padding: 10px 10px 10px 0;
+        display: flex;
+        flex-direction: column;
+    }
+}
+</style>
+<style lang="scss" scoped>
+.el-select {
+    min-width: 100px;
+}
+</style>

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

@@ -10,6 +10,15 @@
         <div class="device-control-right" v-if="deviceData">
             <el-descriptions title="监测点信息" class="mb10" width="180" :column="3" border>
                 <template #extra>
+                    <!-- <el-button v-if="deviceType == '1'"  type="primary" @click="handleDownLoadTemplate">
+                        模版下载
+                    </el-button> -->
+                    <!-- <el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Connection" @click="handleImport">
+                        离线补召
+                    </el-button>
+                    <el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Monitor" @click="handleaddDevice">
+                        在线补召
+                    </el-button> -->
                     <el-button
                         v-if="deviceType == '1'"
                         type="primary"
@@ -36,6 +45,9 @@
                     }}
                 </el-descriptions-item>
 
+                <!-- <el-descriptions-item label="安装位置" width="160">
+                    {{ devData.position || '/' }}
+                </el-descriptions-item> -->
 
                 <el-descriptions-item label="PT变比" width="160">
                     {{ devData.ptRatio || '/' }}
@@ -44,9 +56,28 @@
                     {{ devData.ctRatio || '/' }}
                 </el-descriptions-item>
 
-            
+                <!-- <el-descriptions-item label="名称">
+                    {{ devData.name ? devData.name : '/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="类型">
+                    {{ echoName(devData.devType, devTypeOptions) }}
+                </el-descriptions-item>
+
+                <el-descriptions-item label="接入方式">
+                    {{ devData.devAccessMethod ? devData.devAccessMethod : '/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="网络设备ID">
+                    {{ devData.ndid ? devData.ndid : '/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="型号">
+                    {{ echoName(devData.devModel, devModelOptions) }}
+                </el-descriptions-item>
+                <el-descriptions-item label="接入日期">
+                    {{ devData.time ? devData.time : '/' }}
+                </el-descriptions-item> -->
             </el-descriptions>
-            <el-tabs v-model.trim="dataSet" type="border-card" class="mb10" @tab-click="handleClick">
+            <el-tabs v-model.trim="dataSet" type="border-card" class="device-control-box-card" @tab-click="handleClick">
+               
                 <el-tab-pane
                     lazy
                     :label="item.name"
@@ -468,7 +499,7 @@
                     v-if="dataSet.indexOf('_event') != -1"
                     v-loading="tableLoading"
                 >
-                    <Event ref="eventRef" :device-type="deviceType"></Event>
+                    <Event ref="eventRef" :deviceType="deviceType"></Event>
                 </div>
                 <!-- 测试项记录 -->
                 <div
@@ -698,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') {
@@ -898,7 +929,6 @@ const nodeClick = async (e: anyObj) => {
 const deviceType = ref('0')
 const pointTypeChange = (val: any, obj: any) => {
     deviceType.value = val
-    console.log('pointTypeChange', val)
     nodeClick(obj)
 }
 const realTimeRef: any = ref()
@@ -949,10 +979,10 @@ const getRealDataMqttMsg = async () => {
                     })
                 }, 30000)
                 mqttRef.value.on('message', (topic: any, message: any) => {
-                    // console.log(
-                    //     '实时数据&实时趋势---mqtt接收到消息',
-                    //     JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-                    // )
+                    console.log(
+                        '实时数据&实时趋势---mqtt接收到消息',
+                        JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
+                    )
                     let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
                   
                     if (lineId.value != obj.lineId || adminInfo.userIndex != obj.userId) return
@@ -961,35 +991,37 @@ const getRealDataMqttMsg = async () => {
                     //如果消息返回值是二次值，下拉框是二次值只需要单位换算 除以1000
                     //如果消息返回值是一次值，下拉框是一次值只需要单位换算 除以1000
                     if (obj.dataLevel == formInline.dataLevel) {
+          
                         obj = {
                             ...obj,
                             // 电压有效值
-                            vRmsA: obj.vRmsA / 1000,
-                            vRmsB: obj.vRmsB / 1000,
-                            vRmsC: obj.vRmsC / 1000,
+                            vRmsA: obj.vRmsA ,
+                            vRmsB: obj.vRmsB ,
+                            vRmsC: obj.vRmsC ,
                             //基波电压幅值
-                            v1A: obj.v1A / 1000,
-                            v1B: obj.v1B / 1000,
-                            v1C: obj.v1C / 1000,
+                            v1A: obj.v1A ,
+                            v1B: obj.v1B ,
+                            v1C: obj.v1C ,
                             //有功功率
-                            pA: obj.pA / 1000,
-                            pB: obj.pB / 1000,
-                            pC: obj.pC / 1000,
-                            pTot: obj.pTot / 1000,
+                            pA: obj.pA ,
+                            pB: obj.pB ,
+                            pC: obj.pC ,
+                            pTot: obj.pTot ,
                             //无功功率
-                            qA: obj.qA / 1000,
-                            qB: obj.qB / 1000,
-                            qC: obj.qC / 1000,
-                            qTot: obj.qTot / 1000,
+                            qA: obj.qA ,
+                            qB: obj.qB ,
+                            qC: obj.qC ,
+                            qTot: obj.qTot ,
                             //视在功率
-                            sA: obj.sA / 1000,
-                            sB: obj.sB / 1000,
-                            sC: obj.sC / 1000,
-                            sTot: obj.sTot / 1000
+                            sA: obj.sA ,
+                            sB: obj.sB ,
+                            sC: obj.sC ,
+                            sTot: obj.sTot 
                         }
                     }
                     //如果消息返回值是二次值，下拉框是一次值需要单位换算 除以1000 并且乘以pt ct
                     if (obj.dataLevel == 'Secondary' && formInline.dataLevel == 'Primary') {
+                        
                         obj = {
                             ...obj,
                             // 电压有效值
@@ -1072,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) {
@@ -1390,7 +1422,9 @@ const echoName = (value: any, arr: any[]) => {
     return value ? arr.find(item => item.value == value)?.label : '/'
 }
 
-onMounted(() => {})
+onMounted(() => {
+   
+})
 onBeforeUnmount(() => {
     clearInterval(realDataTimer.value)
     clearInterval(trendTimer.value)

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

@@ -1,184 +1,191 @@
-<!-- 暂态事件-波形分析组件 -->
-<template>
-    <div class="home">
-        <div class="home_header">
-            <!-- <el-form-item label="值类型选择">
-                <el-select @change="changeView" v-model.trim="value" placeholder="请选择值类型">
-                    <el-option
-                        v-for="(item, index) in options"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-            </el-form-item> -->
-
-            <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"
-            v-loading="loading">
-
-            <el-tab-pane label="瞬时波形" name="ssbx" :style="'height:' + bxecharts + ';overflow-y: scroll;'">
-                <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;'">
-                <rmsboxi v-if="isWp && wp && activeName == 'rmsbx' && showBoxi" :value="value" :boxoList="boxoList"
-                    :parentHeight="parentHeight" :wp="wp">
-                </rmsboxi>
-            </el-tab-pane>
-        </el-tabs>
-    </div>
-</template>
-<script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, watch, defineEmits } from 'vue'
-import { VxeGridProps, VxeGridPropTypes } from 'vxe-table'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import shushiboxi from '@/components/echarts/shushiboxi.vue'
-import rmsboxi from '@/components/echarts/rmsboxi.vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
-import { Platform, TrendCharts, DataLine, Back } from '@element-plus/icons-vue'
-import { mainHeight } from '@/utils/layout'
-const props = defineProps(['wp'])
-const searchForm = ref({
-    type: 0
-})
-const emit = defineEmits(['handleHideCharts'])
-const parentHeight = ref(0)
-const loading = ref(false)
-const tableList: any = ref([])
-for (let i = 0; i < 300; i++) {
-    tableList.value.push({
-        name: i + 1,
-        value: Math.floor(Math.random() * 101)
-    })
-}
-interface RowVO {
-    [key: string]: any
-}
-//谐波电压含有率
-const gridOptions = ref<VxeGridProps<RowVO>>({
-    border: true,
-    showOverflow: true,
-    showHeader: false,
-    columns: [],
-    data: [],
-    columnConfig: {
-        resizable: true
-    },
-    align: 'center'
-})
-gridOptions.value = { ...defaultAttribute, ...gridOptions.value }
-
-const yAxisUnit: any = ref('')
-
-const echartsData1: any = ref([]),
-    echartsData2: any = ref([]),
-    echartsData3: any = ref([]),
-    barCharts1 = ref(),
-    barCharts2 = ref(),
-    barCharts3 = ref()
-
-const view = ref(true)
-const view2 = ref(false)
-const showBoxi = ref(true)
-const activeName1 = ref('ssbx')
-const activeName = ref('ssbx')
-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
-    loading.value = true
-    setTimeout(() => {
-        value.value = theTypeOfValue.value
-        showBoxi.value = true
-    }, 500)
-    setTimeout(() => {
-        loading.value = false
-    }, 1500)
-}
-const bxecharts: any = ref(mainHeight(190).height as any)
-
-const handleClick = (tab: any, event: any) => {
-    loading.value = true
-    setTimeout(() => {
-        activeName.value = tab.paneName
-    }, 500)
-    setTimeout(() => {
-        loading.value = false
-    }, 1500)
-}
-const handleBack = () => {
-    emit('handleHideCharts')
-}
-const setHeight = (h: any, vh: any) => {
-    if (h != false) {
-        parentHeight.value = h
-    }
-
-    setTimeout(() => {
-        bxecharts.value = mainHeight(vh).height
-    }, 100)
-}
-onMounted(() => { })
-defineExpose({ getWpData, setHeight })
-</script>
-<style lang="scss" scoped>
-// .tab_info {
-//     width: 100%;
-//     height: calc(100vh - 450px);
-
-//     // overflow: auto;
-//     // padding-bottom: 20px;
-//     .charts {
-//         width: 100%;
-//         margin-top: 10px;
-//         height: calc(100vh - 450px);
-//     }
-// }
-
-.home {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    position: relative;
-
-    .home_header {
-
-        height: 50px;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        .el-select {
-            width: 200px !important;
-        }
-    }
-
-    .home_body {
-        // margin-top: 20px;
-        flex: 1;
-    }
-}
-</style>
+<!-- 暂态事件-波形分析组件 -->
+<template>
+    <div class="home">
+        <div class="home_header">
+            <!-- <el-form-item label="值类型选择">
+                <el-select @change="changeView" v-model.trim="value" placeholder="请选择值类型">
+                    <el-option
+                        v-for="(item, index) in options"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item> -->
+
+            <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"
+            v-loading="loading"
+        >
+            <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: auto;'">
+                <rmsboxi
+                    v-if="isWp && wp && activeName == 'rmsbx' && showBoxi"
+                    :value="value"
+                    :boxoList="boxoList"
+                    :parentHeight="parentHeight"
+                    :wp="wp"
+                ></rmsboxi>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, reactive, defineExpose, watch, defineEmits } from 'vue'
+import { VxeGridProps, VxeGridPropTypes } from 'vxe-table'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import shushiboxi from '@/components/echarts/shushiboxi.vue'
+import rmsboxi from '@/components/echarts/rmsboxi.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { Platform, TrendCharts, DataLine, Back } from '@element-plus/icons-vue'
+import { mainHeight } from '@/utils/layout'
+const props = defineProps(['wp'])
+const searchForm = ref({
+    type: 0
+})
+const emit = defineEmits(['handleHideCharts'])
+const parentHeight = ref(0)
+const loading = ref(false)
+const tableList: any = ref([])
+for (let i = 0; i < 300; i++) {
+    tableList.value.push({
+        name: i + 1,
+        value: Math.floor(Math.random() * 101)
+    })
+}
+interface RowVO {
+    [key: string]: any
+}
+//谐波电压含有率
+const gridOptions = ref<VxeGridProps<RowVO>>({
+    border: true,
+    showOverflow: true,
+    showHeader: false,
+    columns: [],
+    data: [],
+    columnConfig: {
+        resizable: true
+    },
+    align: 'center'
+})
+gridOptions.value = { ...defaultAttribute, ...gridOptions.value }
+
+const yAxisUnit: any = ref('')
+
+const echartsData1: any = ref([]),
+    echartsData2: any = ref([]),
+    echartsData3: any = ref([]),
+    barCharts1 = ref(),
+    barCharts2 = ref(),
+    barCharts3 = ref()
+
+const view = ref(true)
+const view2 = ref(false)
+const showBoxi = ref(true)
+const activeName1 = ref('ssbx')
+const activeName = ref('ssbx')
+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
+}
+const changeView = () => {
+    showBoxi.value = false
+    loading.value = true
+    setTimeout(() => {
+        value.value = theTypeOfValue.value
+        showBoxi.value = true
+    }, 500)
+    setTimeout(() => {
+        loading.value = false
+    }, 1500)
+}
+const bxecharts: any = ref(mainHeight(190).height as any)
+
+const handleClick = (tab: any, event: any) => {
+    loading.value = true
+    setTimeout(() => {
+        activeName.value = tab.paneName
+    }, 500)
+    setTimeout(() => {
+        loading.value = false
+    }, 1500)
+}
+const handleBack = () => {
+    emit('handleHideCharts')
+}
+const setHeight = (h: any, vh: any, num = 1) => {
+    console.log('🚀 ~ setHeight ~ h:', h)
+    if (h != false) {
+        parentHeight.value = h
+    }
+
+    setTimeout(() => {
+        bxecharts.value = mainHeight(vh, num).height
+    }, 100)
+}
+onMounted(() => {})
+defineExpose({ getWpData, setHeight })
+</script>
+<style lang="scss" scoped>
+// .tab_info {
+//     width: 100%;
+//     height: calc(100vh - 450px);
+
+//     // overflow: auto;
+//     // padding-bottom: 20px;
+//     .charts {
+//         width: 100%;
+//         margin-top: 10px;
+//         height: calc(100vh - 450px);
+//     }
+// }
+
+.home {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+
+    .home_header {
+        height: 50px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .el-select {
+            width: 200px !important;
+        }
+    }
+
+    .home_body {
+        // margin-top: 20px;
+        flex: 1;
+    }
+}
+</style>

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

@@ -13,7 +13,7 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import waveFormAnalysis from './components/waveFormAnalysis.vue'
-import { ArrowLeft } from '@element-plus/icons-vue'
+import { ArrowLeft, Message } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import { analyseWave,getFileByEventId } from '@/api/common'
 import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
@@ -134,7 +134,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                          return props.deviceType === '2' || row.wavePath;
+                          return  row.showName != '未知';
                     }
                 },
                 {
@@ -169,10 +169,11 @@ const tableStore: any = new TableStore({
                  icon: 'el-icon-Check',
                  render: 'basicButton',
                  disabled: row => {
-                     return props.deviceType != '2' || row.wavePath;
-                 },
+                    return props.deviceType === '2' && row.wavePath || row.showName === '未知';
+                },
                  click: row => {
                         getFileByEventId(row.id).then(res => { 
+                            ElMessage.success(res.message)
                             tableStore.index()
                         })
                  }   

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="120" title="频率偏差(Hz)"></vxe-column>
+                <vxe-column align="center" field="freqDev" width="140" 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/device/disposition/index.vue

@@ -68,7 +68,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 const pageHeight = mainHeight(20)
 const loading = ref(true)
 
-const tableHeight = mainHeight(140)
+const tableHeight = mainHeight(135)
 const user: any = ref({})
 const tableData = ref([])
 const tableData2 = ref([])

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

@@ -0,0 +1,331 @@
+<template>
+  <div class="default-main device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+    <OfficialUserTree @node-click="selectUser" @selectUser="selectUser"></OfficialUserTree>
+    <div class="device-manage-right" :style="{ height: pageHeight.height }">
+      <div class="el-descriptions__header">
+        <el-button type="primary" @click="getEnginnerDev">添加工程 / 设备</el-button>
+      </div>
+
+      <!-- 使用flex布局平均分配高度 -->
+      <div class="tables-container">
+        <div class="table-wrapper">
+          <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
+            <vxe-column field="name" title="工程名称"></vxe-column>
+            <vxe-column title="操作" width="200px">
+              <template v-slot:default="scoped">
+                <el-button link size="small" type="danger" @click="deleteEngineering(scoped.row)">
+                  移除
+                </el-button>
+              </template>
+            </vxe-column>
+          </vxe-table>
+        </div>
+
+        <!-- 新增设备列表 -->
+        <div class="device-list-section table-wrapper">
+          <vxe-table v-bind="defaultAttribute" :data="deviceTableData" height="auto" style="width: 100%">
+            <vxe-column field="name" title="设备名称"></vxe-column>
+            <vxe-column title="操作" width="200px">
+              <template v-slot:default="scoped">
+                <el-button link size="small" type="danger" @click="deleteDevice(scoped.row)">
+                  移除
+                </el-button>
+              </template>
+            </vxe-column>
+          </vxe-table>
+        </div>
+      </div>
+    </div>
+    
+    <!-- 对话框为左右布局 -->
+    <el-dialog 
+      v-model.trim="dialogVisible" 
+      title="添加工程 / 设备" 
+      class="cn-operate-dialog" 
+      :close-on-click-modal="false"
+      
+    >
+      <div class="dialog-content">
+        <!-- 工程部分 -->
+        <div class="dialog-section">
+          <div class="section-header">
+            <span>工程列表</span>
+            <el-input 
+              maxlength="32" 
+              show-word-limit 
+              v-model.trim="filterText" 
+              placeholder="搜索工程" 
+              clearable 
+              class="search-input"
+            >
+              <template #prefix>
+                <Icon name="el-icon-Search" style="font-size: 16px" />
+              </template>
+            </el-input>
+          </div>
+          
+          <vxe-table 
+            ref="tableRef" 
+            v-bind="defaultAttribute" 
+            :data="tableData2.filter((item: any) => {
+              return item.name.includes(filterText)
+            })" 
+            height="400px" 
+            style="width: 100%"
+          >
+            <vxe-column type="checkbox" width="60"></vxe-column>
+            <vxe-column field="name" title="工程名称"></vxe-column>
+          </vxe-table>
+        </div>
+        
+        <!-- 设备部分 -->
+        <div class="dialog-section">
+          <div class="section-header">
+            <span>设备列表</span>
+            <el-input 
+              maxlength="32" 
+              show-word-limit 
+              v-model.trim="deviceFilterText" 
+              placeholder="搜索设备" 
+              clearable 
+              class="search-input"
+            >
+              <template #prefix>
+                <Icon name="el-icon-Search" style="font-size: 16px" />
+              </template>
+            </el-input>
+          </div>
+          
+          <vxe-table 
+            ref="deviceTableRef" 
+            v-bind="defaultAttribute" 
+            :data="deviceTableData2.filter((item: any) => {
+              return item.name.includes(deviceFilterText)
+            })" 
+            height="400px" 
+            style="width: 100%"
+          >
+            <vxe-column type="checkbox" width="60"></vxe-column>
+            <vxe-column field="name" title="设备名称"></vxe-column>
+          </vxe-table>
+        </div>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="addData">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: 'govern/officialUser/index'
+})
+
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import OfficialUserTree from '@/components/tree/govern/officialUserTree.vue'
+import { mainHeight } from '@/utils/layout'
+import {  queryRunPortableDevByUseId ,queryUnlinkEngineeringByUseId} from '@/api/cs-device-boot/user'
+import { add, removeUserDev, queryDevByUseId } from '@/api/cs-system-boot/official'
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+const pageHeight = mainHeight(20)
+const loading = ref(true)
+
+const user: any = ref({})
+const tableData = ref([])
+const deviceTableData = ref([]) // 设备表格数据
+const tableData2 = ref([]) // 工程数据源
+const deviceTableData2 = ref([]) // 设备数据源
+const dialogVisible = ref(false)
+const filterText = ref('') // 工程搜索文本
+const deviceFilterText = ref('') // 设备搜索文本
+const tableRef = ref()
+const deviceTableRef = ref() // 设备表格引用
+
+const selectUser = (e: any) => {
+  user.value = e
+  loading.value = true
+
+    queryDevByUseId({ userId: e.id }).then((engineeringRes) => {
+        loading.value = false
+        tableData.value = engineeringRes.data.engineeringList || []
+        deviceTableData.value =  engineeringRes.data.portableDevList || []
+  }).catch(() => {
+        loading.value = false
+  })
+}
+
+const getEnginnerDev = () => {
+  filterText.value = ''
+  deviceFilterText.value = ''
+
+  // 同时获取工程和设备数据
+  Promise.all([
+    queryUnlinkEngineeringByUseId({ userId: user.value.id }),
+    queryRunPortableDevByUseId({ userId: user.value.id })
+  ]).then(([engineeringRes, deviceRes]) => {
+    tableData2.value = engineeringRes.data || []
+    deviceTableData2.value = deviceRes.data || []
+    dialogVisible.value = true
+    
+    setTimeout(() => {
+      tableRef.value?.clearCheckboxRow()
+      deviceTableRef.value?.clearCheckboxRow()
+    }, 0)
+  })
+}
+
+const deleteEngineering = (row: any) => {
+  ElMessageBox.confirm('是否移出该工程?', '请确认', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    // 只移除工程，设备列表为空
+    const form = {
+      engineeringList: [row.id],  // 要移除的工程ID
+      portableDevList: [],               // 设备列表为空
+      userId: user.value.id
+    }
+    
+    removeUserDev(form).then((res: any) => {
+      ElMessage.success(res.message)
+      selectUser(user.value)
+    })
+  })
+}
+
+// 删除设备方法
+const deleteDevice = (row: any) => {
+    console.log('删除设备', row)
+  ElMessageBox.confirm('是否移出该设备?', '请确认', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    // 只移除设备，工程列表为空
+    const form = {
+      engineeringList: [],               // 工程列表为空
+      portableDevList: [row.id],   // 要移除的设备ID
+      userId: user.value.id
+    }
+    
+    removeUserDev(form).then((res: any) => {
+      ElMessage.success(res.message)
+      selectUser(user.value)
+    })
+  })
+}
+
+const addData = () => {
+  const selectedEngineers = tableRef.value.getCheckboxRecords()
+  const selectedDevices = deviceTableRef.value.getCheckboxRecords()
+  
+  // 如果没有选择任何项，则提示
+  if (selectedEngineers.length === 0 && selectedDevices.length === 0) {
+    ElMessage.warning('请至少选择一项工程或设备')
+    return
+  }
+  
+  // 构造请求参数对象
+  const form = {
+    engineeringList: [] as any[],
+    portableDevList: [] as any[],
+    userId: user.value.id
+  }
+  
+//   // 处理已有的工程数据
+//   tableData.value.forEach((item: any) => {
+//     form.engineeringList.push(item.id)
+//   })
+  
+//   // 处理已有的设备数据
+//   deviceTableData.value.forEach((item: any) => {
+//     form.portableDevList.push(item.id)
+//   })
+  
+  // 添加新选择的工程
+  selectedEngineers.forEach((item: any) => {
+    form.engineeringList.push( item.id)
+  })
+  
+  // 添加新选择的设备
+  selectedDevices.forEach((item: any) => {
+    form.portableDevList.push(item.id)
+  })
+  
+  // 发送请求
+  add(form).then((res: any) => {
+    ElMessage.success(res.message)
+    selectUser(user.value)
+    dialogVisible.value = false
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.device-manage {
+  display: flex;
+
+  &-right {
+    overflow: hidden;
+    flex: 1;
+    padding: 10px 10px 10px 0;
+    display: flex;
+    flex-direction: column;
+
+    .el-descriptions__header {
+      height: 27px;
+      display: flex;
+      justify-content: flex-end; /* 靠右显示 */
+      align-items: center;
+    }
+
+    .tables-container {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+
+      .table-wrapper {
+        flex: 1;
+        min-height: 0;
+
+        &:first-child {
+          margin-bottom: 10px;
+        }
+      }
+    }
+  }
+}
+
+.dialog-content {
+  display: flex;
+  gap: 20px;
+  
+  .dialog-section {
+    flex: 1;
+    
+    .section-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 10px;
+      
+      span {
+        font-weight: bold;
+        font-size: 16px;
+      }
+      
+      .search-input {
+        width: 200px;
+      }
+    }
+  }
+}
+</style>

src/views/govern/manage/monthly.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader datePicker ref="refheader" >
+        <TableHeader datePicker ref="refheader">
             <template v-slot:select>
                 <el-form-item label="关键字筛选">
                     <el-input
@@ -138,10 +138,17 @@ const tableStore = new TableStore({
             }
         },
 
-        { title: '在线率(%)', fixed: 'right',width: 100, field: 'onlineRate', sortable: true },
-        { title: '完整性(%)', fixed: 'right',width: 100, field: 'integrity', sortable: true }
+        { title: '在线率(%)', fixed: 'right', width: 100, field: 'onlineRate', sortable: true },
+        { title: '完整性(%)', fixed: 'right', width: 100, field: 'integrity', sortable: true }
     ],
     beforeSearchFun: () => {},
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.process = item.process == 2 ? '功能调试' : item.process == 3 ? '出厂调试' : '正式投运'
+            return item
+        })
+        console.log('🚀 ~ tableStore.table.allData:', tableStore.table.allData)
+    },
     loadCallback: () => {
         let name = tableStore.table.params.name
         let data = tableStore.table.copyData.filter(item => {
@@ -149,10 +156,6 @@ const tableStore = new TableStore({
             item.latestTime = item.latestTime || '/'
             // 需要检查的字段列表
             const fieldsToCheck = ['projectName', 'engineeringName', 'mac', 'devName', 'lineName']
-            console.log(
-                '🚀 ~ fieldsToCheck.some(field => item[field]?.includes(name)):',
-                fieldsToCheck.some(field => item[field]?.includes(name))
-            )
 
             // 检查任何一个字段包含搜索名称
             return fieldsToCheck.some(field => item[field]?.includes(name))
@@ -182,7 +185,10 @@ const exportTab = () => {
         sheetName: 'Sheet1',
         type: 'xlsx', //导出文件类型 xlsx 和 csv
         useStyle: true,
-        data: tableStore.table.copyData, // 数据源 // 过滤那个字段导出
+        data: tableStore.table.copyData.filter(item => {
+            item.process = item.process == 2 ? '功能调试' : item.process == 3 ? '出厂调试' : '正式投运'
+            return item
+        }), // 数据源 // 过滤那个字段导出
         columnFilterMethod: function (column: any) {
             return !(
                 column.column.title === undefined ||