修改测试问题

修改组件管理时间线配置

.env.ypt

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

.env.zl

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

.gitignore

@@ -23,3 +23,5 @@ dist-ssr
 *.sln
 *.sw?
 pnpm-lock.yaml
+
+#test

package.json

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

src/api/algorithm-boot/scopeConfig.ts

@@ -0,0 +1,42 @@
+import createAxios from '@/utils/request'
+
+/**
+ * 删除数据合理范围
+ **/
+export const pqDelete = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/delete',
+        method: 'post',
+        params: data
+    })
+}
+/**
+ * 按条件获取数据合理范围
+ **/
+export const getData = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/getData',
+        method: 'post',
+        data
+    })
+}
+/**
+ * 新增数据合理范围
+ **/
+export const save = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/save',
+        method: 'post',
+         data
+    })
+}
+/**
+ * 更新数据合理范围
+ **/
+export const update = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/update',
+        method: 'post',
+         data
+    })
+}

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

@@ -1,6 +1,6 @@
 import createAxios from '@/utils/request'
 
-// 装置基础数据和模板数据
+// 设备基础数据和模板数据
 export function getDeviceData(deviceId: string, type: string, lineId: string) {
     let form = new FormData()
     form.append('deviceId', deviceId)
@@ -142,3 +142,11 @@ export function getModuleState(data?: any) {
         params: data
     })
 }
+//获取运行取数
+export function getRawData(data?: any) {
+    return createAxios({
+        url: '/cs-device-boot/pqsCommunicate/getRawData',
+        method: 'POST',
+         data
+    })
+}

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

@@ -1,4 +1,4 @@
-import createAxios from "@/utils/request";
+import createAxios from '@/utils/request'
 
 //根据Id获取台账信息
 export function getInfoById(id: any) {
@@ -11,7 +11,6 @@ export function getInfoById(id: any) {
     })
 }
 
-
 //工程查询通过id获取
 export function getEngineerById(id: any) {
     let form = new FormData()
@@ -23,7 +22,6 @@ export function getEngineerById(id: any) {
     })
 }
 
-
 //项目查询通过id获取
 export function getProjectById(id: any) {
     let form = new FormData()
@@ -53,7 +51,7 @@ export function getById(id: any) {
     return createAxios({
         url: '/cs-device-boot/csline/getById',
         method: 'POST',
-         data: form
+        data: form
     })
 }
 
@@ -75,13 +73,15 @@ export function addLedger(data: any) {
 }
 
 //修改-删除项目
-export function deleteProject(id: any,name:any,area:any,description:any,status:any) {
+export function deleteProject(id: any, name: any, area: any, description: any, status: any, sort: any, topoIds: any) {
     let form = new FormData()
     form.append('id', id)
     form.append('name', name)
     form.append('area', area)
     form.append('description', description)
     form.append('status', status)
+    form.append('sort', sort)
+    form.append('topoIds', topoIds)
     return createAxios({
         url: '/cs-device-boot/project/auditAppProject',
         method: 'post',
@@ -105,7 +105,7 @@ export const deleteLine = (id: any) => {
     let form = new FormData()
     form.append('id', id)
     return createAxios({
-       url: '/cs-device-boot/csline/delCldLine',
+        url: '/cs-device-boot/csline/delCldLine',
         method: 'POST',
         data: form
     })
@@ -120,7 +120,6 @@ export function updateEquipment(data: any) {
     })
 }
 
-
 //修改监测点
 export function updateLine(data: any) {
     return createAxios({
@@ -134,8 +133,7 @@ export function updateLine(data: any) {
 export function pushLog() {
     return createAxios({
         url: '/cs-device-boot/csTerminalLogs/pushCldInfo',
-        method: 'post',
+        method: 'post'
-      
     })
 }
 
@@ -143,7 +141,14 @@ export function pushLog() {
 export function queryPushResult() {
     return createAxios({
         url: '/cs-device-boot/csTerminalReply/queryData',
-        method: 'post',
+        method: 'post'
-       
+    })
+}
+//查询升级日志
+export function getByDevId(data: any) {
+    return createAxios({
+        url: '/cs-device-boot/csUpgradeLogs/getByDevId',
+        method: 'get',
+        params:data
     })
 }

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

@@ -14,7 +14,7 @@ export function getGroup(dataSet: string) {
     })
 }
 
-// 装置分组实时数据
+// 设备分组实时数据
 export function deviceHisData(data: any) {
     return createAxios({
         url: '/cs-device-boot/csGroup/deviceHistoryData',
@@ -33,7 +33,7 @@ export function deviceHisData(data: any) {
     })
 }
 
-// 装置分组历史数据
+// 设备分组历史数据
 export function deviceRtData(data: any) {
     let form = new FormData()
     form.append('id', data.id)
@@ -51,7 +51,7 @@ export function deviceRtData(data: any) {
         data: form
     })
 }
-// 装置分组历史数据
+// 设备分组历史数据
 export function realTimeData(data: any) {
     let form = new FormData()
     form.append('id', data.id)
@@ -76,7 +76,7 @@ export function getTestData(data: any) {
         data
     })
 }
-// 设备监控-删除装置测试项
+// 设备监控-删除设备测试项
 export function deleteItem(data: any) {
     return createAxios({
         url: '/cs-device-boot/wlRecord/deleteItem',

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

@@ -1,17 +1,26 @@
 import createAxios from '@/utils/request'
 
 // 设备列表
-export function getDeviceTree() {
+export function getDeviceTree(params?: any) {
     return createAxios({
         url: '/cs-device-boot/csLedger/deviceTree',
-        method: 'POST'
+        method: 'POST',
+        params
     })
 }
 
 // 监测点列表
-export function getLineTree() {
+export function getLineTree(params?: any) {
     return createAxios({
         url: '/cs-device-boot/csLedger/lineTree',
+        method: 'POST',
+        params
+    })
+}
+// 监测点列表治理
+export function objTree() {
+    return createAxios({
+        url: '/cs-device-boot/csLedger/objTree',
         method: 'POST'
     })
 }
@@ -24,4 +33,11 @@ export function getCldTree() {
         method: 'POST'
     })
 }
+//报表树
+export function lineTree() {
+    return createAxios({
+        url: '/cs-device-boot/csLedger/lineTree',
+        method: 'POST'
+    })
+}
 

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

@@ -1,41 +1,90 @@
 import request from '@/utils/request'
 
 // 新增程序版本
-export const addEdData = (data) => {
+export const addEdData = data => {
     return request({
         url: '/cs-device-boot/edData/addEdData',
         method: 'post',
         headers: {
-            'Content-Type': 'multipart/form-data',
+            'Content-Type': 'multipart/form-data'
         },
-        data: data,
+        data: data
     })
 }
 
-export const auditEdData = (data) => {
+export const auditEdData = data => {
     return request({
         url: '/cs-device-boot/edData/auditEdData',
         method: 'post',
         headers: {
-            'Content-Type': 'multipart/form-data',
+            'Content-Type': 'multipart/form-data'
         },
-        data: data,
+        data: data
     })
 }
 // 修改-删除工程
-export const auditEngineering = (data:any)=> {
+export const auditEngineering = (data: any) => {
     return request({
         url: '/cs-device-boot/engineering/auditEngineering',
         method: 'post',
-        data: data,
+        data: data
     })
 }
 // 修改项目
-export const updateProject = (data:any) => {
+export const updateProject = (data: any) => {
     return request({
         url: '/cs-device-boot/project/updateProject',
         method: 'post',
 
-        data: data,
+        data: data
     })
 }
+// 新增工程
+export const addEngineering = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/addEngineering',
+        method: 'post',
+        data: data
+    })
+}
+// 修改工程
+export const updateEngineering = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/updateEngineering',
+        method: 'post',
+        data: data
+    })
+}
+// 刪除工程
+export const deleteEngineering = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/deleteEngineering',
+        method: 'post',
+        params: data
+    })
+}
+// 刪除項目
+export const deleteProject = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/deleteProject',
+        method: 'post',
+        params: data
+    })
+}
+// 新增项目
+export const addProject = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/addProject',
+        method: 'post',
+        data: data
+    })
+}
+// 修改项目
+export const updateProjects = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/updateProject',
+        method: 'post',
+        data: data
+    })
+}
+

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

@@ -15,7 +15,54 @@ export function getFileServiceFileOrDir(data) {
         method: 'POST'
     })
 }
-
+// 监测设备-目录信息询问
+export function listDir(data) {
+    return createAxios({
+        url: `/zl-event-boot/file/listDir`,
+        method: 'POST',
+        data: data
+    })
+}
+// 下载文件
+export function downloadFileFromFrontr(data: any) {
+    return createAxios({
+        url: `/zl-event-boot/file/downloadFileFromFront`,
+        method: 'POST',
+        data: data,
+        responseType: 'blob'
+    })
+}
+// 删除文件
+export function deleteCld(data: any) {
+    return createAxios({
+        url: `/zl-event-boot/file/delete`,
+        method: 'POST',
+        data: data
+    })
+}
+// 新建文件
+export function mkdir(data: any) {
+    return createAxios({
+        url: `/zl-event-boot/file/mkdir`,
+        method: 'POST',
+        data: data
+    })
+}
+//  上传文件
+export function uploadFileToFront(obj: any) {
+    let form = new FormData()
+    form.append('file', obj.file)
+    form.append('devId', obj.devId)
+    form.append('dirPath', obj.dirPath)
+    return createAxios({
+        url: `/zl-event-boot/file/uploadFileToFront`,
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        data: form
+    })
+}
 //设备文件下载
 export function downLoadDeviceFile(data) {
     return createAxios({
@@ -38,7 +85,7 @@ export function downLoadDeviceFilePath(obj) {
         data: form
     })
 }
-//装置重启
+//设备重启
 export function reStartDevice(data) {
     return createAxios({
         url: `/cs-device-boot/EquipmentDelivery/rebootDevice?nDid=${data.nDid}`,
@@ -46,7 +93,7 @@ export function reStartDevice(data) {
     })
 }
 
-//上传文件至装置
+//上传文件至设备
 export function uploadDeviceFile(data) {
     let form = new FormData()
     form.append('file', data.file)

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,5 +1,5 @@
 import createAxios from '@/utils/request'
-
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 // 查询设备数据趋势
 export function getDeviceDataTrend(data: any) {
     return createAxios({
@@ -9,8 +9,6 @@ export function getDeviceDataTrend(data: any) {
     })
 }
 
-
-
 // 波形下载
 export function getFileZip(params: any) {
     return createAxios({
@@ -20,3 +18,42 @@ export function getFileZip(params: any) {
         responseType: 'blob'
     })
 }
+
+export function exportModel(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/exportmodel/exportModel',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
+    })
+}
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}

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

@@ -48,3 +48,52 @@ export function getztProjectTree() {
         method: 'post',
     })
 }
+
+//根据用户id获取组件信息
+export function getByUserId(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/cspage/getByUserId',
+        method: 'post',
+        params: data
+    })
+}
+//c保存组态界面与用户的关系
+export function savePageIdWithUser(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/cspage/savePageIdWithUser',
+        method: 'post',
+        params: data
+    })
+}
+//新增稳态指标方案
+export function save(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/save',
+        method: 'post',
+        data: data
+    })
+}
+//修改稳态指标方案
+export function update(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/update',
+        method: 'post',
+        data: data
+    })
+}
+//新增稳态指标方案
+export function deletePlan(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/delete',
+        method: 'post',
+        data: data
+    })
+}
+//根据ID查询稳态指标方案
+export function getById(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/getById',
+        method: 'GET',
+        params: data
+    })
+}

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

@@ -3,12 +3,12 @@ import createAxios from '@/utils/request'
 // 获取设备补召页面数据
 export function getMakeUpData(data: any) {
     return createAxios({
-        url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data,
+        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}`,
@@ -25,3 +25,19 @@ export function offlineDataUploadMakeUp(data: any) {
         data
     })
 }
+//设备补召操作
+// 根据id集合获取敏感负荷用户列表
+export function getListByIds() {
+    return createAxios({
+        url: '/cs-harmonic-boot/pqSensitiveUser/getListByIds',
+        method: 'POST'
+    })
+}
+// 根据id集合获取敏感负荷用户列表
+export function getList(data) {
+    return createAxios({
+        url: '/cs-harmonic-boot/pqSensitiveUser/getList',
+        method: 'POST',
+        data
+    })
+}

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

@@ -17,14 +17,53 @@ export const queryAppInfo = (type: string) => {
     })
 }
 
-
 /**
  * 新增app基础信息
  **/
-export const addAppInfo = (data: { type: string, content: string }) => {
+export const addAppInfo = (data: { type: string; content: string }) => {
     return createAxios({
         url: '/cs-system-boot/appinfo/addAppInfo',
         method: 'post',
         data: data
     })
 }
+/**
+ * 切换告警配置启用状态
+ **/
+export const toggleActive = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/toggleActive',
+        method: 'post',
+        params: data
+    })
+}
+/**
+ * 切换告警配置启用状态
+ **/
+export const csDelete = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/delete',
+        method: 'post',
+        params: data
+    })
+}
+/**
+ * 新增告警配置
+ **/
+export const add = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/add',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改告警配置
+ **/
+export const update = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/update',
+        method: 'post',
+        data: data
+    })
+}

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

@@ -85,7 +85,7 @@ export const portableDeviceRegister = (params: any) => {
 export const portableDeviceAccess = (data: any) => {
     return createAxios({
         url: `/access-boot/device/wlAccess?nDid=${data.nDid}`,
-        method: 'POST',
+        method: 'POST'
     })
 }
 // 下载模版
@@ -96,3 +96,26 @@ export function getExcelTemplate() {
         responseType: 'blob'
     })
 }
+// 查询工程信息列表
+export function engineeringProject() {
+    return createAxios({
+        url: '/cs-device-boot/engineeringProjectRelation/list',
+        method: 'post'
+    })
+}
+//监测设备接入
+export function onlineRegister(data: any) {
+    return createAxios({
+        url: '/access-boot/device/onlineRegister',
+        method: 'post',
+        params: data
+    })
+}
+//重启设备
+export function resetFactory(data: any) {
+    return createAxios({
+        url: '/access-boot/device/resetFactory',
+        method: 'post',
+        params: data
+    })
+}

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

@@ -18,3 +18,13 @@ export function downLoadFile(filePath: any) {
         params: { filePath: filePath }
     })
 }
+
+//获取文件的一个短期url
+export function getFileUrl(filePath: any) {
+    return createAxios({
+        url: '/system-boot/file/getFileUrl',
+        method: 'get',
+        // responseType: 'blob',
+        params: { filePath: filePath }
+    })
+}

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

@@ -0,0 +1,49 @@
+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
+    })
+}
+/**
+ * 短信配置
+ */
+export const addUserDevices = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/appMsgSet/addUserDevices',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 短信配置
+ */
+export const queryDeviceIdsByUserId = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/appMsgSet/queryDeviceIdsByUserId',
+        method: 'post',
+        params: data
+    })
+}

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

@@ -0,0 +1,299 @@
+import request from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+// 主要监测点列表查询>>分页
+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'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
+    })
+}
+
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}

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,11 +98,19 @@ export function getDataByTempId(params) {
 //根据部门查询模板
 export function getTemplateByDept(params) {
     return createAxios({
-        url: '/harmonic-boot/customReport/getTemplateByDept',
+        url: '/cs-harmonic-boot/customReport/getTemplateByDept',
         method: 'get',
         params
     })
 }
+// 获取模版
+export function querySysExcel(params) {
+    return createAxios({
+        url: '/cs-harmonic-boot/sysExcel/querySysExcel',
+        method: 'post',
+        params
+    })
+}
 //资源管理 查询数据
 export function queryData(data) {
     return createAxios({
@@ -144,7 +155,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 +163,56 @@ 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'
     })
 }
+//新增模版
+export function addSysExcel(data:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcel/addSysExcel',
+        method: 'post',
+        data
+    })
+}
+//修改模版
+export function updateSysExcel(data:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcel/updateSysExcel',
+        method: 'post',
+        data
+    })
+}
+//删除模版
+export function deleteSysExcel(params:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcel/deleteSysExcel',
+        method: 'post',
+        params
+    })
+}
+//查詢綁定
+export function queryList(params:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcelRelation/queryList',
+        method: 'post',
+        params
+    })
+}
+//綁定
+export function bandRelation(data:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcelRelation/bandRelation',
+        method: 'post',
+        data
+    })
+}

src/api/system-boot/csDictData.ts

@@ -116,3 +116,11 @@ export const start = (params: any) => {
         params
     })
 }
+// 查询监测对象类型
+export const getDicDataByTypeCode = (params: any) => {
+    return request({
+        url: '/system-boot/dictData/getDicDataByTypeCode',
+        method: 'get',
+        params
+    })
+}

src/api/system-boot/csstatisticalset.ts

@@ -54,6 +54,14 @@ export const activatePage = (params: any) => {
         params
     })
 }
+// 全局的驾驶舱页面
+export const scopePage = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/scopePage',
+        method: 'post',
+        params
+    })
+}
 // 查询激活的驾驶舱页面
 export const queryActivatePage = () => {
     return createAxios({

src/api/system-boot/dictTree.ts

@@ -88,8 +88,25 @@ export const updateStatistical = (data: any) => {
 // 单位绑定
 export function codeDicTree(data: any) {
     return createAxios({
-        url: '/system-boot/dictTree/codeDicTree',
+        // url: '/system-boot/dictTree/codeDicTree',
-        method: 'get',
+        url: '/system-boot/dictTree/queryByCodeList',
+        method: 'post',
         params: data
     })
 }
+// 根据装置型号获取装置类型
+export function findByDevTypeId(data: any) {
+    return createAxios({
+        url: '/cs-device-boot/edData/queryEdDataPage',
+        method: 'post',
+        data
+    })
+}
+// 装置升级
+export function upgrade(params: any) {
+    return createAxios({
+        url: '/zl-event-boot/device/upgrade',
+        method: 'get',
+        params
+    })
+}

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/api/user-boot/roleFuction.ts

@@ -8,14 +8,26 @@ export function getFunctionsByRoleIndex(data) {
     })
 }
 
-export function updateRoleMenu(data:any) {
+export function updateRoleMenu(data: any) {
     return createAxios({
         url: '/user-boot/function/assignFunctionByRoleIndexes',
         method: 'post',
         data: data
-        // params: roleIndex,functionIndexList
+    })
-        // data:{
+}
-        //   roleIndex,functionIndexList
+// 新增角色与系统关系
-        // }
+export function systemAdd(data: any) {
+    return createAxios({
+        url: '/user-boot/sysRoleSystem/add',
+        method: 'post',
+        data: data
+    })
+}
+// 根据角色id获取系统信息
+export function getSystemByRoleId(params: any) {
+    return createAxios({
+        url: '/user-boot/sysRoleSystem/getSystemByRoleId',
+        method: 'get',
+        params
     })
 }

src/components/cockpit/F47Curve/index.vue

@@ -1,6 +1,14 @@
 <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,35 +16,74 @@
             <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" draggable title="瞬时/RMS波形" append-to-body width="70%">
+        <el-dialog v-model="isWaveCharts" v-if="isWaveCharts" draggable :title="dialogTitle" append-to-body width="70%">
-            <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
+            <waveFormAnalysis
-            @handleHideCharts="isWaveCharts = false" :wp="wp" />
+                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 waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import TableHeader from '@/components/table/header/index.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { analyseWave } from '@/api/common'
-import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue';
+import { ElMessage } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    height: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
-const echartList = 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()
 // 波形
@@ -46,7 +93,10 @@ const loading = ref(false)
 
 const wp = ref({})
 
-const OverLimitDetailsRef = ref()
+const boxoList: any = ref({})
+
+const waveFormAnalysisRef: any = ref(null)
+
 const data = reactive({
     name: '事件个数',
     gs: 0,
@@ -54,33 +104,25 @@ 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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     loadCallback: () => {
-        let res = {
+        const gongData = gongfunction(tableStore.table.data)
-            data: { totalNumberOfEvents: 0, voltageToleranceCurveDataList: [] }
+        data.gs = tableStore.table.data.length
-        }
+        data.krr = gongData.pointF.length
-
+        data.bkrr = gongData.pointFun.length
-        const gongData = gongfunction(res.data.voltageToleranceCurveDataList)
-        data.gs = res.data.voltageToleranceCurveDataList.length
-        data.krr = gongData.pointI.length
-        data.bkrr = gongData.pointIun.length
-        console.log(gongData)
         echartList.value = {
-            // backgroundColor: "#f9f9f9", //地图背景色深蓝
             title: {
                 text: `F47曲线`
             },
             legend: {
-                // data: ['上限', '下限', '可容忍事件', '不可容忍事件'],
                 data: ['可容忍事件', '不可容忍事件'],
                 itemWidth: 10,
                 itemHeight: 10,
@@ -105,8 +147,9 @@ const tableStore: any = new TableStore({
                 backgroundColor: 'rgba(0,0,0,0.55)',
                 borderWidth: 0,
                 formatter: function (a: any) {
-                    var relVal = ''
+                    var relVal = `<strong>${a.seriesName}</strong><br/>`
-                    relVal = "<font style='color:" + "'>发生时间:" + a.value[2] + '</font><br/>'
+
+                    relVal += "<font style='color:" + "'>发生时间:" + a.value[2] + '</font><br/>'
                     relVal += "<font style='color:" + "'>持续时间:" + a.value[0] + 's</font><br/>'
                     relVal += "<font style='color:" + "'>特征幅值:" + a.value[1].toFixed(2) + '%</font>'
                     return relVal
@@ -127,11 +170,16 @@ const tableStore: any = new TableStore({
             yAxis: [
                 {
                     type: 'value',
-                    max: function (value: any) {
+                    // max: function (value: any) {
-                        return value.max + 20
+                    //     return value.max + 20
+                    // },
+                    max: function (value) {
+                        // 先取原始最大值+20，再向上取整到最近的10的倍数，确保刻度够用且规整
+                        return Math.ceil((value.max + 20) / 10) * 10
                     },
-                    splitNumber: 10,
+                    // splitNumber: 10,
-                    minInterval: 0.1,
+                    // interval: 10,
+                    // minInterval: 10,
                     name: '%'
                 }
             ],
@@ -162,36 +210,28 @@ const tableStore: any = new TableStore({
                         type: 'scatter',
                         symbol: 'circle',
                         symbolSize: 8,
-                        // data: gongData.pointF,
+                        data: gongData.pointF,
-                        data: [
+                        // data: [
-                            [0.2, 10, '2023-01-01 10:00:00'],
+                        //     [0.2, 10, '2023-01-01 10:00:00'],
-                            [0.4, 50, '2023-01-01 11:00:00']
+                        //     [0.4, 50, '2023-01-01 11:00:00']
-                        ],
+                        // ],
-                        legendSymbol: 'circle',
+                        legendSymbol: 'circle'
-                        emphasis: {
+
-                            focus: 'series',
+                        //     tooltip: {
-                            itemStyle: {
+                        //         show: true,
-                                borderColor: '#fff',
+                        //         trigger: 'item',
-                                borderWidth: 2,
+                        //         formatter: function (params: any) {
-                                shadowBlur: 10,
+                        //             return `<strong>可容忍事件</strong><br/>
-                                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        // 持续时间: ${params.value[0]}s<br/>
-                            }
+                        // 特征幅值: ${params.value[1].toFixed(2)}%<br/>
-                        },
+                        // 发生时间: ${params.value[2] || 'N/A'}`
-                        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: 'rect',
+                        symbol: 'circle',
                         symbolSize: 8,
                         data: gongData.pointFun,
                         legendSymbol: 'rect'
@@ -206,6 +246,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
@@ -225,8 +284,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
@@ -373,22 +433,55 @@ onMounted(() => {
 
 // 点击事件处理函数
 const handleChartClick = (params: any) => {
-
     if (params.seriesName === '可容忍事件') {
         // 处理可容忍事件点击
-        ElMessage.info(`点击了可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
+        dialogTitle.value = '可容忍事件波形分析'
         handleTolerableEventClick(params)
     } else if (params.seriesName === '不可容忍事件') {
+        dialogTitle.value = '不可容忍事件波形分析'
         // 处理不可容忍事件点击
-        ElMessage.info(`点击了不可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
+        // ElMessage.info(`点击了不可容忍事件: 持续时间${params.value[0]}s, 幅值${params.value[1].toFixed(2)}%`)
-        handleIntolerableEventClick(params)
+        handleTolerableEventClick(params)
     }
 }
 
 // 可容忍事件点击处理函数
-const handleTolerableEventClick = (params: any) => {
+const handleTolerableEventClick = async (row: any) => {
-    console.log('可容忍事件详情:', params)
+    loading.value = true
-    isWaveCharts.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)
+    })
 }
 
 // 不可容忍事件点击处理函数
@@ -403,12 +496,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/crossingTime/index.vue

@@ -0,0 +1,308 @@
+<template>
+    <div>
+        <!--暂态越限时间分布 -->
+        <TableHeader
+            ref="TableHeaderRef"
+            :timeKeyList="prop.timeKey"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <my-echart
+            class="tall"
+            :options="echartList1"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+            }"
+        />
+        <!-- <my-echart
+            class="mt10"
+            :options="echartList1"
+            :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 } from 'vue'
+import TableStore from '@/utils/tableStore'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useConfig } from '@/stores/config'
+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 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 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
+}
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/csevent/getEventCoords',
+    method: 'POST',
+    showPage: false,
+    column: [],
+    beforeSearchFun: () => {
+        setTime()
+    },
+    loadCallback: () => {
+        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: 260
+                    },
+                    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
+        }
+    }
+})
+
+const tableRef = ref()
+provide('tableRef', tableRef)
+
+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,
+    (newVal, oldVal) => {
+        tableStore.index()
+    },
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped></style>

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 TableHeader from '@/components/table/header/index.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const data = [
+
-    {
+const headerHeight = ref(57)
-        name: '来自电网',
+
-        value: 4
+const TableHeaderRef = ref()
-    },
+
-    {
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-        name: '来自负荷',
+    headerHeight.value = height
-        value: 41
+
+    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'
+const fullscreen = computed(() => {
-    },
+    const w = Number(prop.w)
-    legend: {
+    const h = Number(prop.h)
-        orient: 'vertical',
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
-        top: 'center',
+        // 执行相应逻辑
-        right: '5%',
+        return true
-        formatter: function (e: any) {
+    } else {
-            return e + '   ' + data.filter(item => item.name == e)[0].value + '次'
+        return false
-        }
-    },
-    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 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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
-    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

@@ -1,145 +1,148 @@
 <template>
     <!-- 指标日趋势图 -->
-    <el-dialog draggable title="指标日趋势图" v-model="dialogVisible" append-to-body width="70%">
+    <el-dialog draggable :title="dialogTitle" v-model="dialogVisible" append-to-body width="70%">
-        <my-echart
+        <div :style="pageHeight">
-            class="tall"
+            <my-echart class="tall" :options="echartList" style="width: 100%" />
-            :options="echartList"
+        </div>
-            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'
+import { mainHeight } from '@/utils/layout'
+import { limitExtentDayData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { yMethod } from '@/utils/echartMethod'
 const prop = defineProps({
-    width: { type: String },
+    width: { type: [String, Number] },
-    height: { type: String },
+    height: { type: [String, Number] },
-    timeKey: { type: String },
+    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 echartList = ref({
+const dialogText = ref('')
-    title: {
-        text: '35kV进线谐波含有率',
-    },
 
-    xAxis: {
+const echartList = ref()
-        type: 'time',
+
-        axisLabel: {
+const init = () => {
-            formatter: {
+    echartList.value = {
-                day: '{MM}-{dd}',
+        title: {
-                month: '{MM}',
+            text: dialogText.value
-                year: '{yyyy}'
+        },
+        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: [{}, {}],
+        yAxis: {},
-    grid: {
+
-        left: '10px',
+        options: {
-        right: '20px'
+            series: []
-    },
+        }
-    options: {
+    }
-        series: [
+}
-            {
+
-                //   name: '暂降次数',
+const initData = async (row: any) => {
-                type: 'bar',
+    limitExtentDayData({ code: row.code, lineId: row.lineId, time: row.time }).then(res => {
-                name: '有功功率',
+        if (res.data && res.data.length > 0) {
-                data: [
+            // 重新初始化图表
-                    ['2025-10-16 07:00:00', 10],
+            init()
-                    ['2025-10-16 07:15:00', 10],
+            let [min, max] = yMethod(res.data.map((item: any) => item.value.split(',')).flat())
-                    ['2025-10-16 07:30:00', 10],
+
-                    ['2025-10-16 07:45:00', 10],
+            // 从第一条数据中提取时间作为x轴数据
-                    ['2025-10-16 08:00:00', 30],
+
-                    ['2025-10-16 08:15:00', 50],
+            // 定义相位颜色映射
-                    ['2025-10-16 08:30:00', 60],
+            const phaseColors: any = {
-                    ['2025-10-16 08:45:00', 70],
+                A: '#DAA520',
-                    ['2025-10-16 09:00:00', 100],
+                B: '#2E8B57',
-                    ['2025-10-16 09:15:00', 120],
+                C: '#A52a2a'
-                    ['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],
+            const seriesData = res.data
-                    ['2025-10-16 10:30:00', 130],
+                .filter(item => item.valueType == 'max')
-                    ['2025-10-16 10:45:00', 120],
+                .sort((a, b) => {
-                    ['2025-10-16 11:00:00', 140],
+                    return a.phasic.localeCompare(b.phasic)
-                    ['2025-10-16 11:15:00', 80],
+                })
-                    ['2025-10-16 11:30:00', 70],
+                .map((item: any) => {
-                    ['2025-10-16 11:45:00', 90],
+                    const xAxisData = item.time.split(',')
-                    ['2025-10-16 12:00:00', 60],
+                    const values = xAxisData.map((time: string, index: number) => {
-                    ['2025-10-16 12:15:00', 60],
+                        // 将传入的日期与时间拼接成完整的时间字符串
-                    ['2025-10-16 12:30:00', 60],
+                        const fullTime = `${row.time} ${time}`
-                    ['2025-10-16 12:45:00', 60]
+                        const value = parseFloat(item.value.split(',')[index]) || 0
-                ],
+                        return [fullTime, value]
-                itemStyle: {
+                    })
-                    normal: {
+
-                        //这里是颜色
+                    return {
-                        color: function (params: any) {
+                        name: `${item.phasic}相`,
-                            if (params.value[1] == 0 || params.value[1] == 3.14159) {
+                        type: 'line',
-                                return '#ccc'
+                        showSymbol: false,
-                            } else {
+                        smooth: true,
-                                return config.layout.elementUiPrimary[0]
+                        data: values,
+                        itemStyle: {
+                            normal: {
+                                // 根据相位设置对应颜色
+                                color: phaseColors[item.phasic] || config.layout.elementUiPrimary[0]
                             }
                         }
                     }
-                },
+                })
-                yAxisIndex: 0
+            echartList.value.yAxis.max = max
-            },
+            echartList.value.yAxis.min = min
-            {
+            // 更新图表配置
-                name: '谐波总畸变率',
+            echartList.value.options.series = seriesData
-                type: 'line',
+            // 注意：使用时间轴时不需要设置 xAxis.data
-                showSymbol: false,
+        }
-                smooth: true,
+    })
-                data: [
+}
-                    ['2025-10-16 07:00:00', 0],
+onMounted(() => {})
-                    ['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
-            }
-        ]
-    }
-})
-
-
-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 })

src/components/cockpit/exceedanceLevel/index.vue

@@ -1,74 +1,70 @@
 <template>
     <div>
         <!--指标越限程度 -->
-        <my-echart
+        <TableHeader ref="TableHeaderRef" :showReset="false" @selectChange="selectChange" datePicker
-            class="tall"
+            :timeKeyList="prop.timeKey" v-if="fullscreen"></TableHeader>
-            :options="echartList"
+        <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"
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} / 2 )`" isGroup></Table>
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`" isGroup></Table>
         <!-- 指标日趋势图 -->
-        <DailyTrendChart ref="dailyTrendChartRef" />
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" :showIndex="false" />
+        <!-- <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 { ElMessage, ElMessageBox } from 'element-plus'
 import DailyTrendChart from '@/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue'
+import { getTime } from '@/utils/formatTime'
+import HarmonicRatio‌ from '@/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue'
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    height: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    title: {
-        text: '指标越限严重度'
-    },
 
-    xAxis: {
+const TableHeaderRef = ref()
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
 
-    yAxis: {
+const headerHeight = ref(57)
-        name: '%', // 给X轴加单位
+const harmonicRatio‌Ref: any = ref(null)
-        interval: 20
+const dialogTrendChart = ref(false)
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 7.5, 36, 0, 80],
-                barMaxWidth: 30
 
-                // label: {
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-                //     show: true,
+    headerHeight.value = height
-                //     position: 'top',
+
-                //     textStyle: {
+    if (datePickerValue && datePickerValue.timeValue) {
-                //         //数值样式
+        // 更新时间参数
-                //         color: '#000'
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
-                //     },
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
-                //     fontSize: 12
+    }
-                // }
+}
-            }
+// 计算是否全屏展示
-        ]
+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 dailyTrendChartRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/limitRateDetailD/limitExtentData',
     method: 'POST',
 
     showPage: false,
@@ -90,82 +86,81 @@ const tableStore: any = new TableStore({
 
         {
             title: '越限最大值',
-            field: 'type',
+            field: 'maxValue',
-            minWidth: '60',
+            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',
+            field: 'extent',
-            minWidth: '60'
+            minWidth: '70',
+            formatter: (row: any) => {
+                return Math.floor(row.cellValue * 100) / 100
+            }
         },
         {
-            title: '发生日期',
+            title: '越限时间',
-            field: 'type3',
+            field: 'time',
-            minWidth: '100'
+            minWidth: '60',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
         {
             title: '越限最高监测点',
-            field: 'type4',
+            field: 'lineName',
-            minWidth: '90'
+            minWidth: '90',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
+        // 定义 x 轴标签顺序
-            {
-                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电焊机(治理前)'
-            }
-        ]
 
+        echartList.value = {
+            title: {
+                text: '指标越限严重度'
+            },
+
+            xAxis: {
+                data: tableStore.table.data.map((item: any) => item.name)
+            },
+
+            yAxis: {
+                name: '%' // 给X轴加单位
+                // interval: 20
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            options: {
+                series: [
+                    {
+                        type: 'bar',
+                        name: '越限占比',
+                        data: tableStore.table.data.map((item: any) => Math.floor(item.extent * 100) / 100),
+                        barMaxWidth: 30
+                    }
+                ]
+            }
+        }
     }
 })
 
@@ -173,15 +168,62 @@ const tableRef = ref()
 provide('tableRef', tableRef)
 
 provide('tableStore', tableStore)
-
+const codeMap = [
+    { key: '闪变', code: 'flickerOvertime' },
+    { key: '电压偏差', code: 'voltageDevOvertime' },
+    { key: '三相', code: 'ubalanceOvertime' },
+    { key: '谐波电压', code: 'uharm' },
+    { key: '谐波电流', code: 'iharm' },
+];
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field != 'name') {
+    dialogTrendChart.value = true
-        console.log(row)
+
-        dailyTrendChartRef.value.open(row)
+    if (column.field == 'maxValue') {
+        if (row.lineId == null) {
+            ElMessage.info('暂无越限监测点！')
+        } else {
+            nextTick(() => {
+                // dailyTrendChartRef.value.open(row)
+                dialogFlag.value = true
+                nextTick(() => {
+
+                    const code = codeMap.find(item => row.name.includes(item.key))?.code || '';
+                    harmonicRatio‌Ref.value.openDialog(row, code, column.title.replace(/次/g, ""))
+                })
+            })
+        }
+
     }
 }
 
+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 dialogFlag = ref(false)
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+    dialogFlag.value = false
+    // 重新打开指标越限详情弹窗
+
+}
+
+
 onMounted(() => {
     tableStore.index()
 })
@@ -192,15 +234,15 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 
-const addMenu = () => {}
+const addMenu = () => { }
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/governanceReport/index.vue

@@ -1,26 +1,43 @@
 <template>
     <div>
         <!--治理效果报表 -->
-        <TableHeader :showReset="false" v-if="fullscreen">
+        <TableHeader
+            :showReset="false"
+            :timeKeyList="prop.timeKey"
+            ref="TableHeaderRef"
+            datePicker
+            @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"
+                        filterable
-                        placeholder="请选择治理对象"
+                        v-model="tableStore.table.params.tempId"
+                        placeholder="请选择模板策略"
                         clearable
-                        style="width: 130px"
                     >
                         <el-option
-                            v-for="item in powerList"
+                            v-for="item in templateList"
-                            :key="item.value"
+                            :key="item.id"
-                            :label="item.label"
+                            :label="item.excelName"
-                            :value="item.value"
+                            :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>
             <template v-slot:operation>
-                <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
+                <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出</el-button>
             </template>
         </TableHeader>
         <div style="display: flex">
@@ -35,74 +52,82 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h, computed } from 'vue'
+import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import { exportExcel } from '@/views/govern/reportForms/export.js'
 import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { getTime } from '@/utils/formatTime'
-import MyEchart from '@/components/echarts/MyEchart.vue'
+import { ElMessage } from 'element-plus'
-import { useConfig } from '@/stores/config'
-import Json from './index.json'
-
 const prop = defineProps({
-    w: { type: String },
+    w: { type: [String, Number] },
-    h: { type: String },
+    h: { type: [String, Number] },
-    width: { type: String },
+    width: { type: [String, Number] },
-    height: { type: String },
+    height: { type: [String, Number] },
-    timeKey: { type: String },
+    timeKey: { type: Array as () => string[] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
-})
+    interval: { type: Number }
-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: () => {}
 })
 
-const tableRef = ref()
+const TableHeaderRef = ref()
-provide('tableRef', tableRef)
-tableStore.table.params.power = '1'
 
-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()
+        } else {
+            querySysExcel({}).then(res => {
+                templateList.value = res.data.filter(item => item.excelType == 4)
+                if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
+                    tableStore.table.params.tempId = templateList.value[0].id
+                }
+            })
+            tableStore.table.loading = false
+        }
+    })
+}
+
+const templateListData = () => {
+    querySysExcel({}).then(res => {
+        templateList.value = res.data.filter(item => item.excelType == 4)
+        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)
@@ -114,6 +139,65 @@ const fullscreen = computed(() => {
         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
+        // }
+        // if( !tableStore.table.params.tempId){
+        //     return ElMessage.warning('请选择模板')
+        // }
+    },
+    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]
+        tableStore.table.params.startTime = time[0]
+        tableStore.table.params.endTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
@@ -121,19 +205,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) {
+// :deep(.el-select) {
-    min-width: 80px;
+//     min-width: 80px;
-}
+// }
 </style>

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

@@ -0,0 +1,717 @@
+<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: 90px !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="item.name.includes('间谐波') ? vv - 0.5 : 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('gridSide_exceedTheLimit').then(res => {
+        queryCsDictTree(res.data.id).then(item => {
+            //排序
+            indexOptions.value = item.data.sort((a: any, b: any) => {
+                return a.sort - b.sort
+            })
+            let codeKey = field.includes('flickerOvertime')
+                ? '闪变'
+                : field.includes('uharm')
+                ? '谐波电压'
+                : field.includes('iharm')
+                ? '谐波电流'
+                : field.includes('voltageDevOvertime')
+                ? '电压偏差'
+                : field.includes('ubalanceOvertime')
+                ? '不平衡'
+                : ''
+
+            // const titleMap: Record<string, number> = {
+            //     flickerOvertime: 0,
+            //     uaberranceOvertime: 3,
+            //     ubalanceOvertime: 4,
+            //     freqDevOvertime: 5
+            // }
+
+            // let defaultIndex = 0 // 默认值
+            let defaultIndex = indexOptions.value.findIndex((item: any) => item.name.includes(codeKey)) || 0
+            // if (field in titleMap) {
+            //     defaultIndex = titleMap[field]
+            // } else if (field.includes('uharm')) {
+            //     defaultIndex = indexOptions.value.findIndex((item: any) => item.code === 'uharm')
+            // } else if (field.includes('iharm')) {
+            //     defaultIndex = indexOptions.value.findIndex((item: any) => item.code === 'iharm')
+            // }
+
+            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.includes('间谐波电压')) {
+                                    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.includes('间谐波电压')) {
+                item.name = '间谐波电压次数'
+            } else if (item.name.includes('谐波电流')) {
+                item.name = '谐波电流次数'
+            } else if (item.name.includes('谐波电压')) {
+                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,192 @@
+<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.lineName"
+                                :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: '电压偏差越限(%)',
+            field: 'voltageDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+
+
+        // {
+        //     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,interval:any,list:any) => {
+    dialogVisible.value = true
+     options.value = list
+    // initCSlineList()
+    tableStore.table.params.lineId = row.lineId
+
+    nextTick(() => {
+        tableHeaderRef.value.setInterval(interval)
+       setTimeout(() => {
+            tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime =searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+       },100)
+    })
+
+}
+
+// 点击行
+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,28 @@
 <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 +31,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 OverLimitDetails from '@/components/cockpit/gridSideStatistics/components/overLimitDetails.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { gridSideLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { getTime } from '@/utils/formatTime'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    height: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    title: {
-        text: '指标越限占比'
-    },
 
-    xAxis: {
+const headerHeight = ref(57)
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
 
-    yAxis: {
+const echartList = ref({})
-        name: '%', // 给X轴加单位
-        interval: 20
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 45, 22, 0, 70],
-                barMaxWidth: 30,
 
-                // label: {
+const TableHeaderRef = ref()
-                //     show: true,
+
-                //     position: 'top',
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-                //     textStyle: {
+    headerHeight.value = height
-                //         //数值样式
+
-                //         color: '#000'
+    if (datePickerValue && datePickerValue.timeValue) {
-                //     },
+        // 更新时间参数
-                //     fontSize: 12
+        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,77 +142,67 @@ const tableStore: any = new TableStore({
         },
         {
             title: '名称',
-            field: 'name',
+            field: 'lineName',
             minWidth: '90'
         },
         {
             title: '越限占比(%)',
             children: [
                 {
-                    title: '闪变',
+                    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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        tableStore.table.params.interval = TableHeaderRef.value?.datePickerRef?.interval || 3
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '1#变压器电网侧',
-                type: '0',
-                type1: '45',
-                type2: '22',
-                type3: '0',
-                type4: '70'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
+        initEcharts()
     }
 })
 
@@ -166,28 +213,51 @@ provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field != 'name') {
+    OverLimitDetailsRef.value.open(
-        console.log(row)
+        row,
-        OverLimitDetailsRef.value.open(row)
+        tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
-    }
+        tableStore.table.params.searchEndTime || prop.timeValue?.[1],
+        tableStore.table.params.interval || prop.interval,
+         tableStore.table.data
+    )
 }
 
 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/indicatorCrossingTime/index.vue

@@ -0,0 +1,480 @@
+<template>
+    <div>
+        <!--指标越限时间分布
+         -->
+        <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"
+                v-if="lineShow"
+                :options="echartList1"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+                }"
+            />
+            <el-empty
+                v-else
+                description="暂无监测点"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}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 TableHeader from '@/components/table/header/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { limitProbabilityData, cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+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 options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
+
+const lineList = ref()
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+const lineShow = ref(true)
+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 => {
+        if (res.data.length == 0) {
+            lineShow.value = false
+            return (tableStore.table.loading = false)
+        }
+        lineShow.value = true
+        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
+                    }
+                })
+            }
+
+            // 计算 z 轴最大值（最大值加 5）
+            const zAxisMax = Math.ceil(maxValue) + 5
+            // 构造 yAxis 数据（指标类型名称）
+            const yAxisData = sortedData.map(item => item.indexName)
+
+            echartList.value = {
+                title: {
+                    text: '指标越限概率分布'
+                },
+                options: {
+                    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 yIndex = params.value[1] //获取y轴索引
+                            var tips = ''
+                            tips += '指标类型: ' + yAxisData[yIndex] + '</br>'
+                            tips += '越限程度: ' + params.seriesName + '</br>'
+                            tips += '越限天数: ' + params.value[2] + '</br>'
+                            return tips
+                        }
+                    },
+
+                    // 移除或隐藏 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: 260,
+                            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 tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/limitRateDetailD/limitTimeProbabilityData',
+    method: 'POST',
+    showPage: false,
+    column: [],
+    beforeSearchFun: () => {
+        setTime()
+        // 只有当 lineList 已加载且有数据时才设置默认 lineId
+        if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
+            tableStore.table.params.lineId = lineList.value[0].lineId
+        }
+    },
+    loadCallback: () => {
+        // 处理返回的数据，将其转换为图表所需格式
+        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()
+    }
+})
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    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 => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+    (newVal, oldVal) => {
+        tableStore.index()
+    },
+    {
+        deep: true
+    }
+)
+
+const addMenu = () => {}
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/indicatorDetails/index.vue

@@ -1,26 +1,38 @@
 <template>
     <div>
         <!--指标越限明细 -->
-
+        <TableHeader
-        <el-calendar v-model="value" :style="{ height: prop.height, overflow: 'auto' }">
+            :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
+                    <el-tooltip effect="dark" placement="top" :hide-after="0" v-if="getTextForDate(data.day)">
-                        effect="dark"
-                        placement="top"
-                        :hide-after="0"
-                        v-if="list?.filter(item => item.time == data.day)[0]?.text || false"
-                    >
                         <template #content>
-                            <span v-html="list?.filter(item => item.time == data.day)[0]?.text || ''"></span>
+                            <span v-html="getTextForDate(data.day)"></span>
                         </template>
-                        <div
+                         <div class="details" v-html="fullscreen ? getTextForDate(data.day) : '有越限'"></div>
-                            :style="{ height: `calc(${prop.height} / 5 - 47px)`, overflow: 'auto' }"
-                            v-html="list?.filter(item => item.time == data.day)[0]?.text || ''"
-                        ></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 TableHeader from '@/components/table/header/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 { 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 },
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-    height: { type: String },
+    headerHeight.value = height
-    timeKey: { type: String },
+
-    timeValue: { type: Object }
+    if (datePickerValue && datePickerValue.timeValue) {
-})
+        // 更新时间参数
-const list = ref([
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
-    {
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
-        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 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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
-        // value.value = new Date(prop.timeValue?.[0])
     },
     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 = []
+    const data = list.value?.find((item: any) => item.time === value)
-    data = list.value?.filter(item => item.time == value)
 
-    if (data && data?.length > 0) {
+    if (data) {
-        if (data[0].key < 10) {
+        // 根据 status 值返回对应的颜色
-            return '#33996690'
+        switch (data.key) {
-        } else if (data[0].key < 80) {
+            case 0: // 无越限
-            return '#FFCC3390'
+                return '#33996690'
-        } else if (data[0].key <= 100) {
+            case 1: // 一般越限
-            return '#Ff660090'
+                return '#FFCC3390'
+            case 2: // 严重越限
+                return '#Ff660090'
+            default:
+                return '#fff' // 默认白色背景
         }
     }
 
-    return '#fff'
+    return '#fff' // 默认白色背景
 }
 
-provide('tableRef', tableRef)
-
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
+    nextTick(() => {
-})
-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-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,463 @@
 <template>
     <div>
         <!--指标越限概率分布 -->
-        <my-echart
+        <TableHeader
-            class="tall"
+            :showReset="false"
-            :options="echartList"
+            :timeKeyList="prop.timeKey"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
+            ref="TableHeaderRef"
-        />
+            @selectChange="selectChange"
-        <my-echart
+            datePicker
-            class="mt10"
+            v-if="fullscreen"
-            :options="echartList1"
+        >
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 - 10px)` }"
+            <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
+                v-if="lineShow"
+                class="tall"
+                :options="echartList"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+                }"
+            />
+            <el-empty
+                v-else
+                description="暂无监测点"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}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 { limitProbabilityData, cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    height: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
+const lineShow = ref(true)
-    options: {
+// const options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
-        xAxis: null,
-        yAxis: null,
-        dataZoom: null,
-        backgroundColor: '#fff',
-        tooltip: {
-            // trigger: 'axis'
-            textStyle: {
-                color: '#fff',
-                fontStyle: 'normal',
-                opacity: 0.35,
-                fontSize: 14
-            },
-            backgroundColor: 'rgba(0,0,0,0.55)',
-            borderWidth: 0,
-            formatter: function (params: any) {
-                console.log(params)
-                var tips = ''
-                for (var i = 0; i < params.length; i++) {
-                    tips += params[i].name + '</br/>'
-                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
-                }
-                return tips
-            }
-        },
-        title: {
-            text: '指标越限概率分布',
-            x: 'center'
-        },
 
-        visualMap: {
+const lineList = ref()
-            max: 20,
+
-            show: false,
+const headerHeight = ref(57)
-            inRange: {
+
-                color: ['#313695', '#00BB00', '#ff8000', '#a50026']
+const TableHeaderRef = ref()
-            }
+
-        },
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-        xAxis3D: {
+    headerHeight.value = height
-            type: 'category',
+
-            name: '指标越限',
+    if (datePickerValue && datePickerValue.timeValue) {
-            data: ['0-10', '10-20', '20-30', '30-40', '40-50'],
+        // 更新时间参数
-            axisLine: {
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
-                lineStyle: {
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
-                    color: '#111'
+    }
-                }
+}
-            },
+
-            axisLabel: {
+// 计算是否全屏展示
-                color: '#111'
+const fullscreen = computed(() => {
-            }
+    const w = Number(prop.w)
-        },
+    const h = Number(prop.h)
-        yAxis3D: {
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
-            type: 'category',
+        // 执行相应逻辑
-            name: '指标类型',
+        return true
-            data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'],
+    } else {
-            nameTextStyle: {
+        return false
-                color: '#111'
+    }
-            },
+})
-            axisLine: {
+
-                show: true,
+const echartList = ref()
-                lineStyle: {
+
-                    color: '#111'
+const echartList1 = ref()
-                }
+
-            },
+const probabilityData = ref()
-            axisLabel: {
+
-                color: '#111'
+const initLineList = async () => {
-            },
+    cslineList({}).then(res => {
-            splitLine: {
+        if (res.data.length == 0) {
-                lineStyle: {
+            lineShow.value = false
-                    // 使用深浅的间隔色
+            return (tableStore.table.loading = false)
-                    color: ['#111'],
+        }
-                    type: 'dashed',
+        lineShow.value = true
-                    opacity: 0.5
+        lineList.value = res.data
-                }
+        tableStore.table.params.lineId = lineList.value[0].lineId
-            }
+        tableStore.index()
-        },
+    })
-        zAxis3D: {
+}
-            type: 'value',
+
-            splitNumber: 10,
+// 越限程度概率分布
-            minInterval: 10,
+const initProbabilityData = () => {
-            name: '越限占比'
+    // 只有当 lineList 已加载且有数据时才设置默认 lineId
-        },
+    if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
-        grid3D: {
+        tableStore.table.params.lineId = lineList.value[0].lineId
-            viewControl: {
+    }
-                projection: 'perspective',
+    const params = {
-                distance: 250
+        searchBeginTime: tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
-            },
+        searchEndTime: tableStore.table.params.searchEndTime || prop.timeValue?.[1],
-            boxWidth: 200,
+        lineId: tableStore.table.params.lineId
-            boxDepth: 80,
+    }
-            light: {
+    limitProbabilityData(params).then((res: any) => {
-                main: {
+        probabilityData.value = res.data
-                    intensity: 1.2
+
-                },
+        // 处理接口返回的数据，转换为图表所需格式
-                ambient: {
+        if (res.data && Array.isArray(res.data)) {
-                    intensity: 0.3
+            // 定义指标类型顺序
-                }
+            const indicatorOrder = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差']
-            }
+            // 按照指定顺序排序数据
-        },
+            const sortedData = [...res.data].sort((a, b) => {
-        series: [
+                return indicatorOrder.indexOf(a.indexName) - indicatorOrder.indexOf(b.indexName)
-            {
+            })
-                type: 'bar3D',
+
-                data: [
+            // 构造 series 数据
-                    [0, 0, 1],
+            const seriesData: any = []
-                    [0, 1, 1],
+            let maxValue: any = 0 // 用于存储数据中的最大值
-                    [0.2, 1]
+            // 遍历每个越限程度区间（0-20%, 20-40%, 40-60%, 60-80%, 80-100%）
-                ],
+            for (let xIndex = 0; xIndex < 5; xIndex++) {
-                shading: 'realistic',
+                // 遍历每个指标类型
-                label: {
+                sortedData.forEach((item, yIndex) => {
-                    show: false,
+                    // 从 extentGrades 中获取对应区间的值
-                    textStyle: {
+                    const extentGrade = item.extentGrades[xIndex]
-                        fontSize: 16,
+                    const value = extentGrade ? (Object.values(extentGrade)[0] as number) : 0
-                        borderWidth: 1
+                    seriesData.push([xIndex, yIndex, value])
+
+                    // 更新最大值
+                    if (value > maxValue) {
+                        maxValue = value
                     }
-                },
+                })
+            }
 
-                itemStyle: {
+            // 计算 z 轴最大值（最大值加 5）
-                    opacity: 1
+            const zAxisMax = Math.ceil(maxValue) + 5
+            // 构造 yAxis 数据（指标类型名称）
+            const yAxisData = sortedData.map(item => item.indexName)
+
+            echartList.value = {
+                title: {
+                    text: '指标越限概率分布'
                 },
-                emphasis: {
+                options: {
-                    label: {
+                    backgroundColor: '#fff',
+                    tooltip: {
                         textStyle: {
-                            fontSize: 20,
+                            color: '#fff',
-                            color: '#900'
+                            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'
+                    // 移除或隐藏 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: 260,
+                            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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        // 只有当 lineList 已加载且有数据时才设置默认 lineId
+        if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
+            tableStore.table.params.lineId = lineList.value[0].lineId
+        }
     },
     loadCallback: () => {
-        tableStore.table.data = []
+        // 处理返回的数据，将其转换为图表所需格式
+        const indexNames: any = [...new Set(tableStore.table.data.map((item: any) => item.indexName))]
+        const timePeriods = [...new Set(tableStore.table.data.map((item: any) => item.timePeriod))]
+
+        // 构建系列数据
+        const seriesData = indexNames.map((indexName: string) => {
+            const dataIndex = tableStore.table.data.filter((item: any) => item.indexName === indexName)
+            return {
+                name: indexName,
+                type: 'line',
+                symbol: 'none',
+                data: dataIndex.map((item: any) => [item.timePeriod, item.times])
+            }
+        })
+
+        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 +465,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,716 @@
+<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="item.name.includes('间谐波') ? vv - 0.5 : 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('gridSide_exceedTheLimit').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
+            // }
+            let codeKey = field.includes('flickerOvertime')
+                ? '闪变'
+                : field.includes('uharm')
+                ? '谐波电压'
+                : field.includes('iharm')
+                ? '谐波电流'
+                : field.includes('voltageDevOvertime')
+                ? '电压偏差'
+                : field.includes('ubalanceOvertime')
+                ? '不平衡'
+                : ''
+            let defaultIndex = indexOptions.value.findIndex((item: any) => item.name.includes(codeKey)) || 0
+
+            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,188 @@
+<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.lineName"
+                                :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: '电压偏差越限(分钟)',
+            field: 'uaberranceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '三相不平衡度越限(分钟)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('iharm')
+        },
+
+        // {
+        //     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,data:any=[]) => {
+    dialogVisible.value = true
+    // initCSlineList()
+    options.value = data
+    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,82 @@
 <template>
     <div>
         <!--主要监测点列表 -->
-        <TableHeader :showReset="false" >
+        <TableHeader
+            :showReset="false"
+            :timeKeyList="prop.timeKey"
+            @selectChange="selectChange"
+            v-if="fullscreen"
+            
+            ref="TableHeaderRef"
+        >
             <template v-slot:select>
-                <el-form-item label="关键词">
+                <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/indicatorFittingChart/components/overLimitDetails.vue'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import { useRoute } from 'vue-router'
-const prop = defineProps({
+import { useTimeCacheStore } from '@/stores/timeCache'
-    width: { type: String },
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
-})
-const dictData = useDictData()
-const OverLimitDetailsRef = ref()
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
 
-    showPage: false,
+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 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: '/cs-harmonic-boot/mainLine/list',
+    method: 'POST',
+    showPage: fullscreen.value ? true : false,
     exportName: '主要监测点列表',
     column: [
         {
@@ -48,95 +89,91 @@ 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'
+            minWidth: '90',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
         {
             title: '是否治理',
-            field: 'whetherToGovern',
+            field: 'govern',
-            minWidth: '70'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
 
-        { title: '主要存在的电能质量问题', field: 'question', minWidth: '150' }
+        { title: '主要存在的电能质量问题', field: 'problems', minWidth: '150', showOverflow: true }
     ],
     beforeSearchFun: () => {
-    tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     loadCallback: () => {
-
-        tableStore.table.data = [
-            {
-                name: '10kV1#电动机',
-                type: '电动机',
-                whetherToGovern: '否',
-                question: '3次谐波电压、5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '10kV2#(治理后)',
-                type: '电焊机',
-                whetherToGovern: '100A APF',
-                question: '所有指标均合格'
-            },
-            {
-                name: '380V电焊机(治理前)',
-                type: '电焊机',
-                whetherToGovern: '100A APF',
-                question: '5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '380V水泵机',
-                type: '电动机',
-                whetherToGovern: '否',
-                question: '所有指标均合格'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
     }
 })
 
 const tableRef = ref()
 provide('tableRef', tableRef)
-tableStore.table.params.type = ''
+tableStore.table.params.keywords = ''
-tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field == 'name') {
+    if (column.field == 'lineName') {
-        console.log(row)
+       
-        OverLimitDetailsRef.value.open(row)
+        let  time = getTimeOfTheMonth('3');
+        OverLimitDetailsRef.value.open(
+            row,
+           time[0],
+            time[1],
+            tableStore.table.data
+        )
     }
 }
 
+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,
+    () => prop.timeValue,
-    val => {
-        tableStore.index()
-    }
-)
-watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 

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

@@ -7,27 +7,70 @@
                     <el-select
                         v-model="tableStore.table.params.searchValue"
                         placeholder="请选择谐波次数"
-                        style="width: 240px"
+                        style="width: 150px"
                     >
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                        <el-option
+                            v-for="item in harmonicOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="指标类型">
+                <el-form-item label="指标类型" v-show="!tableStore.table.params.checked">
                     <el-select
-                        v-model="tableStore.table.params.searchValue"
+                        v-model="tableStore.table.params.indicatorType"
                         placeholder="请选择指标类型"
-                        style="width: 240px"
+                        style="width: 150px"
                     >
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                        <el-option
+                            v-for="item in indicatorList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="指标类型1" v-show="tableStore.table.params.checked == true">
+                    <el-select
+                        v-model="tableStore.table.params.indicatorType1"
+                        placeholder="请选择指标类型1"
+                        style="width: 150px"
+                    >
+                        <el-option
+                            v-for="item in indicatorList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="指标类型2" v-show="tableStore.table.params.checked == true">
+                    <el-select
+                        v-model="tableStore.table.params.indicatorType2"
+                        placeholder="请选择指标类型2"
+                        style="width: 150px"
+                    >
+                        <el-option
+                            v-for="item in indicatorList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-checkbox v-model="tableStore.table.params.checked">指标对比分析</el-checkbox>
+                </el-form-item>
             </template>
         </TableHeader>
         <my-echart
             class="tall"
+            v-if="!tableStore.table.params.checked"
             :options="echartList"
             style="width: 98%; height: 320px"
         />
+        <my-echart class="tall" v-else :options="echartContrastList" style="width: 98%; height: 320px" />
     </el-dialog>
 </template>
 
@@ -39,9 +82,9 @@ import { getTimeOfTheMonth } from '@/utils/formatTime'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
 const prop = defineProps({
-    width: { type: String },
+    width: { type:  [String, Number]},
-    height: { type: String },
+    height: { type:  [String, Number]},
-    timeKey: { type: String },
+    timeKey: { type:  [String, Number]},
     timeValue: { type: Object }
 })
 
@@ -55,16 +98,12 @@ const options = [
 ]
 
 const config = useConfig()
-const powerList: any = ref([
+
-    {
+const harmonicOptions = Array.from({ length: 50 }, (_, i) => ({
-        label: '三相总有功功率',
+    value: String(i + 1),
-        value: '1'
+    label: `${i + 1}次谐波`
-    },
+}))
-    {
+
-        label: '三相总无功功率',
-        value: '2'
-    }
-])
 const exceedingTheLimitList: any = ref([
     {
         label: '越限',
@@ -95,9 +134,8 @@ const indicatorList: any = ref([
 ])
 const echartList = ref({
     title: {
-        text: '35kV进线谐波含有率',
+        text: '谐波电压含有率'
     },
-
     xAxis: {
         type: 'time',
         axisLabel: {
@@ -108,7 +146,6 @@ const echartList = ref({
             }
         }
     },
-
     yAxis: [{}, {}],
     grid: {
         left: '10px',
@@ -117,51 +154,171 @@ const echartList = ref({
     options: {
         series: [
             {
-                //   name: '暂降次数',
+                name: 'A相',
-                type: 'bar',
+                type: 'line',
-                name: '有功功率',
+                showSymbol: false,
+                smooth: true,
                 data: [
-                    ['2025-10-16 07:00:00', 10],
+                    ['2025-10-16 07:00:00', 0.5],
-                    ['2025-10-16 07:15:00', 10],
+                    ['2025-10-16 07:15:00', 0.6],
-                    ['2025-10-16 07:30:00', 10],
+                    ['2025-10-16 07:30:00', 0.4],
-                    ['2025-10-16 07:45:00', 10],
+                    ['2025-10-16 07:45:00', 0.7],
-                    ['2025-10-16 08:00:00', 30],
+                    ['2025-10-16 08:00:00', 1.2],
-                    ['2025-10-16 08:15:00', 50],
+                    ['2025-10-16 08:15:00', 1.5],
-                    ['2025-10-16 08:30:00', 60],
+                    ['2025-10-16 08:30:00', 1.8],
-                    ['2025-10-16 08:45:00', 70],
+                    ['2025-10-16 08:45:00', 2.1],
-                    ['2025-10-16 09:00:00', 100],
+                    ['2025-10-16 09:00:00', 2.5],
-                    ['2025-10-16 09:15:00', 120],
+                    ['2025-10-16 09:15:00', 2.8],
-                    ['2025-10-16 09:30:00', 130],
+                    ['2025-10-16 09:30:00', 3.0],
-                    ['2025-10-16 09:45:00', 140],
+                    ['2025-10-16 09:45:00', 2.7],
-                    ['2025-10-16 10:00:00', 160],
+                    ['2025-10-16 10:00:00', 2.2],
-                    ['2025-10-16 10:15:00', 160],
+                    ['2025-10-16 10:15:00', 1.9],
-                    ['2025-10-16 10:30:00', 130],
+                    ['2025-10-16 10:30:00', 1.6],
-                    ['2025-10-16 10:45:00', 120],
+                    ['2025-10-16 10:45:00', 1.3],
-                    ['2025-10-16 11:00:00', 140],
+                    ['2025-10-16 11:00:00', 1.1],
-                    ['2025-10-16 11:15:00', 80],
+                    ['2025-10-16 11:15:00', 0.8],
-                    ['2025-10-16 11:30:00', 70],
+                    ['2025-10-16 11:30:00', 0.6],
-                    ['2025-10-16 11:45:00', 90],
+                    ['2025-10-16 11:45:00', 0.4],
-                    ['2025-10-16 12:00:00', 60],
+                    ['2025-10-16 12:00:00', 0.3],
-                    ['2025-10-16 12:15:00', 60],
+                    ['2025-10-16 12:15:00', 0.2],
-                    ['2025-10-16 12:30:00', 60],
+                    ['2025-10-16 12:30:00', 0.3],
-                    ['2025-10-16 12:45:00', 60]
+                    ['2025-10-16 12:45:00', 0.4]
                 ],
-                itemStyle: {
-                    normal: {
-                        //这里是颜色
-                        color: function (params: any) {
-                            if (params.value[1] == 0 || params.value[1] == 3.14159) {
-                                return '#ccc'
-                            } else {
-                                return config.layout.elementUiPrimary[0]
-                            }
-                        }
-                    }
-                },
                 yAxisIndex: 0
             },
             {
-                name: '谐波总畸变率',
+                name: 'B相',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0.4],
+                    ['2025-10-16 07:15:00', 0.5],
+                    ['2025-10-16 07:30:00', 0.3],
+                    ['2025-10-16 07:45:00', 0.6],
+                    ['2025-10-16 08:00:00', 1.0],
+                    ['2025-10-16 08:15:00', 1.3],
+                    ['2025-10-16 08:30:00', 1.6],
+                    ['2025-10-16 08:45:00', 1.9],
+                    ['2025-10-16 09:00:00', 2.2],
+                    ['2025-10-16 09:15:00', 2.5],
+                    ['2025-10-16 09:30:00', 2.7],
+                    ['2025-10-16 09:45:00', 2.4],
+                    ['2025-10-16 10:00:00', 2.0],
+                    ['2025-10-16 10:15:00', 1.7],
+                    ['2025-10-16 10:30:00', 1.4],
+                    ['2025-10-16 10:45:00', 1.1],
+                    ['2025-10-16 11:00:00', 0.9],
+                    ['2025-10-16 11:15:00', 0.7],
+                    ['2025-10-16 11:30:00', 0.5],
+                    ['2025-10-16 11:45:00', 0.3],
+                    ['2025-10-16 12:00:00', 0.2],
+                    ['2025-10-16 12:15:00', 0.1],
+                    ['2025-10-16 12:30:00', 0.2],
+                    ['2025-10-16 12:45:00', 0.3]
+                ],
+                yAxisIndex: 0
+            },
+            {
+                name: 'C相',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0.6],
+                    ['2025-10-16 07:15:00', 0.7],
+                    ['2025-10-16 07:30:00', 0.5],
+                    ['2025-10-16 07:45:00', 0.8],
+                    ['2025-10-16 08:00:00', 1.4],
+                    ['2025-10-16 08:15:00', 1.7],
+                    ['2025-10-16 08:30:00', 2.0],
+                    ['2025-10-16 08:45:00', 2.3],
+                    ['2025-10-16 09:00:00', 2.8],
+                    ['2025-10-16 09:15:00', 3.1],
+                    ['2025-10-16 09:30:00', 3.3],
+                    ['2025-10-16 09:45:00', 3.0],
+                    ['2025-10-16 10:00:00', 2.5],
+                    ['2025-10-16 10:15:00', 2.1],
+                    ['2025-10-16 10:30:00', 1.8],
+                    ['2025-10-16 10:45:00', 1.5],
+                    ['2025-10-16 11:00:00', 1.3],
+                    ['2025-10-16 11:15:00', 1.0],
+                    ['2025-10-16 11:30:00', 0.8],
+                    ['2025-10-16 11:45:00', 0.6],
+                    ['2025-10-16 12:00:00', 0.5],
+                    ['2025-10-16 12:15:00', 0.4],
+                    ['2025-10-16 12:30:00', 0.5],
+                    ['2025-10-16 12:45:00', 0.6]
+                ],
+                yAxisIndex: 0
+            },
+            {
+                name: '暂降触发点',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 3.14159],
+                    ['2025-10-16 07:15:00', 3.14159],
+                    ['2025-10-16 07:30:00', 3.14159],
+                    ['2025-10-16 07:45:00', 3.14159],
+                    ['2025-10-16 08:00:00', 3.14159],
+                    ['2025-10-16 08:15:00', 3.14159],
+                    ['2025-10-16 08:30:00', 3.14159],
+                    ['2025-10-16 08:45:00', 3.14159],
+                    ['2025-10-16 09:00:00', 3.14159],
+                    ['2025-10-16 09:15:00', 3.14159],
+                    ['2025-10-16 09:30:00', 3.14159],
+                    ['2025-10-16 09:45:00', 3.14159],
+                    ['2025-10-16 10:00:00', 3.14159],
+                    ['2025-10-16 10:15:00', 3.14159],
+                    ['2025-10-16 10:30:00', 3.14159],
+                    ['2025-10-16 10:45:00', 3.14159],
+                    ['2025-10-16 11:00:00', 3.14159],
+                    ['2025-10-16 11:15:00', 3.14159],
+                    ['2025-10-16 11:30:00', 3.14159],
+                    ['2025-10-16 11:45:00', 3.14159],
+                    ['2025-10-16 12:00:00', 3.14159],
+                    ['2025-10-16 12:15:00', 3.14159],
+                    ['2025-10-16 12:30:00', 3.14159],
+                    ['2025-10-16 12:45:00', 3.14159]
+                ],
+                lineStyle: {
+                    type: 'dashed',
+                    color: '#ff0000' // 红色
+                },
+                itemStyle: {
+                    color: '#ff0000' // 红色
+                },
+                yAxisIndex: 0
+            }
+        ]
+    }
+})
+
+const echartContrastList = ref({
+    title: {
+        text: 'A相谐波电压和A相谐波电流对比趋势图'
+    },
+    xAxis: {
+        type: 'time',
+        axisLabel: {
+            formatter: {
+                day: '{MM}-{dd}',
+                month: '{MM}',
+                year: '{yyyy}'
+            }
+        }
+    },
+    yAxis: [{}, {}],
+    grid: {
+        left: '10px',
+        right: '20px'
+    },
+    options: {
+        series: [
+            {
+                name: 'A相谐波电压',
                 type: 'line',
                 showSymbol: false,
                 smooth: true,
@@ -191,11 +348,45 @@ const echartList = ref({
                     ['2025-10-16 12:30:00', 0],
                     ['2025-10-16 12:45:00', 0]
                 ],
+                yAxisIndex: 0
+            },
+            {
+                name: 'A相谐波电流',
+                type: 'line',
+                showSymbol: false,
+                smooth: true,
+                data: [
+                    ['2025-10-16 07:00:00', 0],
+                    ['2025-10-16 07:15:00', 0],
+                    ['2025-10-16 07:30:00', 0],
+                    ['2025-10-16 07:45:00', 0],
+                    ['2025-10-16 08:00:00', 0],
+                    ['2025-10-16 08:15:00', 0.05],
+                    ['2025-10-16 08:30:00', 0.05],
+                    ['2025-10-16 08:45:00', 0.05],
+                    ['2025-10-16 09:00:00', 0.5],
+                    ['2025-10-16 09:15:00', 0.5],
+                    ['2025-10-16 09:30:00', 0.5],
+                    ['2025-10-16 09:45:00', 0.5],
+                    ['2025-10-16 10:00:00', 0.4],
+                    ['2025-10-16 10:15:00', 0.4],
+                    ['2025-10-16 10:30:00', 0.4],
+                    ['2025-10-16 10:45:00', 0.4],
+                    ['2025-10-16 11:00:00', 0.4],
+                    ['2025-10-16 11:15:00', 0.05],
+                    ['2025-10-16 11:30:00', 0.05],
+                    ['2025-10-16 11:45:00', 0.05],
+                    ['2025-10-16 12:00:00', 0],
+                    ['2025-10-16 12:15:00', 0],
+                    ['2025-10-16 12:30:00', 0],
+                    ['2025-10-16 12:45:00', 0]
+                ],
                 yAxisIndex: 1
             }
         ]
     }
 })
+
 const headerHeight = ref(57)
 const selectChange = (showSelect: any, height: any) => {
     headerHeight.value = height
@@ -219,6 +410,10 @@ tableStore.table.params.power = '1'
 tableStore.table.params.indicator = '1'
 tableStore.table.params.exceedingTheLimit = '1'
 tableStore.table.params.searchValue = ''
+tableStore.table.params.checked = false
+tableStore.table.params.indicatorType = '' // 指标类型
+tableStore.table.params.indicatorType1 = '' // 指标类型1
+tableStore.table.params.indicatorType2 = '' // 指标类型2
 provide('tableStore', tableStore)
 
 onMounted(() => {

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

@@ -0,0 +1,116 @@
+<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: '三相不平衡度越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        },
+        {
+            title: '电压偏差越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        },
+        {
+            title: '频率偏差越限(分钟)',
+            field: 'flicker',
+            width: '100'
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('voltage')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('harmonicCurrent')
+        },
+     
+    ],
+    beforeSearchFun: () => {},
+    loadCallback: () => {
+       
+    }
+})
+
+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

@@ -8,7 +8,7 @@
                         <el-select
                             v-model="tableStore.table.params.searchValue"
                             placeholder="请选择监测点名称"
-                            style="width: 240px"
+                            style="width: 150px"
                         >
                             <el-option
                                 v-for="item in options"
@@ -84,7 +84,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(分钟)',
+            title: '长时闪变越限(分钟)',
             field: 'flicker',
             width: '80',
             render: 'customTemplate',
@@ -92,15 +92,7 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flicker}</span>`
             }
         },
-        {
+              {
-            title: '谐波电压越限(分钟)',
-            children: loop50('voltage')
-        },
-        {
-            title: '谐波电流越限(分钟)',
-            children: loop50('harmonicCurrent')
-        },
-        {
             title: '三相不平衡度越限(分钟)',
             field: 'flicker',
             width: '100'
@@ -114,7 +106,16 @@ const tableStore: any = new TableStore({
             title: '频率偏差越限(分钟)',
             field: 'flicker',
             width: '100'
-        }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('voltage')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('harmonicCurrent')
+        },
+  
     ],
     beforeSearchFun: () => {},
     loadCallback: () => {
@@ -147,6 +148,7 @@ const open = async (row: any) => {
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
+    console.log(row, '1111')
     if (column.field != 'name' && column.field != 'time') {
         harmonicRatio‌Ref.value.openDialog(row)
     }

src/components/cockpit/listOfMainMonitoringPoints/index.vue

@@ -1,94 +1,129 @@
 <template>
     <div>
         <!--指标拟合图 -->
-        <TableHeader :showReset="false" datePicker @selectChange="selectChange" v-if="fullscreen">
+        <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
+                        <el-option v-for="item in powerList" :key="item.id" :label="item.name" :value="item.id" />
-                            v-for="item in powerList"
+                    </el-select>
-                            :key="item.value"
+                </el-form-item>
-                            :label="item.label"
+                <el-form-item label="统计类型">
-                            :value="item.value"
+                    <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
+                        <el-option v-for="item in indicatorList" :key="item.id" :label="item.name" :value="item.id" />
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="越限情况">
+                <el-form-item>
-                    <el-select
+                    <div v-if="shouldShowHarmonicCount()" style="display: flex; color: var(--el-text-color-regular)">
-                        v-model="tableStore.table.params.exceedingTheLimit"
+                        <span style="width: 160px">{{ getHarmonicTypeName() }}谐波次数</span>
-                        placeholder="请选择越限情况"
+                        <el-select
-                        clearable
+                            v-model="tableStore.table.params.harmonicCount"
-                        style="width: 90px"
+                            placeholder="请选择谐波次数"
-                    >
+                            style="min-width: 80px !important"
-                        <el-option
+                            filterable
-                            v-for="item in exceedingTheLimitList"
+                        >
-                            :key="item.value"
+                            <el-option
-                            :label="item.label"
+                                v-for="num in harmonicCountOptions"
-                            :value="item.value"
+                                :key="num"
-                        />
+                                :label="num"
-                    </el-select>
+                                :value="num"
+                            ></el-option>
+                        </el-select>
+                    </div>
                 </el-form-item>
             </template>
         </TableHeader>
-        <my-echart
+        <div v-loading="tableStore.table.loading">
-            class="tall"
+            <my-echart
-            :options="echartList"
+                class="tall"
-            :style="{
+                v-if="lineShow"
-                width: prop.width,
+                :options="echartList"
-                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`
+                :style="{
-            }"
+                    width: prop.width,
-        />
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`
+                }"
+            />
+            <el-empty
+                v-else
+                description="暂无监测点"
+                :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, computed } from 'vue'
+import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
+import { 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({
-    w: { type: String },
+    w: { type: [String, Number] },
-    h: { type: String },
+    h: { type: [String, Number] },
-    width: { type: String },
+    width: { type: [String, Number] },
-    height: { type: String },
+    height: { type: [String, Number] },
-    timeKey: { type: String },
+    timeKey: { type: Array as () => string[] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
+
+const TableHeaderRef = ref()
+
 const config = useConfig()
-const powerList: any = ref([
+
-    {
+const lineList: any = ref()
-        label: '三相总有功功率',
+
-        value: '1'
+const powerList: any = ref()
-    },
+
-    {
+const chartsList = ref<any>([])
-        label: '三相总无功功率',
+const lineShow = ref(true)
-        value: '2'
-    }
-])
 // 计算是否全屏展示
 const fullscreen = computed(() => {
     const w = Number(prop.w)
@@ -110,178 +145,352 @@ const exceedingTheLimitList: any = ref([
         value: '0'
     }
 ])
-const indicatorList: any = ref([
-    {
-        label: '谐波电压总畸变率',
-        value: '1'
-    },
-    {
-        label: '各次谐波电压',
-        value: '2'
-    },
-    {
-        label: '各次谐波电压',
-        value: '3'
-    },
-    {
-        label: '三相电压不平衡',
-        value: '4'
-    }
-])
-const echartList = ref({
-    title: {
-        text: '谐波电压总畸变率越限与功率负荷曲线拟合图'
-    },
 
-    xAxis: {
+const indicatorList = ref()
-        type: 'time',
+
-        axisLabel: {
+const initLineList = async () => {
-            formatter: {
+    cslineList({}).then(res => {
-                day: '{MM}-{dd}',
+        setTime()
-                month: '{MM}',
+        if (res.data.length == 0) {
-                year: '{yyyy}'
+            lineShow.value = false
-            }
+            return (tableStore.table.loading = false)
         }
-    },
+        lineShow.value = true
+        lineList.value = res.data
+        tableStore.table.params.lineId = lineList.value[0].lineId
+        initCode()
+    })
+}
 
-    yAxis: [{}, {}],
+const echartList = ref()
-    grid: {
+
-        left: '10px',
+const headerHeight = ref(57)
-        right: '20px'
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-    },
+    headerHeight.value = height
-    options: {
+    if (datePickerValue && datePickerValue.timeValue) {
-        series: [
+        // 更新时间参数
-            {
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
-                //   name: '暂降次数',
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
-                type: 'bar',
+    }
-                name: '有功功率',
+}
-                data: [
+
-                    ['2025-10-16 07:00:00', 10],
+const setEchart = () => {
-                    ['2025-10-16 07:15:00', 10],
+    // 获取当前选择的功率和指标名称
-                    ['2025-10-16 07:30:00', 10],
+    const powerName = powerList.value?.find((item: any) => item.id === tableStore.table.params.power)?.name || '功率'
-                    ['2025-10-16 07:45:00', 10],
+    const indicatorName =
-                    ['2025-10-16 08:00:00', 30],
+        indicatorList.value?.find((item: any) => item.id === tableStore.table.params.indicator)?.name || '电能质量指标'
-                    ['2025-10-16 08:15:00', 50],
+
-                    ['2025-10-16 08:30:00', 60],
+    echartList.value = {
-                    ['2025-10-16 08:45:00', 70],
+        title: {
-                    ['2025-10-16 09:00:00', 100],
+            text: `${indicatorName}与${powerName}负荷曲线拟合图`
-                    ['2025-10-16 09:15:00', 120],
+        },
-                    ['2025-10-16 09:30:00', 130],
+        tooltip: {
-                    ['2025-10-16 09:45:00', 140],
+            trigger: 'axis',
-                    ['2025-10-16 10:00:00', 160],
+            formatter: function (params: any) {
-                    ['2025-10-16 10:15:00', 160],
+                let result = params[0].axisValueLabel
-                    ['2025-10-16 10:30:00', 130],
+                params.forEach((item: any) => {
-                    ['2025-10-16 10:45:00', 120],
+                    if (item.seriesName === indicatorName) {
-                    ['2025-10-16 11:00:00', 140],
+                        // 对于电能质量指标，格式化Y轴值显示
-                    ['2025-10-16 11:15:00', 80],
+                        let valueText = ''
-                    ['2025-10-16 11:30:00', 70],
+                        if (item.value[1] == 0) {
-                    ['2025-10-16 11:45:00', 90],
+                            valueText = '不越限'
-                    ['2025-10-16 12:00:00', 60],
+                        } else if (item.value[1] == 1) {
-                    ['2025-10-16 12:15:00', 60],
+                            valueText = '越限'
-                    ['2025-10-16 12:30:00', 60],
+                        } else {
-                    ['2025-10-16 12:45:00', 60]
+                            valueText = item.value[1]
-                ],
+                        }
-                itemStyle: {
+                        result += `<br/>${item.marker}${item.seriesName}: ${valueText}`
-                    normal: {
+                    } else {
-                        //这里是颜色
+                        // 对于功率数据，正常显示数值
-                        color: function (params: any) {
+                        result += `<br/>${item.marker}${item.seriesName}: ${item.value[1]} ${item.value[2]}`
-                            if (params.value[1] == 0 || params.value[1] == 3.14159) {
+                    }
-                                return '#ccc'
+                })
-                            } else {
+                return result
-                                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: indicatorName, // 动态设置指标名称
-            {
+                    type: 'line',
-                name: '谐波总畸变率',
+                    step: 'end',
-                type: 'line',
+                    showSymbol: false,
-                showSymbol: false,
+                    // smooth: true,
-                smooth: true,
+                    data: [],
-                data: [
+                    yAxisIndex: 1
-                    ['2025-10-16 07:00:00', 0],
+                }
-                    ['2025-10-16 07:15:00', 0],
+            ]
-                    ['2025-10-16 07:30:00', 0],
+        }
-                    ['2025-10-16 07:45:00', 0],
-                    ['2025-10-16 08:00:00', 0],
-                    ['2025-10-16 08:15:00', 0.1],
-                    ['2025-10-16 08:30:00', 0.1],
-                    ['2025-10-16 08:45:00', 0.1],
-                    ['2025-10-16 09:00:00', 1],
-                    ['2025-10-16 09:15:00', 1],
-                    ['2025-10-16 09:30:00', 1],
-                    ['2025-10-16 09:45:00', 1],
-                    ['2025-10-16 10:00:00', 0.8],
-                    ['2025-10-16 10:15:00', 0.8],
-                    ['2025-10-16 10:30:00', 0.8],
-                    ['2025-10-16 10:45:00', 0.8],
-                    ['2025-10-16 11:00:00', 0.8],
-                    ['2025-10-16 11:15:00', 0.1],
-                    ['2025-10-16 11:30:00', 0.1],
-                    ['2025-10-16 11:45:00', 0.1],
-                    ['2025-10-16 12:00:00', 0],
-                    ['2025-10-16 12:15:00', 0],
-                    ['2025-10-16 12:30:00', 0],
-                    ['2025-10-16 12:45:00', 0]
-                ],
-                yAxisIndex: 1
-            }
-        ]
     }
-})
-const headerHeight = ref(57)
-const selectChange = (showSelect: any, height: any) => {
-    headerHeight.value = height
-}
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
 
+    try {
+        // 用户功率数据和电能质量数据
+        let powerData: any[] = []
+        let qualityData: any[] = []
+
+        chartsList.value.forEach((item: any) => {
+            // 根据统计项ID判断是功率数据还是电能质量数据
+            if (item.statisticalIndex === tableStore.table.params.power) {
+                powerData.push(item)
+            } else if (item.statisticalIndex === tableStore.table.params.indicator) {
+                qualityData.push(item)
+            }
+        })
+
+        // 处理功率数据
+        const processedPowerData = powerData.map((item: any) => {
+            return [
+                item.time,
+                item.statisticalData !== null && item.statisticalData !== undefined
+                    ? parseFloat(item.statisticalData.toFixed(2))
+                    : null,
+                item.unit
+            ]
+        })
+
+        // 处理电能质量数据
+        const processedQualityData = qualityData.map((item: any) => {
+            return [
+                item.time,
+                item.statisticalData !== null && item.statisticalData !== undefined
+                    ? parseFloat(item.statisticalData.toFixed(2))
+                    : null,
+                item.unit
+            ]
+        })
+
+        // 检查是否有有效数据
+        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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        // 只有当 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)
 
-onMounted(() => {
+// 添加谐波次数选项（2-50）
-    tableStore.index()
+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(async () => {
+    await initLineList()
 })
+
 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) {
+// :deep(.el-select) {
-    min-width: 80px;
+//     min-width: 80px;
-}
+// }
 </style>

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

@@ -0,0 +1,201 @@
+<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.lineName"
+                                :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 ,governLineList} 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: '电压偏差越限(%)',
+            field: 'voltageDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+            
+
+        // {
+        //     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 time:any=ref([])
+const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+    dialogVisible.value = true
+    time.value=[searchBeginTime,searchEndTime]
+    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({})
+    const res = await governLineList({
+        endTime:time.value[1],
+keywords:"",
+pageNum:1,
+pageSize:10000,
+searchBeginTime:time.value[0],
+searchEndTime:time.value[1],
+startTime:time.value[0],
+timeFlag:1
+    })
+    options.value = res.data.records
+
+}
+
+
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/monitoringPointList/index.vue

@@ -1,36 +1,128 @@
 <template>
     <div>
-        <!--监测点列表 -->
+        <!-- 监测点列表 -->
-
+        <TableHeader
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height}  )`"></Table>
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            v-if="fullscreen"
+            :timeKeyList="prop.timeKey"
+        >
+            <template #select>
+                <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>
+        </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="上传报告"
+            append-to-body
+            width="500px"
+            @closed="handleDialogClosed"
+        >
+            <el-upload
+                ref="uploadRef"
+                class="upload-demo"
+                action=""
+                accept=".doc,.docx,.PDF"
+                :on-change="handleChange"
+                :before-upload="beforeUpload"
+                :limit="1"
+                :auto-upload="false"
+                :on-exceed="handleExceed"
+                :on-remove="handleRemove"
+                :file-list="fileList"
+            >
+                <el-button type="primary">点击上传</el-button>
+                <template #tip>
+                    <div class="el-upload__tip">请上传Word或PDF文件</div>
+                </template>
+            </el-upload>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="uploadDialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="handleUpload">确定</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 OverLimitDetails from '@/components/cockpit/monitoringPointList/components/overLimitDetails.vue'
-import { ElTag } from 'element-plus'
+import TableHeader from '@/components/table/header/index.vue'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import { uploadReport, getReportUrl } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    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: fullscreen.value ? true : false,
-    showPage: false,
+    exportName: '监测点列表',
-    exportName: '主要监测点列表',
     column: [
         {
             field: 'index',
@@ -41,107 +133,318 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '治理对象名称',
+            title: '监测点名称',
-            field: 'name',
+            field: 'lineName',
-            minWidth: '80'
+            minWidth: '120',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
+            }
+        },
+        {
+            title: '监测类型',
+            field: 'position',
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        // {
+        //     title: '监测点状态',
+        //     field: 'runStatus',
+        //     minWidth: '90',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return `<span style='color: ${row.runStatus === '中断' ? '#FF0000' : ''}'>${row.runStatus==null?'/':row.runStatus}</span>`
+        //     }
+        // },
+        {
+            title: '监测点状态',
+            field: 'runStatus',
+            render: 'tag',
+
+            width: 100,
+            custom: {
+                停运: 'danger',
+                退运: 'danger',
+                运行: 'success',
+                在线: 'success',
+                中断: 'warning',
+                离线: 'danger',
+                检修: 'warning',
+                调试: 'warning',
+                null: 'info'
+            },
+            replaceValue: {
+                运行: '运行',
+                在线: '在线',
+                退运: '退运',
+                停运: '停运',
+                中断: '中断',
+                检修: '检修',
+                离线: '离线',
+                调试: '调试',
+                null: '/'
+            }
+        },
+        {
+            title: '治理对象',
+            field: 'sensitiveUser',
+            minWidth: '90',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
 
         {
             title: '电压等级',
-            field: 'type',
+            field: 'volGrade',
-            minWidth: '70'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue == 0 ? '/' : row.cellValue + 'kV' || '/'
+            }
         },
         {
-            title: '治理设备详情',
+            title: '是否治理',
-            field: 'type1',
+            field: 'govern',
-            minWidth: '70'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
 
         {
-            title: '治理前报告',
+            title: '最新数据时间',
-            field: 'type2',
+            field: 'latestTime',
-            minWidth: '80',
+            minWidth: '140',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                 return `<span style='cursor: pointer;text-decoration: underline;' onclick="handleReportClick('${row.name}')">${row.type2}</span>`
+                if (row.latestTime) {
-            },
+                    return `<span>${row.latestTime}</span>`
-        },
+                } else {
-        { title: '监测点名称', field: 'type3', minWidth: '70' },
+                    return `<span>/</span>`
-        { 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: '报告',
+        //     field: 'reportFilePath',
+        //     minWidth: '120',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return row.reportFilePath == null
+        //             ? '/'
+        //             : `<span style='cursor: pointer;text-decoration: underline;'>${row.reportFilePath
+        //                   .split('/')
+        //                   .pop()}</span>`
+        //     }
+        // },
+        {
+            title: '报告',
+            field: 'reportFilePath',
+            minWidth: '120',
+            formatter: (row: any) => {
+                return row.cellValue == null ? '/' : row.cellValue.split('/').pop()
+            }
+        },
+        {
+            title: '操作',
+            fixed: 'right',
+            width: 150,
+            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, row.reportFilePath)
+                    },
+                    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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '1#变压器',
-                type: '0.38kV',
-                type1: '250A APF',
-                type2: '报告.doc',
-                type3: '1#变压器 电网侧',
-                type4: '电网侧',
-                type5: '运行',
-                type6: '2025-04-11 18:16:00'
-            },
-            {
-                name: '1#变压器',
-                type: '0.38kV',
-                type1: '250A APF',
-                type2: '报告.doc',
-                type3: '1#变压器 负载侧',
-                type4: '负载侧',
-                type5: '运行',
-                type6: '2025-04-11 18:16:00'
-            },
-            {
-                name: '2#变压器',
-                type: '0.38kV',
-                type1: '100A SVG',
-                type2: '/',
-                type3: '1#变压器 电网侧',
-                type4: '电网侧',
-                type5: '运行',
-                type6: '2025-04-11 18:16:00'
-            },
-            {
-                name: '2#变压器',
-                type: '0.38kV',
-                type1: '100A SVG',
-                type2: '/',
-                type3: '1#变压器 负载侧',
-                type4: '负载侧',
-                type5: '中断',
-                type6: '2025-04-11 18:16:00'
-            }
-        ]
-
         tableStore.table.height = `calc(${prop.height} - 80px)`
     }
 })
 
 const tableRef = ref()
 provide('tableRef', tableRef)
-tableStore.table.params.type = ''
+tableStore.table.params.keywords = ''
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
+const 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') {
+    if (column.field == 'lineName') {
-        console.log(row)
+        OverLimitDetailsRef.value.open(
-        OverLimitDetailsRef.value.open(row)
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
+    }
+}
+
+// 下载报告
+const downloadTheReport = (lineId: string, name: string) => {
+    getReportUrl({ lineId: lineId }).then((res: any) => {
+        forceDownloadPdf(res.data, name.split('/').pop() || '')
+    })
+}
+const forceDownloadPdf = async (pdfUrl, fileName = '文件.pdf') => {
+    try {
+        // 1. 请求 PDF 并转为 Blob（关键：绕开浏览器直接解析）
+        const response = await fetch(pdfUrl, {
+            method: 'GET'
+            // 若需要鉴权，添加请求头（如 token）
+        })
+
+        // 校验响应是否成功
+        if (!response.ok) throw new Error(`请求失败：${response.status}`)
+
+        // 2. 将响应转为 Blob（指定类型为 PDF，确保兼容性）
+        const blob = await response.blob()
+        const pdfBlob = new Blob([blob], { type: 'application/pdf' })
+
+        // 3. 创建临时 URL 并触发下载
+        const blobUrl = URL.createObjectURL(pdfBlob)
+        const a = document.createElement('a')
+        a.href = blobUrl
+        a.download = fileName // 此时 Blob URL 是同源的，download 必生效
+        a.style.display = 'none'
+        document.body.appendChild(a)
+        a.click() // 触发下载
+
+        // 4. 清理资源（避免内存泄漏）
+        document.body.removeChild(a)
+        URL.revokeObjectURL(blobUrl)
+    } catch (error) {
+        console.error('PDF 下载失败：', error)
+        // ElMessage.error('文件下载失败，请检查网络或文件地址') // 适配 Element Plus
+    }
+}
+
+// 上传报告
+const uploadReportRow = (row: any) => {
+    currentUploadRow.value = row
+    // 打开弹窗前清空文件列表
+    fileList.value = []
+    uploadDialogVisible.value = true
+}
+
+// 处理弹窗关闭事件
+const handleDialogClosed = () => {
+    // 清空文件列表
+    fileList.value = []
+}
+
+// 处理文件超出限制
+const handleExceed = (files: any) => {
+    ElMessage.warning('只能上传一个文件，请先删除已选择的文件')
+}
+const handleRemove = (files: any) => {
+    fileList.value = []
+}
+
+// 文件变更处理函数
+const handleChange = (file: any) => {
+    // 在这里直接处理文件上传逻辑
+    // beforeUpload(file.raw) // 注意使用 file.raw 获取原始文件对象
+    fileList.value = [file] // 只保留最新选择的文件
+}
+
+// 处理上传前检查
+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('请上传(.doc/.docx/.pdf)格式文件!')
+        return false
+    }
+
+    // 校验通过后允许上传，交由 http-request 处理
+    return true
+}
+
+const handleUpload = async () => {
+    // return
+
+    const formData = new FormData()
+    formData.append('file', fileList.value[0]?.raw)
+    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,39 +458,13 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
         tableStore.index()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const handleReportClick = (id: string) => {
-  const row = tableStore.table.data.find((item: any) => item.id === id)
-  if (row && row.type2 !== '/') {
-    // 示例：触发下载逻辑（根据你注释掉的代码）
-    // getFileZip({ eventId: id }).then(res => {
-    //   let blob = new Blob([res], { type: 'application/zip' })
-    //   const url = window.URL.createObjectURL(blob)
-    //   const link = document.createElement('a')
-    //   link.href = url
-    //   link.download = row.wavePath?.split('/')[2] || '报告文件.zip'
-    //   link.click()
-    // })
-    console.log('点击了报告:', row.type2)
-  } else {
-    ElMessage.warning('暂无报告可下载')
-  }
-}
-
-// 挂载到 window 供 HTML 调用
-window.handleReportClick = handleReportClick
-
-// 组件销毁时清理全局方法
-onBeforeUnmount(() => {
-  delete window.handleReportClick
-})
 </script>
 <style lang="scss" scoped></style>

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

@@ -0,0 +1,724 @@
+<template>
+    <el-dialog draggable :title="titles" 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" v-if="props.showIndex">
+                        <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="item.name.includes('间谐波') ? vv - 0.5 : 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
+    },
+    showIndex:{
+        type: Boolean,
+        default: true
+    
+    }
+})
+const titles = ref('趋势图')
+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('gridSide_exceedTheLimit').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
+            // }
+            let codeKey = field.includes('flickerOvertime')
+                ? '闪变'
+                : field.includes('uharm')
+                ? '谐波电压'
+                : field.includes('iharm')
+                ? '谐波电流'
+                : field.includes('voltageDevOvertime')
+                ? '电压偏差'
+                : field.includes('ubalanceOvertime')
+                ? '不平衡'
+                : ''
+            let defaultIndex = indexOptions.value.findIndex((item: any) => item.name.includes(codeKey)) || 0
+
+            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.includes('间谐波电压')) {
+                                    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数据
+    echartsData.value = {}
+    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.includes('间谐波电压')) {
+                item.name = '间谐波电压次数'
+            } else if (item.name.includes('谐波电流')) {
+                item.name = '谐波电流次数'
+            } else if (item.name.includes('谐波电压')) {
+                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) => {
+    titles.value = `${row?.lineName ? `${row.lineName}_` : ''}趋势图`
+    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,189 @@
+<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.lineName"
+                                :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: '电压偏差越限(%)',
+            field: 'voltageDevOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
+        },
+        {
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
+            }
+        },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+
+
+        // {
+        //     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,data: any) => {
+    dialogVisible.value = true
+    // initCSlineList()
+     options.value = data
+    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 OverLimitDetails from '@/components/cockpit/overLimitStatistics/components/overLimitDetails.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute } from 'vue-router'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { useTimeCacheStore } from '@/stores/timeCache'
-import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
+import { totalLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
-const echartList = ref({
-    title: {
-        text: '指标越限占比'
-    },
 
-    xAxis: {
+const headerHeight = ref(57)
-        // name: '(区域)',
-        data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-    },
 
-    yAxis: {
+const TableHeaderRef = ref()
-        name: '%', // 给X轴加单位
-        interval: 20
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
-    options: {
-        series: [
-            {
-                //   name: '暂降次数',
-                type: 'bar',
-                name: '越限占比',
-                data: [0, 45, 22, 0, 70],
-                barMaxWidth: 30,
 
-                // label: {
+const echartList = ref({})
-                //     show: true,
+
-                //     position: 'top',
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-                //     textStyle: {
+    headerHeight.value = height
-                //         //数值样式
+
-                //         color: '#000'
+    if (datePickerValue && datePickerValue.timeValue) {
-                //     },
+        // 更新时间参数
-                //     fontSize: 12
+        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,77 +143,66 @@ const tableStore: any = new TableStore({
         },
         {
             title: '名称',
-            field: 'name',
+            field: 'lineName',
             minWidth: '90'
         },
         {
             title: '越限占比(%)',
             children: [
                 {
-                    title: '闪变',
+                    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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     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,52 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
+        OverLimitDetailsRef.value.open(
-        OverLimitDetailsRef.value.open(row)
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1],
+             tableStore.table.data
+        )
     }
 }
 
 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,86 @@
 <template>
     <div>
         <!--敏感负荷列表 -->
-
+        <TableHeader
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height})`" isGroup></Table>
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            v-if="fullscreen"
+            :timeKeyList="prop.timeKey"
+        >
+            <template #select>
+                <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>
+        </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 { getTime } from '@/utils/formatTime'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+
 const prop = defineProps({
-    width: { type: String },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    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('Interference_Source')
+
+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/getListByUser',
     method: 'POST',
-
+    showPage: fullscreen.value ? true : false,
-    showPage: false,
-
     column: [
         {
             field: 'index',
@@ -44,42 +98,36 @@ const tableStore: any = new TableStore({
 
         {
             title: '敏感负荷类型',
-            field: 'type',
+            field: 'loadType',
-            minWidth: '70'
+            minWidth: '70',
+            formatter: row => {
+                return sensitiveUserType.filter(item => item.id == row.cellValue)[0]?.name
+            }
         },
         {
             title: '是否监测',
-            field: 'type1',
+            field: 'isMonitor',
-            minWidth: '80'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
         {
             title: '是否治理',
-            field: 'type2',
+            field: 'isGovern',
-            minWidth: '80'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '10kV1#变压器',
-                type: '机房',
-                type1: '是',
-                type2: '100A APF'
-            },
-            {
-                name: '380kV1#母线',
-                type: 'PLC',
-                type1: '是',
-                type2: 'UPS'
-            }
-        ]
-    }
-})
 
+    loadCallback: () => {}
+})
+tableStore.table.params.searchValue = ''
 const tableRef = ref()
 provide('tableRef', tableRef)
 
@@ -93,6 +141,24 @@ 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 +171,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

@@ -1,15 +1,11 @@
 <template>
     <div>
-        <!-- 暂态事件列表 -->
+        <!-- 暂态事件详情 -->
-        <el-dialog draggable title="暂态事件列表" v-model="dialogVisible" append-to-body width="70%">
+        <el-dialog draggable title="暂态事件详情 " v-model="dialogVisible" append-to-body width="70%">
-            <!-- <TableHeader datePicker showExport :showReset="false">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
                 <template v-slot:select>
-                    <el-form-item label="监测点名称">
+                    <el-form-item label="监测点" v-if="props.showLine">
-                        <el-select
+                        <el-select v-model="tableStore.table.params.lineId" filterable placeholder="请选择监测点名称">
-                            v-model="tableStore.table.params.searchValue"
-                            placeholder="请选择监测点名称"
-                            style="width: 240px"
-                        >
                             <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -18,9 +14,41 @@
                             />
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="暂态类型">
+                        <el-select
+                            v-model="tableStore.table.params.eventType"
+                            style="min-width: 150px"
+                            clearable
+                            placeholder="请选择暂态类型"
+                        >
+                            <el-option
+                                v-for="item in eventList"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
                 </template>
-            </TableHeader> -->
+            </TableHeader>
-            <Table ref="tableRef"  isGroup :height="height"></Table>
+            <Table ref="tableRef" isGroup :height="heightRef"></Table>
+        </el-dialog>
+        <!-- 查看波形 -->
+        <el-dialog
+            v-model="isWaveCharts"
+            draggable
+            title="波形分析"
+            append-to-body
+            v-if="isWaveCharts"
+            width="70%"
+            @close="handleHideCharts"
+        >
+            <waveFormAnalysis
+                v-loading="loading"
+                ref="waveFormAnalysisRef"
+                @handleHideCharts="handleHideCharts"
+                :wp="wp"
+            />
         </el-dialog>
     </div>
 </template>
@@ -30,21 +58,47 @@ 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'
+interface Props {
+    showLine?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    showLine: true
+})
+
 const dialogVisible: any = ref(false)
-const harmonicRatio‌Ref: any = ref(null)
+const waveFormAnalysisRef: any = ref(null)
-const options = [
+// 波形
-    {
+const isWaveCharts = ref(false)
-        value: '35kV进线',
+const loading = ref(false)
-        label: '35kV进线'
+const wp = ref({})
-    }
+const boxoList: any = ref({})
+
+const tableHeaderRef = ref()
+
+const options = ref()
+const heightRef = ref(mainHeight(168, 2.1).height)
+const selectChange = (flag: boolean, h: any) => {
+    heightRef.value = mainHeight(h, 2.1).height
+}
+const eventList = [
+    { label: '电压暂降', value: '1' },
+    { label: '电压中断', value: '2' },
+    { label: '电压暂升', value: '3' }
 ]
-const height = mainHeight(0, 2).height as any
+const getSimpleLineList = async () => {
+    const res = await getSimpleLine()
+    options.value = res.data
+}
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-harmonic-boot/event/pageEvent',
     method: 'POST',
-    publicHeight: 30,
+    showPage: true,
-    showPage: false,
+    exportName: '暂态事件详情',
-    exportName: '主要监测点列表',
     column: [
         {
             field: 'index',
@@ -56,76 +110,143 @@ const tableStore: any = new TableStore({
         },
         {
             title: '暂态时间',
-            field: 'time',
+            field: 'startTime',
+            minWidth: '180'
         },
         {
             title: '测点名称',
-            field: 'name',
+            field: 'lineName',
-            width: '150'
+            minWidth: '150'
         },
         {
             title: '暂态类型',
-            field: 'flicker',
+            field: 'tag',
-            width: '100',
+            minWidth: '100'
         },
         {
             title: '特征幅值(%)',
-            field: 'flicker',
+            field: 'amplitude',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '暂降深度(%)',
-            field: 'flicker',
+            field: 'depth',
-            width: '100'
+            minWidth: '100',
+            formatter: (row: any) => {
+                // 当暂态类型不是电压暂升时，计算暂降深度 = 100 - 特征幅值
+                if (row.row.tag !== '电压暂升') {
+                    const amplitude = parseFloat(row.row.amplitude)
+                    if (!isNaN(amplitude)) {
+                        return 100 - amplitude
+                    }
+                    return '-'
+                } else {
+                    // 电压暂升时不显示暂降深度
+                    return '/'
+                }
+            }
         },
         {
             title: '持续时间(S)',
-            field: 'flicker',
+            field: 'persistTime',
-            width: '100'
+            minWidth: '100'
         },
-         {
+        {
             title: '严重度',
-            field: 'flicker',
+            field: 'severity',
-            width: '80'
+            minWidth: '80'
         },
+        {
+            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.amplitude - 0) / 100
+                                    // 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: () => {
+    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.eventType = ''
-tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
-const open = async (row: any) => {
+const open = async (time: any) => {
+    tableStore.table.params.eventType = ''
     dialogVisible.value = true
-    tableStore.index()
+    getSimpleLineList()
+    tableStore.table.params.lineId = ''
+    nextTick(() => {
+        tableHeaderRef.value.setInterval(5)
+        tableHeaderRef.value.setTimeInterval([time, time])
+        tableStore.table.params.searchBeginTime = time
+        tableStore.table.params.searchEndTime = time
+        tableStore.index()
+    })
 }
 
-// 点击行
+const handleHideCharts = () => {
-const cellClickEvent = ({ row, column }: any) => {
+    isWaveCharts.value = false
-    if (column.field != 'name') {
+    dialogVisible.value = true
-        harmonicRatio‌Ref.value.openDialog(row)
-    }
 }
 
-
 defineExpose({ open })
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/transientDetails/index.vue

@@ -1,135 +1,147 @@
 <template>
     <div>
         <!--暂态事件明细 -->
-
+        <TableHeader
-        <el-calendar v-model="value" :style="{ height: prop.height, overflow: 'auto' }">
+            :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
+                    <el-tooltip effect="dark" placement="top" :hide-after="0" v-if="hasEventData(data.day)">
-                        effect="dark"
-                        placement="top"
-                        :hide-after="0"
-                        v-if="list?.filter(item => item.time == data.day)[0]?.type || false"
-                    >
                         <template #content>
                             <!-- <span v-html="list?.filter(item => item.time == data.day)[0]?.type || ''"></span> -->
-                            <div v-for="item in list?.filter(item => item.time == data.day)">
+                            <div v-for="item in list?.filter((item:any) => item.name == data.day)">
-                                <div>电压暂降：{{ item.type || '' }}</div>
+                                <div>电压暂降：{{ item.eventDown || 0 }}</div>
-                                <div>电压中断：{{ item.type1 || '' }}</div>
+                                <div>电压中断：{{ item.eventOff || 0 }}</div>
-                                <div>电压暂升：{{ item.type2 || '' }}</div>
+                                <div>电压暂升：{{ item.eventUp || 0 }}</div>
                             </div>
                         </template>
                         <div
                             style="text-decoration: underline"
-                            :style="{ height: `calc(${prop.height} / 5 - 47px)`, overflow: 'auto' }"
+                            class="details"
-                            v-for="item in list?.filter(item => item.time == data.day)"
+                            v-for="item in list?.filter((item:any) => item.name == data.day)"
+                            @click="descentClick(item)"
                         >
-                            <div  @click="descentClick">电压暂降:{{ item.type || '' }}</div>
+                            <!-- <div>电压暂降:{{ item.eventDown || 0 }}</div>
-                            <div>电压中断:{{ item.type1 || '' }}</div>
+                                <div>电压中断:{{ item.eventOff || 0 }}</div>
-                            <div>电压暂升:{{ item.type2 || '' }}</div>
+                                <div>电压暂升:{{ item.eventUp || 0 }}</div> -->
+                            <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"  />
+        <TransientList ref="transientListRef" :showLine="false" />
     </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 transientListRef = ref()
-const list = ref([
+const list = ref()
-    {
+
-        time: '2025-10-01',
-        key: 81,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-31',
-        key: 81,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-08',
-        key: 20,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-16',
-        key: 20,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-23',
-        key: 20,
-        type: 1,
-        type1: 1,
-        type2: 1
-    },
-    {
-        time: '2025-10-04',
-        key: 0
-    },
-    {
-        time: '2025-10-05',
-        key: 0
-    }
-])
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/getEventDate',
     method: 'POST',
 
     showPage: false,
 
     column: [],
+
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
-        // value.value = new Date(prop.timeValue?.[0])
     },
+
     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'
         }
     }
@@ -137,52 +149,69 @@ const setBackground = (value: string) => {
     return '#fff'
 }
 
-provide('tableRef', tableRef)
-
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    tableStore.index()
+    nextTick(() => {
-})
-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 descentClick = () => {
+const descentClick = (item: any) => {
-    transientListRef.value.open()
+    transientListRef.value.open(item.name)
 }
-
-
 </script>
 <style lang="scss" scoped>
 :deep(.el-calendar) {
-    .el-calendar__header {
+    .el-calendar__button-group {
         display: none;
     }
     .el-calendar__body {
         padding: 0px !important;
-        height: 100%;
+        height: calc(100% - 46px);
         .el-calendar-table {
             height: 100%;
         }
     }
     .el-calendar-day {
+        // height: calc(912px / 5 );
         height: 100%;
         padding: 0px;
         overflow: hidden;
+        .details {
+            height: calc(100% - 20px);
+            overflow-y: auto;
+        }
     }
     .el-calendar-table__row {
         .next {

src/components/cockpit/transientDistribution/index.vue

@@ -1,318 +1,265 @@
 <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} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+            }"
         />
-        <my-echart
+        <!-- <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 },
+    w: { type: [String, Number] },
-    height: { type: String },
+    h: { type: [String, Number] },
-    timeKey: { type: String },
+    width: { type: [String, Number] },
-    timeValue: { type: Object }
+    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: {
+const TableHeaderRef = ref()
-            max: 20,
-            show: false,
-            inRange: {
-                color: ['#313695', '#00BB00', '#ff8000', '#a50026']
-            }
-        },
-        xAxis3D: {
-            type: 'category',
-            name: '特征幅值',
-            data: [
-                '0-10%',
-                '10%-20%',
-                '20%-30%',
-                '30%-40%',
-                '40%-50%',
-                '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
-                    }
-                },
 
-                itemStyle: {
+const headerHeight = ref(57)
-                    opacity: 1
+
-                },
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-                emphasis: {
+    headerHeight.value = height
-                    label: {
+
-                        textStyle: {
+    if (datePickerValue && datePickerValue.timeValue) {
-                            fontSize: 20,
+        // 更新时间参数
-                            color: '#900'
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
-                        }
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
-                    },
+    }
-                    itemStyle: {
+}
-                        color: '#900'
+
-                    }
+// 计算是否全屏展示
-                }
+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: {
+const config = useConfig()
-        // name: '时间',
+
-        // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+const echartList = ref({})
-        type: 'time',
+
-        axisLabel: {
+const echartList1 = ref({})
-            formatter: {
+
-                day: '{MM}-{dd}',
+const processDataForChart = (rawData: any[]) => {
-                month: '{MM}',
+    // 将后端返回的扁平数据转换为 ECharts 需要的三维坐标格式 [x, y, z]
-                year: '{yyyy}'
+    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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     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: 260,
+                            rotateSensitivity: 10,
+                            zoomSensitivity: 2
+                        },
+                        boxWidth: 150,
+                        boxDepth: 100,
+                        boxHeight: 100,
+                        light: {
+                            main: {
+                                intensity: 1.2
+                            },
+                            ambient: {
+                                intensity: 0.4
+                            }
+                        }
+                },
+                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 +271,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()
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

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

@@ -2,16 +2,27 @@
     <div>
         <!-- 暂态事件详情 -->
         <el-dialog draggable title="暂态事件详情 " v-model="dialogVisible" append-to-body width="70%">
-            <TableHeader datePicker showExport :showReset="false">
+            <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
                 <template v-slot:select>
-                    <el-form-item label="监测点名称">
+                    <el-form-item label="监测点">
-                        <el-select
+                        <el-select filterable v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
-                            v-model="tableStore.table.params.searchValue"
-                            placeholder="请选择监测点名称"
-                            style="width: 240px"
-                        >
                             <el-option
                                 v-for="item in options"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="暂态类型">
+                        <el-select
+                            v-model="tableStore.table.params.eventType"
+                            style="min-width: 150px"
+                            clearable
+                            placeholder="请选择暂态类型"
+                        >
+                            <el-option
+                                v-for="item in eventList"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value"
@@ -20,10 +31,25 @@
                     </el-form-item>
                 </template>
             </TableHeader>
-            <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
+            <Table ref="tableRef" isGroup :height="heightRef"></Table>
         </el-dialog>
         <!-- 查看波形 -->
-        <HarmonicRatio‌ ref="harmonicRatio‌Ref" />
+        <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">
@@ -32,21 +58,39 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
-import HarmonicRatio‌ from '@/components/cockpit/listOfMainMonitoringPoints/components/harmonicRatio‌.vue'
+import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
+import { analyseWave } from '@/api/common'
+import { getSimpleLine } from '@/api/harmonic-boot/cockpit/cockpit'
+
 const dialogVisible: any = ref(false)
-const harmonicRatio‌Ref: any = ref(null)
+const waveFormAnalysisRef: any = ref(null)
-const options = [
+// 波形
-    {
+const isWaveCharts = ref(false)
-        value: '35kV进线',
+const loading = ref(false)
-        label: '35kV进线'
+const wp = ref({})
-    }
+const boxoList: any = ref({})
+
+const tableHeaderRef = ref()
+
+const options = ref()
+const heightRef = ref(mainHeight(168, 2.2).height)
+const selectChange = (flag: boolean, h: any) => {
+    heightRef.value = mainHeight(h, 2.2).height
+}
+const eventList = [
+    { label: '电压暂降', value: '1' },
+    { label: '电压中断', value: '2' },
+    { label: '电压暂升', value: '3' }
 ]
-const height = mainHeight(0, 2).height as any
+const getSimpleLineList = async () => {
+    const res = await getSimpleLine()
+    options.value = res.data
+}
+
 const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
+    url: '/cs-harmonic-boot/event/pageEvent',
     method: 'POST',
-    publicHeight: 30,
+    showPage: true,
-    showPage: false,
     exportName: '主要监测点列表',
     column: [
         {
@@ -59,92 +103,143 @@ const tableStore: any = new TableStore({
         },
         {
             title: '暂态时间',
-            field: 'time',
+            field: 'startTime',
+            minWidth: '180'
         },
         {
             title: '测点名称',
-            field: 'name',
+            field: 'lineName',
-            width: '150'
+            minWidth: '150'
         },
         {
             title: '暂态类型',
-            field: 'flicker',
+            field: 'tag',
-            width: '100',
+            minWidth: '100'
         },
         {
             title: '特征幅值(%)',
-            field: 'flicker',
+            field: 'amplitude',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '暂降深度(%)',
-            field: 'flicker',
+            field: 'depth',
-            width: '100'
+            minWidth: '100',
+            formatter: (row: any) => {
+                // 当暂态类型不是电压暂升时，计算暂降深度 = 100 - 特征幅值
+                if (row.row.tag !== '电压暂升') {
+                    const amplitude = parseFloat(row.row.amplitude)
+                    if (!isNaN(amplitude)) {
+                        return 100 - amplitude
+                    }
+                    return '-'
+                } else {
+                    // 电压暂升时不显示暂降深度
+                    return '/'
+                }
+            }
         },
         {
             title: '持续时间(S)',
-            field: 'flicker',
+            field: 'persistTime',
-            width: '100'
+            minWidth: '100'
         },
-         {
+        {
             title: '严重度',
-            field: 'flicker',
+            field: 'severity',
-            width: '80'
+            minWidth: '80'
         },
-           {
+        {
             title: '波形',
-            width: '100',
+            width: '90',
             render: 'buttons',
             buttons: [
                 {
-                    name: 'check',
+                    name: 'edit',
-                    title: '查看波形',
+                    text: '波形分析',
                     type: 'primary',
-                    icon: 'el-icon-EditPen',
+                    icon: 'el-icon-DataLine',
                     render: 'basicButton',
-                    click: row => {
+                    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.featureAmplitude = (row.amplitude - 0) / 100
+                                    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: () => {
+    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.eventType = ''
-tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
-const open = async (row: any) => {
+const open = async (row: any, searchBeginTime: any, searchEndTime: any) => {
+    tableStore.table.params.eventType = ''
     dialogVisible.value = true
-    tableStore.index()
+    getSimpleLineList()
+    tableStore.table.params.lineId = row.id
+    nextTick(() => {
+        tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
+        tableStore.table.params.searchBeginTime = searchBeginTime
+        tableStore.table.params.searchEndTime = searchEndTime
+        tableStore.index()
+    })
 }
 
-// 点击行
+const handleHideCharts = () => {
-const cellClickEvent = ({ row, column }: any) => {
+    isWaveCharts.value = false
-    if (column.field != 'name') {
+    dialogVisible.value = true
-        harmonicRatio‌Ref.value.openDialog(row)
-    }
 }
 
-
 defineExpose({ open })
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/transientStatistics/index.vue

@@ -1,12 +1,27 @@
 <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>
@@ -15,91 +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'
-import TransientStatisticsDetail from './components/transientStatisticsDetail.vue'
+import TransientStatisticsDetail from '@/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue'
-const config = useConfig()
+import TableHeader from '@/components/table/header/index.vue'
-const prop = defineProps({
+import { netEventEcharts } from '@/api/harmonic-boot/cockpit/cockpit'
-    width: { type: String },
+import { getTime } from '@/utils/formatTime'
-    height: { type: String },
-    timeKey: { type: String },
-    timeValue: { type: Object }
-})
-const data = [
-    {
-        name: '电压中断',
-        value: 4
-    },
-    {
-        name: '电压暂降',
-        value: 41
-    },
-    {
-        name: '电压暂升',
-        value: 46
-    }
-]
-const echartList = ref({
-    title: {},
 
-    tooltip: {
+const prop = defineProps({
-        trigger: 'item'
+    w: { type: [String, Number] },
-    },
+    h: { type: [String, Number] },
-    legend: {
+    width: { type: [String, Number] },
-        orient: 'vertical',
+    height: { type: [String, Number] },
-        top: 'center',
+   timeKey: { type: Array as () => string[] },
-        right: '5%',
+    timeValue: { type: Object },
-        formatter: function (e: any) {
+    interval: { type: Number }
-            return e + '   ' + data.filter(item => item.name == e)[0].value + '次'
+})
-        }
+
-    },
+const TableHeaderRef = ref()
-    xAxis: {
+
-        show: false
+const headerHeight = ref(57)
-    },
+
-    yAxis: {
+
-        show: false
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
-    },
+    headerHeight.value = height
-    grid: {
+
-        left: '10px',
+    if (datePickerValue && datePickerValue.timeValue) {
-        right: '20px'
+        // 更新时间参数
-    },
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
-    color: ['#FF9100', '#FFBF00', config.layout.elementUiPrimary[0]],
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
-    options: {
+    }
-        dataZoom: null,
+}
-        title: [
+
+// 计算是否全屏展示
+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: '暂态事件统计',
+                name: '电压中断',
-                left: 'center'
+                value: rawData.eventOff || 0
             },
             {
-                text: data[0].value + data[1].value + data[2].value + '次',
+                name: '电压暂降',
-                left: 'center',
+                value: rawData.eventDown || 0
-                top: 'center'
+            },
-            }
-        ],
-        series: [
             {
-                type: 'pie',
+                name: '电压暂升',
-                center: 'center',
+                value: rawData.eventUp || 0
-                radius: ['50%', '70%'],
-                label: {
-                    show: false,
-                    position: 'outside',
-                    textStyle: {
-                        //数值样式
-                    }
-                },
-                name: '事件统计',
-                data: data
             }
         ]
-    }
+
-})
+        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,
@@ -121,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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
     },
     loadCallback: () => {
-        tableStore.table.data = [
+        eventEcharts()
-            {
-                name: '35kV1进线',
-                type: '2',
-                type1: '38',
-                type2: '35'
-            },
-            {
-                name: '35kV1变压器',
-                type: '2',
-                type1: '1',
-                type2: '3'
-            },
-            {
-                name: '35kV1母线',
-                type: '0',
-                type1: '1',
-                type2: '4'
-            },
-            {
-                name: '35kV2母线',
-                type: '0',
-                type1: '1',
-                type2: '4'
-            }
-        ]
     }
 })
 
@@ -189,7 +225,30 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        transientStatisticsDetailRef.value.open(row)
+        transientStatisticsDetailRef.value.open(
+            row,
+            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        )
+    }
+}
+
+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 不是一个有效数组')
     }
 }
 
@@ -205,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,91 +1,113 @@
 <template>
     <div>
         <!--趋势对比 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" v-if="fullscreen">
+        <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"
+                        filterable
-                        placeholder="请选择监测点名称"
+                        v-model="tableStore.table.params.sensitiveUserId"
+                        placeholder="请选择监测对象"
                         clearable
-                        style="width: 130px"
                     >
-                        <el-option
+                        <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
-                            v-for="item in powerList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
+                <!-- <el-form-item label="监测点名称">
+                    <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称" clearable>
+                        <el-option
+                            v-for="item in lineIdList"
+                            :key="item.lineId"
+                            :label="item.name"
+                            :value="item.lineId"
+                        />
+                    </el-select>
+                </el-form-item> -->
                 <el-form-item label="电能质量指标">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.indicator" placeholder="请选择电能质量指标" clearable>
-                        v-model="tableStore.table.params.indicator"
+                        <el-option v-for="item in indicatorList" :key="item.id" :label="item.name" :value="item.id" />
-                        placeholder="请选择电能质量指标"
-                        clearable
-                        style="width: 130px"
-                    >
-                        <el-option
-                            v-for="item in indicatorList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="谐波次数">
+                <el-form-item>
+                    <el-radio-group v-model="tableStore.table.params.dataLevel">
+                        <el-radio-button label="一次值" value="Primary" />
+                        <el-radio-button label="二次值" value="Secondary" />
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="统计类型">
                     <el-select
-                        v-model="tableStore.table.params.exceedingTheLimit"
+                        style="min-width: 120px !important"
-                        placeholder="请选择谐波次数"
+                        placeholder="请选择"
-                        clearable
+                        v-model="tableStore.table.params.valueType"
-                        style="width: 90px"
                     >
-                        <el-option
+                        <el-option value="max" label="最大值"></el-option>
-                            v-for="item in exceedingTheLimitList"
+                        <el-option value="min" label="最小值"></el-option>
-                            :key="item.value"
+                        <el-option value="avg" label="平均值"></el-option>
-                            :label="item.label"
+                        <el-option value="cp95" label="cp95"></el-option>
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
+                <el-form-item>
+                    <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 + ${fullscreen ? 0 : 56}px)` }"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+            }"
         />
+        <!-- <el-empty description="暂无数据" /> -->
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h, computed } from 'vue'
+import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+import { yMethod, exportCSV } from '@/utils/echartMethod'
+import { max } from 'lodash'
 const prop = defineProps({
-    w: { type: String },
+    w: { type: [String, Number] },
-    h: { type: String },
+    h: { type: [String, Number] },
-    width: { type: String },
+    width: { type: [String, Number] },
-    height: { type: String },
+    height: { type: [String, Number] },
-    timeKey: { type: String },
+    timeKey: { type: Array as () => string[] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
+
+const TableHeaderRef = ref()
 const config = useConfig()
-const powerList: any = ref([
+
-    {
-        label: '1#变压器',
-        value: '1'
-    },
-    {
-        label: '2#变压器',
-        value: '2'
-    }
-])
 // 计算是否全屏展示
 const fullscreen = computed(() => {
     const w = Number(prop.w)
@@ -97,177 +119,355 @@ const fullscreen = computed(() => {
         return false
     }
 })
-const exceedingTheLimitList: any = ref([
+// 添加谐波次数选项（2-50）
-    {
+const harmonicCountOptions = ref(Array.from({ length: 49 }, (_, i) => i + 2))
-        label: '2次',
-        value: '2'
-    },
-    {
-        label: '3次',
-        value: '3'
-    },
-    {
-        label: '4次',
-        value: '4'
-    },
-    {
-        label: '5次',
-        value: '5'
-    }
-])
-const indicatorList: any = ref([
-    {
-        label: '谐波电压总畸变率',
-        value: '1'
-    },
-    {
-        label: '各次谐波电压',
-        value: '2'
-    },
-    {
-        label: '各次谐波电压',
-        value: '3'
-    },
-    {
-        label: '三相电压不平衡',
-        value: '4'
-    }
-])
-const echartList = ref({
-    title: {
-        text: '趋势对比'
-    },
 
-    xAxis: {
+const indicatorList = ref()
-        type: 'time',
+
-        axisLabel: {
+const echartList = ref()
-            formatter: {
+
-                day: '{MM}-{dd}',
+const headerHeight = ref(57)
-                month: '{MM}',
+
-                year: '{yyyy}'
+// 监测对象
+const idList = ref([])
+
+// 监测对象
+const initListByIds = () => {
+    getListByIds({}).then((res: any) => {
+        if (res.data?.length > 0) {
+            idList.value = res.data
+            initCode()
+        } else {
+            tableStore.index()
+        }
+    })
+}
+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, item.unit, 'solid'])
+    })
+
+    // 处理治理后数据
+    afterData.forEach((item: any) => {
+        const phase = item.phase || 'default'
+        if (!afterGroupedByPhase[phase]) {
+            afterGroupedByPhase[phase] = []
+        }
+        afterGroupedByPhase[phase].push([item.time, item.statisticalData, item.unit, 'dotted'])
+    })
+
+    // 构建系列数据
+    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
+    }
+
+    // statisticalData
+    //  chartsListBefore.value.map((item: any) => item.statisticalData)
+    //         chartsListAfter.value = tableStore.table.data.after
+
+
+    // 构建图例数据
+    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
             }
         }
-    },
+    })
-
+        let [min, max] = yMethod(
-    yAxis: {},
+        [...chartsListBefore.value.map((item: any) => item.statisticalData),
-    grid: {
+        ...chartsListAfter.value.map((item: any) => item.statisticalData)]
-        left: '10px',
+    )
-        right: '20px'
+    echartList.value = {
-    },
+        title: {
-    options: {
+            text: titleText
-        series: [
+        },
-            {
+        tooltip: {
-                //   name: '暂降次数',
+            axisPointer: {
-                type: 'line',
+                type: 'cross',
-                name: '治理前',
+                label: {
-                showSymbol: false,
+                    color: '#fff',
-                smooth: true,
+                    fontSize: 16
-                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
             },
-            {
+            textStyle: {
-                name: '治理后',
+                color: '#fff',
-                type: 'line',
+                fontStyle: 'normal',
-                showSymbol: false,
+                opacity: 0.35,
-                smooth: true,
+                fontSize: 14
-                data: [
+            },
-                    ['2025-10-16 07:00:00', 10],
+            backgroundColor: 'rgba(0,0,0,0.55)',
-                    ['2025-10-16 07:15:00', 10],
+            borderWidth: 0,
-                    ['2025-10-16 07:30:00', 10],
+            formatter(params: any) {
-                    ['2025-10-16 07:45:00', 10],
+                const xname = params[0].value[0]
-                    ['2025-10-16 08:00:00', 30],
+                let str = `${xname}<br>`
-                    ['2025-10-16 08:15:00', 50],
+                params.forEach((el: any, index: any) => {
-                    ['2025-10-16 08:30:00', 60],
+                    let marker = ''
-                    ['2025-10-16 08:45:00', 70],
-                    ['2025-10-16 09:00:00', 100],
-                    ['2025-10-16 09:15:00', 120],
-                    ['2025-10-16 09:30:00', 130],
-                    ['2025-10-16 09:45:00', 140],
-                    ['2025-10-16 10:00:00', 160],
-                    ['2025-10-16 10:15:00', 160],
-                    ['2025-10-16 10:30:00', 130],
-                    ['2025-10-16 10:45:00', 120],
-                    ['2025-10-16 11:00:00', 140],
-                    ['2025-10-16 11:15:00', 80],
-                    ['2025-10-16 11:30:00', 70],
-                    ['2025-10-16 11:45:00', 90],
-                    ['2025-10-16 12:00:00', 60],
-                    ['2025-10-16 12:15:00', 60],
-                    ['2025-10-16 12:30:00', 60],
-                    ['2025-10-16 12:45:00', 60]
-                ]
-            }
-        ]
-    }
-})
-const headerHeight = ref(57)
-const selectChange = (showSelect: any, height: any) => {
-    headerHeight.value = height
-}
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
 
+                    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: {
+            data: legendData,
+            icon: 'rect',
+            itemWidth: 18,
+            itemHeight: 3,
+            itemStyle: {
+                borderWidth: 0
+            },
+            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 : '',
+            max: max,
+            min: min,
+        },
+        grid: {
+            left: '10px',
+            right: '20px'
+        },
+        series: series
+    }
+}
+
+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]
+        setTime()
-        tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+        if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
+            tableStore.table.params.sensitiveUserId = idList.value[0].id
+        }
+        let lists: any = []
+        // 处理电能质量指标
+        const selectedIndicator = indicatorList.value?.find(
+            (item: any) => item.id === tableStore.table.params.indicator
+        )
+        if (selectedIndicator) {
+            let frequencys = ''
+            if (selectedIndicator.name.includes('谐波含有率')) {
+                frequencys = tableStore.table.params.harmonicCount
+            }
+
+            lists.push({
+                statisticalId: tableStore.table.params.indicator,
+                frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : ''
+            })
+        }
+
+        // 将 lists 添加到请求参数中
+        tableStore.table.params.list = lists
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
+        // 数据加载完成后的处理
+        if (tableStore.table.data) {
+            chartsListBefore.value = tableStore.table.data.before
+            chartsListAfter.value = tableStore.table.data.after
+            setEchart()
+        }
     }
 })
 
-const tableRef = ref()
+tableStore.table.params.indicator = ''
-provide('tableRef', tableRef)
+tableStore.table.params.exceedingTheLimit = ''
-tableStore.table.params.power = '1'
+tableStore.table.params.dataLevel = 'Primary'
-tableStore.table.params.indicator = '1'
+tableStore.table.params.valueType = 'avg'
-tableStore.table.params.exceedingTheLimit = '1'
-tableStore.table.params.searchValue = ''
 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 => {
@@ -275,19 +475,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) {
+// :deep(.el-select) {
-    min-width: 80px;
+//     min-width: 80px;
-}
+// }
 </style>

src/components/echarts/MyEchart.vue

@@ -106,13 +106,15 @@ const initChart = () => {
                 start: 0,
 
                 bottom: '20px',
-                end: 100
+                end: 100,
+                filterMode: 'none'
             },
             {
                 start: 0,
                 height: 13,
                 bottom: '20px',
-                end: 100
+                end: 100,
+                filterMode: 'none'
             }
             // {
             //     show: true,

src/components/echarts/rmsWorker.js

@@ -0,0 +1,320 @@
+// 辅助函数
+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.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　监测点名称:' +
+                boxoList.equipmentName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                boxoList.evtParamVVaDepth +
+                '%　持续时间:' +
+                boxoList.evtParamTm +
+                's'
+        } else if (boxoList.systemType == 'YPT') {
+            titles =
+                (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　监测点名称:' +
+                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,205 @@
+// 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.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
+            boxoList.equipmentName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            boxoList.evtParamVVaDepth +
+            '%　持续时间:' +
+            boxoList.evtParamTm +
+            's'
+    } else if (boxoList.systemType == 'YPT') {
+        titles =
+            (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
+            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"
+        <el-select
-            @change="timeChange">
+            v-model.trim="interval"
-            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
+            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/form/mac/MacAddressInput.vue

@@ -1,35 +1,36 @@
 <template>
-  <div class="mac-address-input" :class="{ disabled: disabled }">
+    <div class="mac-address-input" :class="{ disabled: disabled }">
-    <el-input
+        <el-input
-      ref="inputRef"
+            ref="inputRef"
-      v-model="macValue"
+            placeholder="请输入设备mac地址"
-      type="text"
+            v-model="macValue"
-      maxlength="17"
+            type="text"
-      :disabled="disabled"
+            maxlength="17"
-      @input="handleInput"
+            :disabled="disabled"
-      @keydown="handleKeydown"
+            @input="handleInput"
-      @focus="handleFocus"
+            @keydown="handleKeydown"
-      @blur="handleBlur"
+            @focus="handleFocus"
-      @paste="handlePaste"
+            @blur="handleBlur"
-    />
+            @paste="handlePaste"
-  </div>
+        />
+    </div>
 </template>
 
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 
 interface Props {
-  modelValue?: string
+    modelValue?: string
-  disabled?: boolean
+    disabled?: boolean
 }
 
 interface Emits {
-  (e: 'update:modelValue', value: string): void
+    (e: 'update:modelValue', value: string): void
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  modelValue: '',
+    modelValue: '',
-  disabled: false
+    disabled: false
 })
 
 const emit = defineEmits<Emits>()
@@ -42,35 +43,35 @@ const macValue = ref<string>('')
 
 // 解析传入的MAC地址
 const parseMacAddress = (mac: string): string => {
-  if (!mac) return ''
+    if (!mac) return ''
 
-  // 移除非十六进制字符并转为大写
+    // 移除非十六进制字符并转为大写
-  const cleanMac = mac.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+    const cleanMac = mac.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
 
-  // 按每2个字符分割并用冒号连接
+    // 按每2个字符分割并用冒号连接
-  let result = ''
+    let result = ''
-  for (let i = 0; i < cleanMac.length; i += 2) {
+    for (let i = 0; i < cleanMac.length; i += 2) {
-    if (i > 0) result += ':'
+        if (i > 0) result += ':'
-    result += cleanMac.substr(i, 2)
+        result += cleanMac.substr(i, 2)
-  }
+    }
-  return result.substring(0, 17) // 最多17个字符 (12个数字+5个冒号)
+    return result.substring(0, 17) // 最多17个字符 (12个数字+5个冒号)
 }
 
 // 格式化MAC地址 - 改进版
 const formatMac = (value: string): string => {
-  // 移除所有冒号
+    // 移除所有冒号
-  const cleanValue = value.replace(/:/g, '')
+    const cleanValue = value.replace(/:/g, '')
-  // 只保留十六进制字符并转为大写
+    // 只保留十六进制字符并转为大写
-  const hexOnly = cleanValue.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+    const hexOnly = cleanValue.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
 
-  // 按每两个字符添加冒号，最多6段
+    // 按每两个字符添加冒号，最多6段
-  let formatted = ''
+    let formatted = ''
-  for (let i = 0; i < Math.min(hexOnly.length, 12); i += 2) {
+    for (let i = 0; i < Math.min(hexOnly.length, 12); i += 2) {
-    if (i > 0) formatted += ':'
+        if (i > 0) formatted += ':'
-    formatted += hexOnly.substr(i, 2)
+        formatted += hexOnly.substr(i, 2)
-  }
+    }
 
-  return formatted
+    return formatted
 }
 
 // 当前聚焦的输入框索引
@@ -78,88 +79,86 @@ const focusedIndex = ref<number | null>(null)
 
 // 处理输入事件
 const handleInput = (value: string) => {
-  const formatted = formatMac(value)
+    const formatted = formatMac(value)
-  macValue.value = formatted
+    macValue.value = formatted
-  // 发出不带冒号的纯净值
+    // 发出不带冒号的纯净值
-  emit('update:modelValue', formatted.replace(/:/g, ''))
+    emit('update:modelValue', formatted.replace(/:/g, ''))
 }
 
 // 处理键盘事件
 const handleKeydown = (event: KeyboardEvent) => {
-  const target = event.target as HTMLInputElement
+    const target = event.target as HTMLInputElement
 
-  // 处理退格键
+    // 处理退格键
-  if (event.key === 'Backspace') {
+    if (event.key === 'Backspace') {
-    // 处理在冒号前删除的情况
+        // 处理在冒号前删除的情况
-    const cursorPos = target.selectionStart || 0
+        const cursorPos = target.selectionStart || 0
-    if (cursorPos > 0 && macValue.value[cursorPos - 1] === ':' && 
+        if (cursorPos > 0 && macValue.value[cursorPos - 1] === ':' && target.selectionStart === target.selectionEnd) {
-        target.selectionStart === target.selectionEnd) {
+            event.preventDefault()
-      event.preventDefault()
+            // 删除冒号前的两个字符
-      // 删除冒号前的两个字符
+            const newValue = macValue.value.substring(0, cursorPos - 3) + macValue.value.substring(cursorPos)
-      const newValue = macValue.value.substring(0, cursorPos - 3) + 
+            macValue.value = newValue
-                      macValue.value.substring(cursorPos)
+            // 设置光标位置
-      macValue.value = newValue
+            setTimeout(() => {
-      // 设置光标位置
+                if (target.setSelectionRange) {
-      setTimeout(() => {
+                    target.setSelectionRange(cursorPos - 3, cursorPos - 3)
-        if (target.setSelectionRange) {
+                }
-          target.setSelectionRange(cursorPos - 3, cursorPos - 3)
+            }, 0)
+            emit('update:modelValue', newValue.replace(/:/g, ''))
         }
-      }, 0)
-      emit('update:modelValue', newValue.replace(/:/g, ''))
     }
-  }
 }
 
 // 处理焦点事件
 const handleFocus = () => {
-  focusedIndex.value = 0
+    focusedIndex.value = 0
 }
 
 // 处理失焦事件
 const handleBlur = () => {
-  focusedIndex.value = null
+    focusedIndex.value = null
 }
 
 // 处理粘贴事件
 const handlePaste = (event: ClipboardEvent) => {
-  event.preventDefault()
+    event.preventDefault()
-  const pastedText = event.clipboardData?.getData('text') || ''
+    const pastedText = event.clipboardData?.getData('text') || ''
 
-  // 清理粘贴的文本
+    // 清理粘贴的文本
-  const cleanPastedText = pastedText.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+    const cleanPastedText = pastedText.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
-  const formatted = formatMac(cleanPastedText)
+    const formatted = formatMac(cleanPastedText)
-  macValue.value = formatted
+    macValue.value = formatted
-  emit('update:modelValue', formatted.replace(/:/g, ''))
+    emit('update:modelValue', formatted.replace(/:/g, ''))
 }
 
 // 监听modelValue变化
 watch(
-  () => props.modelValue,
+    () => props.modelValue,
-  (newVal) => {
+    newVal => {
-    const cleanNewVal = (newVal || '').replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+        const cleanNewVal = (newVal || '').replace(/[^0-9a-fA-F]/g, '').toUpperCase()
-    const currentCleanValue = macValue.value.replace(/:/g, '')
+        const currentCleanValue = macValue.value.replace(/:/g, '')
 
-    if (cleanNewVal !== currentCleanValue) {
+        if (cleanNewVal !== currentCleanValue) {
-      macValue.value = parseMacAddress(cleanNewVal)
+            macValue.value = parseMacAddress(cleanNewVal)
-    }
+        }
-  },
+    },
-  { immediate: true }
+    { immediate: true }
 )
 </script>
 
 <style scoped lang="scss">
 .mac-address-input {
-  width: 100%;
+    width: 100%;
 
-  &.disabled {
+    &.disabled {
-    opacity: 0.7;
+        opacity: 0.7;
-  }
+    }
-  
+
-  :deep(.el-input__wrapper) {
+    :deep(.el-input__wrapper) {
-    input {
+        input {
-      text-transform: uppercase;
+            text-transform: uppercase;
-      font-family: inherit; // 使用继承的字体而不是等宽字体
+            font-family: inherit; // 使用继承的字体而不是等宽字体
+        }
     }
-  }
 }
 </style>

src/components/table/fieldRender/index.vue

@@ -21,8 +21,8 @@
         <el-image
             :hide-on-click-modal="true"
             :preview-teleported="true"
-            :preview-src-list="[fieldValue]"
+            :preview-src-list="[imgList[fieldValue]]"
-            :src="fieldValue.length > 100 ? fieldValue : getUrl(fieldValue)"
+            :src="fieldValue.length > 100 ? fieldValue : getUrl(fieldValue) ? imgList[fieldValue] : ''"
         ></el-image>
     </div>
 
@@ -226,10 +226,12 @@ const handlerCommand = (item: OptButton) => {
             break
     }
 }
+const imgList: any = ref({})
 const getUrl = (url: string) => {
     getFileUrl({ filePath: url }).then(res => {
-        return res.data
+        imgList.value[url] = res.data
     })
+    return true
 }
 </script>
 

src/components/table/header/index.vue

@@ -2,7 +2,7 @@
     <div ref="tableHeader" class="cn-table-header">
         <div class="table-header ba-scroll-style" :key="num">
             <el-form
-                style="flex: 1; height: 34px; margin-right: 20px; display: flex; flex-wrap: wrap"
+                style="flex: 1; height: 34px; margin-right: 0px; display: flex; flex-wrap: wrap"
                 ref="headerForm"
                 @submit.prevent=""
                 @keyup.enter="onComSearch"
@@ -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">
@@ -23,12 +29,27 @@
                     <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
                     <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
                 </el-button>
-                <el-button @click="onComSearch" v-if="showSearch" type="primary" :icon="Search">查询</el-button>
+                <el-button
-                <el-button @click="onResetForm" v-if="showSearch && showReset" :icon="RefreshLeft">重置</el-button>
+                    @click="onComSearch"
+                    v-if="showSearch"
+                    :loading="tableStore.table.loading"
+                    type="primary"
+                    :icon="Search"
+                >
+                    查询
+                </el-button>
+                <el-button
+                    @click="onResetForm"
+                    v-if="showSearch && showReset"
+                    :loading="tableStore.table.loading"
+                    :icon="RefreshLeft"
+                >
+                    重置
+                </el-button>
                 <el-button
                     @click="onExport"
                     v-if="showExport"
-                    :loading="tableStore.table.loading"
+                    :loading="tableStore.table.exportLoading"
                     type="primary"
                     icon="el-icon-Download"
                 >
@@ -57,6 +78,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 +91,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 +104,8 @@ interface Props {
     theCurrentTime?: boolean //控制时间前3天展示上个月时间
     showReset?: boolean //是否显示重置
     showExport?: boolean //导出控制
+    timeCacheFlag?: boolean //是否取缓存时间
+    timeKeyList?: string[] //日期下拉列表
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -84,8 +115,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 +150,31 @@ const headerFormSecondStyleClose = {
     padding: '0'
 }
 onMounted(() => {
-    if (props.datePicker && tableStore) {
+    // 设置初始值到 DatePicker
-        tableStore.table.params.searchBeginTime = datePickerRef.value?.timeValue[0]
+    if (props.datePicker && datePickerRef.value) {
-        tableStore.table.params.searchEndTime = datePickerRef.value?.timeValue[1]
+        // 从缓存中获取值并设置
-        tableStore.table.params.startTime = datePickerRef.value?.timeValue[0]
+        const cached = timeCacheStore.getCache(route.path)
-        tableStore.table.params.endTime = datePickerRef.value?.timeValue[1]
+        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 +249,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"
+        <vxe-table
-            v-loading="tableStore.table.loading" v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            ref="tableRef"
-            @checkbox-all="selectChangeEvent" @checkbox-change="selectChangeEvent" :showOverflow="showOverflow"
+            height="auto"
-            :sort-config="{ remote: true }" @sort-change="handleSortChange">
+            :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"
+                <Column
-                    :tree-node="item.treeNode">
+                    :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 +
+                        <FieldRender
-                            '-' +
+                            :field="item"
-                            item.render +
+                            :row="scope.row"
-                            '-' +
+                            :column="scope.column"
-                            (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
+                            :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"
+        <el-pagination
-            :page-sizes="pageSizes" background
+            :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"
+            :total="tableStore.table.total"
-            @current-change="onTableCurrentChange"></el-pagination>
+            @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/allocation.vue

@@ -0,0 +1,191 @@
+<template>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
+        <div class="mt10 mr10" style="display: flex; justify-content: end" v-if="showBut">
+            <el-button type="primary" icon="el-icon-Select" @click="save" :loading="loading">保存</el-button>
+        </div>
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input maxlength="32" v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input>
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
+                    <template #content>
+                        <span>台账推送</span>
+                    </template>
+
+                    <Icon
+                        name="el-icon-Promotion"
+                        size="20"
+                        class="fold ml10 menu-collapse"
+                        style="cursor: pointer"
+                        :style="{ color: config.getColorVal('elementUiPrimary') }"
+                        @click="onAdd"
+                    />
+                </el-tooltip>
+                <!-- <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 - ${height}px)` }"
+                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">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+                        <span style="margin-left: 4px">{{ node.label }}</span>
+                    </span>
+                </template>
+            </el-tree>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+
+import { ref, watch } from 'vue'
+
+import { useConfig } from '@/stores/config'
+
+defineOptions({
+    name: 'govern/tree'
+})
+
+interface Props {
+    width?: string
+    canExpand?: boolean
+    showPush?: boolean
+    showBut?: boolean
+    height?: number
+}
+const loading = ref(false)
+const props = withDefaults(defineProps<Props>(), {
+    width: '280px',
+    canExpand: true,
+    showPush: false,
+    showBut: true,
+    height: 267
+})
+const config = useConfig()
+const { proxy } = useCurrentInstance()
+const menuCollapse = ref(false)
+const filterText = ref('')
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+const emit = defineEmits(['checkTreeNodeChange', 'onAdd', 'checkChange'])
+watch(filterText, val => {
+    treeRef.value!.filter(val)
+})
+const onMenuCollapse = () => {
+    menuCollapse.value = !menuCollapse.value
+    proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
+}
+const save = () => {
+    loading.value = true
+    emit('checkChange')
+}
+const filterNode = (value: string, data: any, node: any) => {
+    console.log(value, data, node, 'filterNode')
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+
+// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
+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 checkTreeNodeChange = () => {
+    // console.log(treeRef.value?.getCheckedNodes(), "ikkkkkiisiiisis");
+    emit('checkTreeNodeChange', treeRef.value?.getCheckedNodes())
+}
+
+const onAdd = () => {
+    emit('onAdd')
+}
+
+const treeRef = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef, loading })
+</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%;
+
+    :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);
+    }
+}
+
+.custom-tree-node {
+    display: flex;
+    align-items: center;
+}
+</style>

src/components/tree/cloudDevice.vue

@@ -5,7 +5,7 @@
             style='cursor: pointer' />
         <div class='cn-tree' :style='{ opacity: menuCollapse ? 0 : 1 }'>
             <div style='display: flex; align-items: center' class='mb10'>
-                <el-input maxlength="32" show-word-limit v-model.trim='filterText' placeholder='请输入内容' clearable>
+                <el-input maxlength="32"  v-model.trim='filterText' placeholder='请输入内容' clearable>
                     <template #prefix>
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>
@@ -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)' }"
+            <el-tree :style="{ height:  'calc(100vh - 230px)' }"
-            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'>
@@ -32,7 +32,6 @@
 <script lang='ts' setup>
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
-import { emit } from 'process';
 import { ref, watch } from 'vue'
 
 defineOptions({
@@ -75,7 +74,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

@@ -1,27 +1,61 @@
 <!-- 设备管理使用折叠面板渲染多个tree -->
 <template>
     <div :style="{ width: menuCollapse ? '40px' : props.width }" style="display: flex; overflow: hidden">
-        <Icon v-show="menuCollapse" @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+        <Icon
-            :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 mt20 menu-collapse"
+            v-show="menuCollapse"
-            style="cursor: pointer" />
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
                 <!-- <el-form-item> -->
-                <el-input maxlength="32" show-word-limit v-model.trim="filterText" autocomplete="off"
+
-                    placeholder="请输入内容" clearable>
+                <el-input
+                    maxlength="32"
+                    v-model.trim="filterText"
+                    autocomplete="off"
+                    placeholder="请输入内容"
+                    clearable
+                >
+                    <template #prepend>
+                        <el-select v-model="treeType" @change="changeTreeType" style="min-width: 75px">
+                            <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </template>
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
+
                 <!-- </el-form-item> -->
-                <Icon @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                <Icon
-                    :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 menu-collapse"
+                    @click="onMenuCollapse"
-                    style="cursor: pointer" v-if="props.canExpand" />
+                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    :class="menuCollapse ? 'unfold' : ''"
+                    size="18"
+                    class="fold ml10 menu-collapse"
+                    style="cursor: pointer"
+                    v-if="props.canExpand"
+                />
             </div>
 
-            <el-collapse :accordion="true" v-model.trim="activeName" style="flex: 1; height: 100%"
+            <el-collapse
-                @change="changeDevice">
+                :accordion="true"
-
+                v-model.trim="activeName"
+                style="flex: 1; height: 100%"
+                @change="changeDevice"
+                v-if="treeType == '1'"
+                v-loading="loading"
+            >
                 <el-collapse-item title="治理设备" name="0" v-if="zlDeviceData.length != 0">
                     <el-select v-model.trim="process" clearable placeholder="请选择状态" class="mb10">
                         <el-option label="功能调试" value="2"></el-option>
@@ -29,13 +63,30 @@
                         <el-option label="正式投运" value="4"></el-option>
                     </el-select>
                     <el-tree
-                        :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 278px)' }"
+                        :style="{
-                        ref="treeRef1" :props="defaultProps" highlight-current :filter-node-method="filterNode"
+                            height:
-                        node-key="id" :default-expand-all="false" v-bind="$attrs" :data="zlDevList" style="overflow: auto">
+                                treeType.length != 0
+                                    ? `calc(100vh - 380px - ${props.height}px)`
+                                    : 'calc(100vh - 278px)'
+                        }"
+                        ref="treeRef1"
+                        :props="defaultProps"
+                        highlight-current
+                        :filter-node-method="filterNode"
+                        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 }"
+                                <Icon
-                                    v-if="data.icon" />
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -43,35 +94,93 @@
                 </el-collapse-item>
                 <el-collapse-item title="便携式设备" name="1" v-if="bxsDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 280px)' : 'calc(100vh - 238px)' }"
+                        :style="{
-                        ref="treeRef2" :props="defaultProps" highlight-current :default-expand-all="false"
+                            height:
-                        :filter-node-method="filterNode" node-key="id" :data="bxsDeviceData" v-bind="$attrs"
+                                zlDeviceData.length != 0
-                        style="overflow: auto">
+                                    ? `calc(100vh - 340px - ${props.height}px)`
+                                    : 'calc(100vh - 238px)'
+                        }"
+                        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 }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
+                                <Icon
-                                    v-if="data.icon" />
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
                     </el-tree>
                 </el-collapse-item>
-                <el-collapse-item title="在线设备" name="2" v-if="frontDeviceData.length != 0">
+                <el-collapse-item title="监测设备" name="2" v-if="frontDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 280px)' : 'calc(100vh - 238px)' }"
+                        :style="{
-                        ref="treeRef3" :props="defaultProps" highlight-current :default-expand-all="false"
+                            height:
-                        :filter-node-method="filterNode" node-key="id" :data="frontDeviceData" v-bind="$attrs"
+                                zlDeviceData.length != 0
-                        style="overflow: auto">
+                                    ? `calc(100vh - 340px - ${props.height}px)`
+                                    : 'calc(100vh - 238px)'
+                        }"
+                        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 }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
+                                <Icon
-                                    v-if="data.icon" />
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
                     </el-tree>
                 </el-collapse-item>
             </el-collapse>
+            <div v-if="treeType == '2'" v-loading="loading">
+                <el-tree
+                    :style="{ height: `calc(100vh - 188px - ${props.height}px )` }"
+                    ref="treeRef4"
+                    :props="defaultProps"
+                    highlight-current
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    v-bind="$attrs"
+                    :data="data"
+                    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 }"
+                                v-if="data.icon"
+                            />
+                            <span style="margin-left: 4px">{{ node.label }}</span>
+                        </span>
+                    </template>
+                </el-tree>
+            </div>
         </div>
     </div>
 </template>
@@ -84,20 +193,35 @@ import { ref, watch, defineEmits, onMounted, nextTick } from 'vue'
 defineOptions({
     name: 'govern/tree'
 })
-const emit = defineEmits(['changeDeviceType'])
+const emit = defineEmits(['changeDeviceType', 'changeTreeType'])
 interface Props {
     width?: string
     canExpand?: boolean
     type?: string
     data?: any
+    height?: number
+    engineering: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
     width: '280px',
     canExpand: true,
     type: '',
-    data: []
+    data: [],
+    height: 0,
+    engineering: false
 })
+const treeType = ref('1')
+const options = [
+    {
+        label: '设备',
+        value: '1'
+    },
+    {
+        label: '工程',
+        value: '2'
+    }
+]
 const { proxy } = useCurrentInstance()
 const menuCollapse = ref(false)
 const activeName = ref('0')
@@ -130,13 +254,12 @@ watch(
                     item.children.map((vv: any) => {
                         bxsDeviceData.value.push(vv)
                     })
-                }else if (item.name == '在线设备') {
+                } else if (item.name == '监测设备') {
                     frontDeviceData.value = []
 
                     item.children.map((vv: any) => {
                         frontDeviceData.value.push(vv)
                     })
-
                 }
             })
         }
@@ -148,7 +271,9 @@ watch(
 )
 
 watch(filterText, val => {
-    if (activeName.value == '0') {
+    if (treeType.value == '2') {
+        treeRef4.value!.filter(val)
+    } else if (activeName.value == '0') {
         treeRef1.value!.filter(val)
     } else if (activeName.value == '1') {
         treeRef2.value!.filter(val)
@@ -157,8 +282,9 @@ watch(filterText, val => {
     }
 })
 watch(process, val => {
-    if (val == '') {
+    if (val == '' || val == undefined) {
         zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
+        console.log('🚀 ~ zlDevList.value:', zlDeviceData.value)
     } else {
         zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
     }
@@ -176,7 +302,7 @@ 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: children
@@ -228,7 +354,6 @@ const chooseNode = (value: string, data: any, node: any) => {
 }
 
 const changeDevice = (val: any) => {
-    console.log('changeDevice', val)
     let arr1: any = []
 
     //zlDeviceData
@@ -259,22 +384,30 @@ const changeDevice = (val: any) => {
         arr2.map((item: any) => {
             item.checked = false
         })
-        treeRef1.value && treeRef1.value.setCurrentKey(arr1[0]?.id)
+
         emit('changeDeviceType', activeName.value, arr1[0])
+        setTimeout(() => {
+            treeRef1.value?.setCurrentKey(arr1[0]?.id)
+        }, 100)
     }
     if (val == '1') {
         arr1.map((item: any) => {
             item.checked = false
         })
-        treeRef2.value && treeRef2.value.setCurrentKey(arr2[0]?.id)
         emit('changeDeviceType', activeName.value, arr2[0])
+        setTimeout(() => {
+            treeRef2.value?.setCurrentKey(arr2[0]?.id)
+        }, 100)
     }
     if (val == '2') {
         arr3.map((item: any) => {
             item.checked = false
         })
-        treeRef3.value && treeRef3.value.setCurrentKey(arr3[0]?.id)
+
         emit('changeDeviceType', activeName.value, arr3[0])
+        setTimeout(() => {
+            treeRef3.value?.setCurrentKey(arr3[0]?.id)
+        }, 100)
     }
 }
 //治理
@@ -283,24 +416,44 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 //前置
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
-defineExpose({ treeRef1, treeRef2 })
+const treeRef4 = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef1, treeRef2, treeRef3, treeRef4 })
 onMounted(() => {
+    treeType.value = props.engineering ? '2' : '1'
     setTimeout(() => {
-        if (zlDeviceData.value.length != 0) {
+        setActiveName()
-            zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
-            activeName.value = '0'
-        }
-        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
-            activeName.value = '1'
-        }
-        if (!zlDeviceData.value && !bxsDeviceData.value) {
-            activeName.value = ''
-        }
-        nextTick(() => {
-            changeDevice(activeName.value)
-        })
     }, 500)
 })
+
+const setActiveName = () => {
+    if (zlDeviceData.value.length != 0) {
+        zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
+        activeName.value = '0'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
+        activeName.value = '1'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
+        activeName.value = '2'
+    }
+    if (!zlDeviceData.value && !bxsDeviceData.value) {
+        activeName.value = ''
+    }
+    nextTick(() => {
+        changeDevice(activeName.value)
+    })
+}
+const loading = ref(false)
+const changeTreeType = (val: string) => {
+    loading.value = true
+    emit('changeTreeType', val)
+    if (val == '1') {
+        setActiveName()
+    }
+    setTimeout(() => {
+        loading.value = false
+    }, 1000)
+}
 </script>
 
 <style lang="scss" scoped>
@@ -330,4 +483,7 @@ onMounted(() => {
     display: flex;
     align-items: center;
 }
+:deep(.el-input-group__prepend) {
+    background-color: var(--el-fill-color-blank);
+}
 </style>

src/components/tree/govern/cloudDeviceEntryTree.vue

@@ -1,159 +1,97 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree
+        ref="treRef"
+        :width="width"
+        :showPush="props.showPush"
+        :expand-on-click-node="false"
+        :data="tree"
+        @changePointType="changePointType"
+        @onAdd="onAdd"
+    />
 </template>
 
 <script lang="ts" setup>
 import { ref, nextTick, onMounted, defineProps } from 'vue'
 import Tree from '../index.vue'
-import { getLineTree,getCldTree } from '@/api/cs-device-boot/csLedger'
+import { getLineTree, getCldTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 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'
 })
 
-const emit = defineEmits(['init', 'checkChange', 'pointTypeChange', 'Policy','onAdd'])
+const emit = defineEmits(['init', 'checkChange', 'pointTypeChange', 'Policy', 'onAdd'])
 const config = useConfig()
 const tree = ref()
 const dictData = useDictData()
 const treRef = ref()
 const width = ref('')
 
-
 const info = (selectedNodeId?: string) => {
     tree.value = []
     let arr1: any[] = []
     getCldTree().then(res => {
-        try {
+        res.data.icon = 'el-icon-Menu'
-            // 检查响应数据结构
+        res.data.color = config.getColorVal('elementUiPrimary')
-            let rootData = null;
+        res.data?.children.map((item: any) => {
-            if (Array.isArray(res.data)) {
+            item.icon = 'el-icon-HomeFilled'
-                // 旧的数据结构 - 数组
+            item.color = config.getColorVal('elementUiPrimary')
-                rootData = res.data.find((item: any) => item.name == '在线设备');
+            item.children.forEach((item: any) => {
-            } else if (res.data && res.data.name == '在线设备') {
+                item.icon = 'el-icon-List'
-                // 新的数据结构 - 单个对象
+                item.color = config.getColorVal('elementUiPrimary')
-                rootData = res.data;
+                item.children.forEach((item2: any) => {
-            }
+                    // item2.icon = 'el-icon-List'
-
+                    // item2.color = config.getColorVal('elementUiPrimary')
-            // 治理设备
+                    item2.icon = 'el-icon-Platform'
-            if (rootData) {
+                    item2.level = 2
-                rootData.icon = 'el-icon-Menu'
+                    item2.color = item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                rootData.level = 0
+                    item2.children.forEach((item3: any) => {
-                rootData.color = config.getColorVal('elementUiPrimary')
+                        item3.icon = 'el-icon-Platform' 
-                // 确保根节点的 children 是数组
+                        item3.color =
-                if (!Array.isArray(rootData.children)) {
+                            item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                    rootData.children = []
+                        arr1.push(item3)
-                }
-                rootData.children.forEach((item: any) => {
-                    item.icon = 'el-icon-HomeFilled'
-                    item.level = 1
-                    item.color = config.getColorVal('elementUiPrimary')
-                    // 确保 children 是数组
-                    if (!Array.isArray(item.children)) {
-                        item.children = []
-                    }
-                    item.children.forEach((item2: any) => {
-                        item2.icon = 'el-icon-List'
-                        item2.level = 2
-                        item2.color = config.getColorVal('elementUiPrimary')
-                        
-                        // 确保 children 是数组
-                        if (!Array.isArray(item2.children)) {
-                            item2.children = []
-                        }
-                        item2.children.forEach((item3: any) => {
-                            item3.icon = 'el-icon-Platform'
-                            item3.level = 3
-                            item3.color =
-                                item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                                
-                            // 确保 children 是数组
-                            if (!Array.isArray(item3.children)) {
-                                item3.children = []
-                            }
-                            
-                            item3.children.forEach((item4: any) => {
-                                item4.icon = 'el-icon-Platform'
-                                item4.level = 4
-                                item4.color =
-                                    item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                                arr1.push(item4)
-                            })
-                        })
                     })
                 })
-                tree.value = [rootData] // 确保 tree.value 是数组
-            } else {
-                tree.value = []
-            }
-            nextTick(() => {
-                if (arr1.length) {
-                    // 安全检查 treRef 和 treeRef1 是否存在
-                    if (treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey) {
-                        // 如果传入了要选中的节点ID，则选中该节点，否则选中第一个节点
-                        console.log('selectedNodeId:', selectedNodeId);
-                        if (selectedNodeId) {
-                            treRef.value.treeRef1.setCurrentKey(selectedNodeId);
-                            // 查找对应的节点数据并触发事件
-                            let selectedNode = null;
-                            const findNode = (nodes: any[]) => {
-                                for (const node of nodes) {
-                                    if (node.id === selectedNodeId) {
-                                        selectedNode = node;
-                                        return true;
-                                    }
-                                    if (node.children && findNode(node.children)) {
-                                        return true;
-                                    }
-                                }
-                                return false;
-                            };
-                            
-                            findNode(tree.value);
-                            
-                            if (selectedNode) {
-                                emit('init', {
-                                    level: selectedNode.level,
-                                    ...selectedNode
-                                });
-                            }
-                        } else {
-                            // 初始化选中第一个节点
-                            treRef.value.treeRef1.setCurrentKey(arr1[0].id);
-                            emit('init', {
-                                level: 2,
-                                ...arr1[0]
-                            });
-                        }
-                    }
-                } else {
-                  
-                }
             })
-        } catch (error) {
+        })
-            console.error('Error in processing getCldTree response:', error)
+        tree.value = [res.data]
-        }
+
+        nextTick(() => {
+            setTimeout(() => {
+                //初始化选中
+
+                treRef.value?.treeRef.setCurrentKey(arr1[0].id)
+                // 注册父组件事件
+                emit('init', {
+                    level: 3,
+                    ...arr1[0]
+                })
+                changePointType('4', arr1[0])
+                return
+            }, 500)
+        })
     })
 }
 
-
 const changePointType = (val: any, obj: any) => {
-    emit('pointTypeChange', val, obj)
+    // emit('pointTypeChange', val, obj)
 }
 
 const onAdd = () => {
     emit('onAdd')
 }
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id })
+    querySysExcel({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/cloudDeviceEntryTreeZL.vue

@@ -0,0 +1,106 @@
+<template>
+    <Tree
+        ref="treRef"
+        :width="width"
+        :showPush="props.showPush"
+        :data="tree"
+        default-expand-all
+        @changePointType="changePointType"
+        @onAdd="onAdd"
+    />
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, onMounted, defineProps } from 'vue'
+import Tree from '../index.vue'
+import { getLineTree, objTree } from '@/api/cs-device-boot/csLedger'
+import { useConfig } from '@/stores/config'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+
+interface Props {
+    template?: boolean
+    showPush?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    template: false,
+    showPush: false
+})
+defineOptions({
+    name: 'govern/deviceTree'
+})
+
+const emit = defineEmits(['init', 'checkChange', 'pointTypeChange', 'Policy', 'onAdd'])
+const config = useConfig()
+const tree = ref()
+const dictData = useDictData()
+const treRef = ref()
+const width = ref('')
+
+const info = (selectedNodeId?: string) => {
+    tree.value = []
+    let arr1: any[] = []
+    objTree().then(res => {
+        try {
+            res.data.map((item: any) => {
+                item.icon = 'el-icon-HomeFilled'
+                item.level = 1
+                item.color = config.getColorVal('elementUiPrimary')
+                item.children.forEach((item: any) => {
+                    item.icon = 'el-icon-List'
+                    item.level = 2
+                    item.color = config.getColorVal('elementUiPrimary')
+                    item.children.forEach((item2: any) => {
+                        arr1.push(item2)
+                        item2.icon = 'el-icon-Platform'
+                        item2.level = 3
+                        item2.color = config.getColorVal('elementUiPrimary')
+                    })
+                })
+            })
+            tree.value = res.data
+            nextTick(() => {
+                if (arr1.length) {
+                    //初始化选中
+                    treRef.value.treeRef.setCurrentKey(arr1[0].id)
+                    // 注册父组件事件
+                    emit('init', arr1[0])
+                    return
+                } else {
+                    emit('init')
+                    return
+                }
+            })
+        } catch (error) {
+            console.error('Error in processing getCldTree response:', error)
+        }
+    })
+}
+
+const changePointType = (val: any, obj: any) => {
+    emit('pointTypeChange', val, obj)
+}
+
+const onAdd = () => {
+    emit('onAdd')
+}
+if (props.template) {
+    querySysExcel({ id: dictData.state.area[0]?.id })
+        .then((res: any) => {
+            emit('Policy', res.data)
+            info()
+        })
+        .catch(err => {
+            info()
+        })
+} else {
+    info()
+}
+
+// 暴露 info 方法给父组件调用
+defineExpose({
+    info
+})
+
+onMounted(() => {})
+</script>

src/components/tree/govern/csLedgerLineTree.vue

@@ -0,0 +1,187 @@
+<template>
+    <Tree
+        ref="treRef"
+        :width="width"
+        :showPush="props.showPush"
+        :data="tree"
+        default-expand-all
+        @changePointType="changePointType"
+        @onAdd="onAdd"
+    />
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, onMounted, defineProps } from 'vue'
+import Tree from '../index.vue'
+import { getLineTree, lineTree } from '@/api/cs-device-boot/csLedger'
+import { useConfig } from '@/stores/config'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+
+interface Props {
+    template?: boolean
+    showPush?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    template: false,
+    showPush: false
+})
+defineOptions({
+    name: 'govern/deviceTree'
+})
+
+const emit = defineEmits(['init', 'checkChange', 'pointTypeChange', 'Policy', 'onAdd'])
+const config = useConfig()
+const tree = ref()
+const dictData = useDictData()
+const treRef = ref()
+const width = ref('')
+
+const info = (selectedNodeId?: string) => {
+    tree.value = []
+    let arr1: any[] = []
+    lineTree().then(res => {
+        try {
+            // 检查响应数据结构
+            let rootData = null
+            if (Array.isArray(res.data)) {
+                // 旧的数据结构 - 数组
+                rootData = res.data.find((item: any) => item.name == '监测设备')
+            } else if (res.data && res.data.name == '监测设备') {
+                // 新的数据结构 - 单个对象
+                rootData = res.data
+            }
+
+            // 治理设备
+            if (rootData) {
+                rootData.icon = 'el-icon-Menu'
+                rootData.level = 0
+                rootData.color = config.getColorVal('elementUiPrimary')
+                // 确保根节点的 children 是数组
+                if (!Array.isArray(rootData.children)) {
+                    rootData.children = []
+                }
+                rootData.children.forEach((item: any) => {
+                    item.icon = 'el-icon-HomeFilled'
+                    item.level = 1
+                    item.color = config.getColorVal('elementUiPrimary')
+                    // 确保 children 是数组
+                    if (!Array.isArray(item.children)) {
+                        item.children = []
+                    }
+                    item.children.forEach((item2: any) => {
+                        item2.icon = 'el-icon-List'
+                        item2.level = 2
+                        item2.color = config.getColorVal('elementUiPrimary')
+
+                        // 确保 children 是数组
+                        if (!Array.isArray(item2.children)) {
+                            item2.children = []
+                        }
+                        item2.children.forEach((item3: any) => {
+                            item3.icon = 'el-icon-Platform'
+                            item3.level = 3
+                            item3.color =
+                                item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+
+                            // 确保 children 是数组
+                            if (!Array.isArray(item3.children)) {
+                                item3.children = []
+                            }
+
+                            item3.children.forEach((item4: any) => {
+                                item4.icon = 'el-icon-Platform'
+                                item4.level = 4
+                                item4.color =
+                                    item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                                arr1.push(item4)
+                            })
+                        })
+                    })
+                })
+                tree.value = [rootData] // 确保 tree.value 是数组
+            } else {
+                tree.value = []
+            }
+            nextTick(() => {
+                if (arr1.length) {
+                    // 安全检查 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.treeRef.setCurrentKey(selectedNodeId)
+                            // 查找对应的节点数据并触发事件
+                            let selectedNode = null
+                            const findNode = (nodes: any[]) => {
+                                for (const node of nodes) {
+                                    if (node.id === selectedNodeId) {
+                                        selectedNode = node
+                                        return true
+                                    }
+                                    if (node.children && findNode(node.children)) {
+                                        return true
+                                    }
+                                }
+                                return false
+                            }
+
+                            findNode(tree.value)
+
+                            if (selectedNode) {
+                                emit('init', {
+                                    level: selectedNode.level,
+                                    ...selectedNode
+                                })
+                            }
+                        } else {
+                            // 初始化选中第一个节点
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id)
+                            emit('init', {
+                                level: 2,
+                                ...arr1[0]
+                            })
+                        }
+                    }
+                } else {
+                }
+            })
+        } catch (error) {
+            console.error('Error in processing getCldTree response:', error)
+        }
+    })
+}
+
+const changePointType = (val: any, obj: any) => {
+    emit('pointTypeChange', val, obj)
+}
+
+const onAdd = () => {
+    emit('onAdd')
+}
+if (props.template) {
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
+        .then((res: any) => {
+            emit('Policy', res.data)
+            info()
+        })
+        .catch(err => {
+            info()
+        })
+} else {
+    info()
+}
+
+// 暴露 info 方法给父组件调用
+defineExpose({
+    info
+})
+
+onMounted(() => {})
+</script>

src/components/tree/govern/deviceTree.vue

@@ -5,15 +5,20 @@
         :default-checked-keys="defaultCheckedKeys"
         :show-checkbox="props.showCheckbox"
         :data="tree"
+        :height="props.height"
         @changeDeviceType="changeDeviceType"
+        @changeTreeType="info"
+        :engineering="props.engineering"
     />
 </template>
 
 <script lang="ts" setup>
-import { ref, nextTick, defineEmits } from 'vue'
+import { ref, nextTick } from 'vue'
 import Tree from '../device.vue'
 import { getDeviceTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
+import { throttle } from 'lodash'
+
 defineOptions({
     name: 'govern/deviceTree'
 })
@@ -21,10 +26,14 @@ const props = withDefaults(
     defineProps<{
         showCheckbox?: boolean
         defaultCheckedKeys?: any
+        height?: number
+        engineering?: boolean
     }>(),
     {
         showCheckbox: false,
-        defaultCheckedKeys: []
+        defaultCheckedKeys: [],
+        height: 0,
+        engineering: false
     }
 )
 const emit = defineEmits(['init', 'checkChange', 'deviceTypeChange'])
@@ -32,115 +41,168 @@ const config = useConfig()
 const tree = ref()
 const treRef = ref()
 const changeDeviceType = (val: any, obj: any) => {
-    console.log("🚀 ~ changeDeviceType ~ val:", val,obj)
     emit('deviceTypeChange', val, obj)
 }
-getDeviceTree().then(res => {
+
-    let arr: any[] = []
+const info = (type?: string) => {
-    let arr2: any[] = []
+    getDeviceTree({ type: type == '2' ? 'engineering' : '' }).then(res => {
-    let arr3: any[] = []
+        let arr: any[] = []
-    //治理设备
+        let arr2: any[] = []
-    res.data.map((item: any) => {
+        let arr3: any[] = []
-        if (item.name == '治理设备') {
+        let arr4: any[] = []
-            item.children.forEach((item: any) => {
+        //治理设备
+        res.data.map((item: any) => {
+            if (type == '2') {
                 item.icon = 'el-icon-HomeFilled'
                 item.color = config.getColorVal('elementUiPrimary')
-                item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-List'
-                    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'
-                        }
-                        arr.push(item3)
-                    })
-                })
-            })
-        } else if (item.name == '便携式设备') {
-            item.children.forEach((item: any) => {
-                item.icon = 'el-icon-Platform'
-                item.color = config.getColorVal('elementUiPrimary')
-                item.color = '#e26257 !important'
-                item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-
-                if (item.type == 'device') {
-                    arr2.push(item)
-                }
-                item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-Platform'
-                    item2.color = item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-
-                    // item2.children.forEach((item3: any) => {
-                    //     item3.icon = 'el-icon-Platform'
-                    //     item3.color = config.getColorVal('elementUiPrimary')
-                    //     if (item3.comFlag === 1) {
-                    //         item3.color = '#e26257 !important'
-                    //     }
-                    //     arr.push(item3)
-                    // })
-                })
-            })
-        }else if (item.name == '在线设备') { 
                 item.children.forEach((item: any) => {
-                item.icon = 'el-icon-HomeFilled'
+                    item.icon = 'el-icon-List'
-                item.color = config.getColorVal('elementUiPrimary')
+                    item.color = config.getColorVal('elementUiPrimary')
-                item.children.forEach((item2: any) => {
+                    item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-List'
+                        item2.icon = 'el-icon-Platform'
-                    item2.color = config.getColorVal('elementUiPrimary')
+                        item2.color = config.getColorVal('elementUiPrimary')
-                    item2.children.forEach((item3: any) => {
+                        item2.color =
-                        item3.icon = 'el-icon-Platform'
+                            item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                        item3.color = config.getColorVal('elementUiPrimary')
+                        arr4.push(item2)
-                        if (item3.comFlag === 1) {
-                            item3.color = '#e26257 !important'
-                        }
-                        arr3.push(item3)
                     })
                 })
-            })
+            } else {
-        }
+                if (item.name == '治理设备') {
-    })
+                    item.children.forEach((item: any) => {
-    console.log("🚀 ~ file: deviceTree.vue ~ line 18 ~ getDeviceTree ~ tree:", arr,arr2,arr3)
+                        item.icon = 'el-icon-HomeFilled'
-    tree.value = res.data
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-List'
+                            item2.color = config.getColorVal('elementUiPrimary')
+                            item2.children.forEach((item3: any) => {
+                                item3.pName = '治理设备'
+                                item3.icon = 'el-icon-Platform'
+                                item3.level = 2
+                                item3.color = config.getColorVal('elementUiPrimary')
+                                if (item3.comFlag === 1) {
+                                    item3.color = '#e26257 !important'
+                                }
+                                arr.push(item3)
+                            })
+                        })
+                    })
+                } else if (item.name == '便携式设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-Platform'
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.color = '#e26257 !important'
+                        item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                        // item.disabled =true
+                        item.pName = '便携式设备'
+                        if (item.type == 'device') {
+                            arr2.push(item)
+                        }
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-Platform'
+                            item2.color =
+                                item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                            item2.pName = '便携式设备'
+                            // item2.children.forEach((item3: any) => {
+                            //     item3.icon = 'el-icon-Platform'
+                            //     item3.color = config.getColorVal('elementUiPrimary')
+                            //     if (item3.comFlag === 1) {
+                            //         item3.color = '#e26257 !important'
+                            //     }
+                            //     arr.push(item3)
+                            // })
+                        })
+                    })
+                } else if (item.name == '监测设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-HomeFilled'
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-List'
+                            item2.color = config.getColorVal('elementUiPrimary')
+                            item2.children.forEach((item3: any) => {
+                                item3.pName = '监测设备'
+                                item3.icon = 'el-icon-Platform'
+                                item3.color = config.getColorVal('elementUiPrimary')
+                                if (item3.comFlag === 1) {
+                                    item3.color = '#e26257 !important'
+                                }
+                                arr3.push(item3)
+                            })
+                        })
+                    })
+                }
+            }
+        })
+        tree.value = res.data
 
-    nextTick(() => {
+        nextTick(() => {
-        if (arr.length) {
+            setTimeout(() => {
-            treRef.value.treeRef1.setCurrentKey(arr[0].id)
+                if (type == '2') {
-            // 注册父组件事件
+                    //初始化选中
-            emit('init', {
+
-                level: 2,
+                    treRef.value?.treeRef4.setCurrentKey(arr4[0]?.id)
-                ...arr[0]
+                    // 注册父组件事件
-            })
+                    emit('init', {
-            return
+                        level: 2,
-        }
+                        ...arr4[0]
-        if (arr2.length) {
+                    })
-            treRef.value.treeRef2.setCurrentKey(arr2[0].id)
+                    // changePointType('4', arr4[0])
-            // 注册父组件事件
+                    return
-            emit('init', {
+                }
-                level: 2,
+                if (arr.length > 0) {
-                ...arr2[0]
+                    treRef.value.treeRef1.setCurrentKey(arr[0]?.id)
-            })
+                    // 注册父组件事件
-            return
+                    emit('init', {
-        }
+                        level: 2,
-        console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3.length)
+                        ...arr[0]
-        if (arr3.length) {
+                    })
-            console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3)
+                    return
-            treRef.value.treeRef3.setCurrentKey(arr3[0].id)
+                } else if (arr2.length > 0) {
-            // 注册父组件事件
+                    treRef.value.treeRef2.setCurrentKey(arr2[0]?.id)
-            emit('init', {
+                    // 注册父组件事件
-                level: 2,
+                    emit('init', {
-                ...arr3[0]
+                        level: 2,
-            })
+                        ...arr2[0]
-            return
+                    })
-        }
+                    return
-        else {
+                } else if (arr3.length > 0) {
-            emit('init')
+                    console.log('🚀 ~ arr3:', arr3)
-            return
+
-        }
+                    treRef.value.treeRef3.setCurrentKey(arr3[0].id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 2,
+                        ...arr3[0]
+                    })
+                    return
+                } else {
+                    emit('init')
+                    return
+                }
+            }, 500)
+        })
     })
+}
+
+onMounted(() => {
+    info(props.engineering ? '2' : '1')
 })
+
+throttle(
+    (data: any, checked: any, indeterminate: any) => {
+        emit('checkChange', {
+            data,
+            checked,
+            indeterminate
+        })
+    },
+    300,
+    {
+        leading: true, // 首次触发立即执行（可选，默认 true）
+        trailing: false // 节流结束后是否执行最后一次（可选，默认 true，根据需求调整）
+    }
+)
+
 const handleCheckChange = (data: any, checked: any, indeterminate: any) => {
     emit('checkChange', {
         data,
@@ -148,4 +210,7 @@ const handleCheckChange = (data: any, checked: any, indeterminate: any) => {
         indeterminate
     })
 }
+defineExpose({
+    treRef
+})
 </script>

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()
@@ -19,9 +19,11 @@ getMarketList().then((res: any) => {
                 color: 'royalblue'
             }
         })
+                console.log("🚀 ~ royalblue:")
+        
         emit('selectUser', tree.value[0])
         nextTick(() => {
-            treRef.value.treeRef.setCurrentKey(tree.value[0].id)
+            treRef.value.treeRef.setCurrentKey(tree.value[0]?.id)
         })
     }
 })

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

@@ -1,5 +1,12 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" />
+    <Tree
+        ref="treRef"
+        :width="width"
+        :data="tree"
+        default-expand-all
+        @changePointType="changePointType"
+        @changeTreeType="info"
+    />
 </template>
 
 <script lang="ts" setup>
@@ -7,7 +14,7 @@ import { ref, nextTick, onMounted, defineProps } from 'vue'
 import Tree from '../point.vue'
 import { getLineTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { useDictData } from '@/stores/dictData'
 // const props = defineProps(['template'])
 interface Props {
@@ -27,110 +34,157 @@ const dictData = useDictData()
 const treRef = ref()
 const width = ref('')
 
-const info = () => {
+const info = (type?: string) => {
     tree.value = []
     let arr1: any[] = []
     let arr2: any[] = []
     let arr3: any[] = []
-    getLineTree().then(res => {
+    let arr4: any[] = []
+    getLineTree({ type: type == '2' ? 'engineering' : '' }).then(res => {
         //治理设备
+
         res.data.map((item: any) => {
-            if (item.name == '治理设备') {
+            if (type == '2') {
+                item.icon = 'el-icon-HomeFilled'
+                item.color = config.getColorVal('elementUiPrimary')
                 item.children.forEach((item: any) => {
-                    item.icon = 'el-icon-HomeFilled'
+                    item.icon = 'el-icon-List'
-                    item.level = 1
                     item.color = config.getColorVal('elementUiPrimary')
                     item.children.forEach((item2: any) => {
-                        item2.icon = 'el-icon-List'
+                        // item2.icon = 'el-icon-List'
-                        item2.level = 1
+                        // item2.color = config.getColorVal('elementUiPrimary')
-                        item2.color = config.getColorVal('elementUiPrimary')
-                        item2.children.forEach((item3: any) => {
-                            item3.icon = 'el-icon-Platform'
-                            item3.level = 2
-                            item3.color =
-                                item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                            item3.children.forEach((item4: any) => {
-                                item4.icon = 'el-icon-Platform'
-                                item4.color =
-                                    item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                                // item4.color = '#e26257 !important'
-                                arr1.push(item4)
-                            })
-                        })
-                    })
-                })
-            } else if (item.name == '便携式设备') {
-                item.children.forEach((item: any) => {
-                    item.icon = 'el-icon-Platform'
-                    item.color = config.getColorVal('elementUiPrimary')
-                    item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                    item.children.forEach((item2: any) => {
                         item2.icon = 'el-icon-Platform'
+                        item2.level = 2
                         item2.color =
                             item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                        arr2.push(item2)
-                    })
-                })
-            } else if (item.name == '在线设备') {
-                item.children.forEach((item: any) => {
-                    item.icon = 'el-icon-HomeFilled'
-                    item.level = 1
-                    item.color = config.getColorVal('elementUiPrimary')
-                    item.children.forEach((item2: any) => {
-                        item2.icon = 'el-icon-List'
-                        item2.level = 1
-                        item2.color = config.getColorVal('elementUiPrimary')
                         item2.children.forEach((item3: any) => {
                             item3.icon = 'el-icon-Platform'
-                            item3.level = 1
+
                             item3.color =
                                 item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                            item3.children.forEach((item4: any) => {
+                            arr4.push(item3)
-                                item4.icon = 'el-icon-Platform'
+                            // item3.children.forEach((item4: any) => {
-                                item4.color =
+                            //     item4.icon = 'el-icon-Platform'
-                                    item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                            //     item4.color =
-                                // item4.color = '#e26257 !important'
+                            //         item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                                arr3.push(item4)
+
-                            })
+                            // })
                         })
                     })
                 })
+            } else {
+                if (item.name == '治理设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-HomeFilled'
+                        item.level = 1
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-List'
+                            item2.level = 1
+                            item2.color = config.getColorVal('elementUiPrimary')
+                            item2.children.forEach((item3: any) => {
+                                item3.icon = 'el-icon-Platform'
+                                item3.level = 2
+                                item3.color =
+                                    item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                                item3.children.forEach((item4: any) => {
+                                    item4.icon = 'el-icon-Platform'
+                                    item4.color =
+                                        item4.comFlag === 2
+                                            ? config.getColorVal('elementUiPrimary')
+                                            : '#e26257 !important'
+                                    // item4.color = '#e26257 !important'
+                                    arr1.push(item4)
+                                })
+                            })
+                        })
+                    })
+                } else if (item.name == '便携式设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-Platform'
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-Platform'
+                            item2.color =
+                                item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                            arr2.push(item2)
+                        })
+                    })
+                } else if (item.name == '监测设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-HomeFilled'
+                        item.level = 1
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-List'
+                            item2.level = 1
+                            item2.color = config.getColorVal('elementUiPrimary')
+                            item2.children.forEach((item3: any) => {
+                                item3.icon = 'el-icon-Platform'
+                                item3.level = 1
+                                item3.color =
+                                    item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                                item3.children.forEach((item4: any) => {
+                                    item4.icon = 'el-icon-Platform'
+                                    item4.color =
+                                        item4.comFlag === 2
+                                            ? config.getColorVal('elementUiPrimary')
+                                            : '#e26257 !important'
+                                    // item4.color = '#e26257 !important'
+                                    arr3.push(item4)
+                                })
+                            })
+                        })
+                    })
+                }
             }
         })
         tree.value = res.data
+
         nextTick(() => {
-            if (arr1.length) {
+            setTimeout(() => {
-                //初始化选中
+                if (type == '2') {
-                treRef.value.treeRef1.setCurrentKey(arr1[0].id)
+                    //初始化选中
-                // 注册父组件事件
+
-                emit('init', {
+                    treRef.value?.treeRef4.setCurrentKey(arr4[0].id)
-                    level: 2,
+                    // 注册父组件事件
-                    ...arr1[0]
+                    emit('init', {
-                })
+                        level: 3,
-                return
+                        ...arr4[0]
-            }
+                    })
-            if (arr2.length) {
+                    changePointType('4', arr4[0])
-                //初始化选中
+                    return
-                treRef.value.treeRef2.setCurrentKey(arr2[0].id)
+                } else if (arr1.length > 0) {
-                // 注册父组件事件
+                    //初始化选中
-                emit('init', {
+                    treRef.value?.treeRef1.setCurrentKey(arr1[0].id)
-                    level: 2,
+                    // 注册父组件事件
-                    ...arr2[0]
+                    emit('init', {
-                })
+                        level: 2,
-                return
+                        ...arr1[0]
-            }
+                    })
-            if(arr3.length){
+                    return
-                treRef.value.treeRef3.setCurrentKey(arr3[0].id)
+                } else if (arr2.length > 0) {
-                emit('init', {
+                    //初始化选中
-                    level: 2,
+                    treRef.value?.treeRef2.setCurrentKey(arr2[0].id)
-                    ...arr3[0]
+                    // 注册父组件事件
-                })
+                    emit('init', {
-                return
+                        level: 2,
-            }
+                        ...arr2[0]
-            else {
+                    })
-                emit('init')
+                    return
-                return
+                } else if (arr3.length > 0) {
-            }
+                    treRef.value?.treeRef3?.setCurrentKey(arr3[0].id)
+                    emit('init', {
+                        level: 2,
+                        ...arr3[0]
+                    })
+                    return
+                } else {
+                    emit('init')
+                    return
+                }
+            }, 500)
         })
     })
 }
@@ -138,7 +192,8 @@ const changePointType = (val: any, obj: any) => {
     emit('pointTypeChange', val, obj)
 }
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id })
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/pointTreeWx.vue

@@ -1,26 +1,38 @@
 <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>
+                    <el-input maxlength="32" 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
+                <el-tree
-                    :filter-node-method="filterNode" node-key="id" v-bind="$attrs" default-expand-all :data="tree"
+                    style="flex: 1; overflow: auto"
-                    ref="treRef" @node-click="clickNode" :expand-on-click-node="false">
+                    :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">
+                            <div class="left" style="display: flex; align-items: center">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
+                                <Icon
-                                    v-if="data.icon" />
+                                    :name="data.icon"
-                                <span>{{ node.label }}</span>
+                                    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>
@@ -35,7 +47,7 @@ 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 { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { useDictData } from '@/stores/dictData'
 defineOptions({
     name: 'govern/schemeTree'
@@ -43,12 +55,10 @@ defineOptions({
 
 interface Props {
     template?: boolean
-
 }
 const dictData = useDictData()
 const props = withDefaults(defineProps<Props>(), {
-    template: false,
+    template: false
-
 })
 const filterText = ref('')
 watch(filterText, val => {
@@ -94,7 +104,6 @@ const defaultProps = {
     value: 'id'
 }
 
-
 const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
 const config = useConfig()
 const tree = ref()
@@ -141,18 +150,19 @@ const clickNode = (e: anyObj) => {
     emit('nodeChange', e)
 }
 
-
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
+    // id: dictData.state.area[0]?.id
-        emit('Policy', res.data)
+    querySysExcel({})
-        getTreeList()
+        .then((res: any) => {
-    }).catch(err => {
+            emit('Policy', res.data)
-        getTreeList()
+            getTreeList()
-    })
+        })
+        .catch(err => {
+            getTreeList()
+        })
 } else {
     getTreeList()
 }
-
 </script>
 <style lang="scss" scoped>
 .cn-tree {

src/components/tree/govern/selectTree.vue

@@ -33,7 +33,7 @@ const info = () => {
     getLineTree().then(res => {
         //治理设备
         res.data.map((item: any) => {
-           if (item.name == '在线设备') {
+           if (item.name == '监测设备') {
                 item.children.forEach((item: any) => {
                     item.icon = 'el-icon-HomeFilled'
                     item.level = 1
@@ -59,7 +59,7 @@ const info = () => {
                 })
             }
         })
-        tree.value = res.data.filter(item => item.name == '在线设备')
+        tree.value = res.data.filter(item => item.name == '监测设备')
         nextTick(() => {
             if (arr3.length) {
                 //初始化选中
@@ -87,7 +87,7 @@ const handleCheckedNodesChange = (nodes: any[]) => {
 
 
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id })
+    getTemplateByDept({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/index.vue

@@ -1,41 +1,61 @@
 <template>
-    <div :style="{ width: menuCollapse ? '40px' : props.width }" style='transition: all 0.3s; overflow: hidden;'>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
-        <Icon v-show='menuCollapse' @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+        <Icon
-            :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 mt20 menu-collapse'
+            v-show="menuCollapse"
-            style='cursor: pointer' />
+            @click="onMenuCollapse"
-        <div class='cn-tree' :style='{ opacity: menuCollapse ? 0 : 1 }'>
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            <div style='display: flex; align-items: center' class='mb10'>
+            :class="menuCollapse ? 'unfold' : ''"
-                <el-input maxlength="32" show-word-limit v-model.trim='filterText' placeholder='请输入内容' clearable>
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input maxlength="32" v-model.trim="filterText" placeholder="请输入内容" clearable>
                     <template #prefix>
-                        <Icon name='el-icon-Search' style='font-size: 16px' />
+                        <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>
+                    <template #content>
-                            <span>台账推送</span>
+                        <span>台账推送</span>
-                        </template>
+                    </template>
 
-                       <Icon 
+                    <Icon
                         name="el-icon-Promotion"
                         size="20"
-                        class="fold ml10 menu-collapse" 
+                        class="fold ml10 mr10 menu-collapse"
-                        style="cursor: pointer;" 
+                        style="cursor: pointer"
                         :style="{ color: config.getColorVal('elementUiPrimary') }"
-                        @click="onAdd" />
+                        @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)' }"
+            <el-tree
-            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current 
+                :style="{ height: 'calc(100vh - 190px)' }"
-                @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
+                style="overflow: auto"
-                <template #default='{ node, data }'>
+                ref="treeRef"
-                    <span class='custom-tree-node'>
+                :props="defaultProps"
-                        <Icon :name='data.icon' style='font-size: 16px' :style='{ color: data.color }'
+                highlight-current
-                            v-if='data.icon' />
+                :default-expand-all="false"
-                        <span style='margin-left: 4px'>{{ node.label }}</span>
+                @check-change="checkTreeNodeChange"
+                :filter-node-method="filterNode"
+                node-key="id"
+                v-bind="$attrs"
+            >
+                <template #default="{ node, data }">
+                    <span class="custom-tree-node">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+                        <span style="margin-left: 4px">{{ node.label }}</span>
                     </span>
                 </template>
             </el-tree>
@@ -43,12 +63,10 @@
     </div>
 </template>
 
-<script lang='ts' setup>
+<script lang="ts" setup>
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
-import { emit } from 'process';
 import { ref, watch } from 'vue'
-import { t } from 'vxe-table';
 import { useConfig } from '@/stores/config'
 
 defineOptions({
@@ -58,11 +76,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()
@@ -72,7 +92,7 @@ const defaultProps = {
     label: 'name',
     value: 'id'
 }
-const emit = defineEmits(['checkTreeNodeChange','onAdd'])
+const emit = defineEmits(['checkTreeNodeChange', 'onAdd'])
 watch(filterText, val => {
     treeRef.value!.filter(val)
 })
@@ -81,18 +101,16 @@ const onMenuCollapse = () => {
     proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
 }
 const filterNode = (value: string, data: any, node: any) => {
-    console.log(value, data, node, 'filterNode');
+    console.log(value, data, node, 'filterNode')
     if (!value) return true
     // return data.name.includes(value)
     if (data.name) {
-
         return chooseNode(value, data, node)
     }
 }
 
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
-
     if (data.name.indexOf(value) !== -1) {
         return true
     }
@@ -130,13 +148,13 @@ const treeRef = ref<InstanceType<typeof ElTree>>()
 defineExpose({ treeRef })
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .cn-tree {
     flex-shrink: 0;
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
-    padding: 10px;
+    // padding: 10px;
     height: 100%;
     width: 100%;
 

src/components/tree/point.vue

@@ -1,23 +1,58 @@
 <!-- 设备监控使用折叠面板渲染多个tree -->
 <template>
     <div :style="{ width: menuCollapse ? '40px' : props.width }" style="display: flex; overflow: hidden">
-        <Icon v-show="menuCollapse" @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+        <Icon
-            :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 mt20 menu-collapse" style="cursor: pointer"
+            v-show="menuCollapse"
-            v-if="route.path != '/admin/govern/reportCore/statistics/index'" />
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+            v-if="route.path != '/admin/govern/reportCore/statistics/index'"
+        />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1, display: menuCollapse ? 'none' : '' }">
             <div style="display: flex; align-items: center" class="mb10">
-                <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
+                <!-- <el-input maxlength="32"  v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input> -->
+                <el-input maxlength="32"  v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prepend>
+                        <el-select v-model="treeType" @change="changeTreeType" style="min-width: 75px">
+                            <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </template>
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
-                <Icon @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                <!--  -->
-                    :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 menu-collapse"
+                <Icon
+                    @click="onMenuCollapse"
+                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    :class="menuCollapse ? 'unfold' : ''"
+                    size="18"
+                    class="fold ml10 menu-collapse"
                     style="cursor: pointer"
-                    v-if="props.canExpand && route.path != '/admin/govern/reportCore/statistics/index'" />
+                    v-if="props.canExpand && route.path != '/admin/govern/reportCore/statistics/index'"
+                />
             </div>
-            <el-collapse :accordion="true" v-model.trim="activeName" style="flex: 1; height: 100%"
+
-                @change="changeDevice">
+            <el-collapse
+                :accordion="true"
+                v-model.trim="activeName"
+                style="flex: 1; height: 100%"
+                @change="changeDevice"
+                v-if="treeType == '1'"
+                v-loading="loading"
+            >
                 <el-collapse-item title="治理设备" name="0" v-if="zlDeviceData.length != 0">
                     <el-select v-model.trim="process" clearable placeholder="请选择状态" class="mb10">
                         <el-option label="功能调试" value="2"></el-option>
@@ -26,14 +61,25 @@
                     </el-select>
 
                     <el-tree
-                        :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 278px)' }"
+                        :style="{ height: treeType.length != 0 ? 'calc(100vh - 380px)' : 'calc(100vh - 278px)' }"
-                        ref="treeRef1" :props="defaultProps" highlight-current :filter-node-method="filterNode"
+                        ref="treeRef1"
-                        node-key="id"  v-bind="$attrs" :data="zlDevList" style="overflow: auto"
+                        :props="defaultProps"
-                        :default-expand-all="false">
+                        highlight-current
+                        :filter-node-method="filterNode"
+                        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 }"
+                                <Icon
-                                    v-if="data.icon" />
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -41,35 +87,84 @@
                 </el-collapse-item>
                 <el-collapse-item title="便携式设备" name="1" v-if="bxsDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 330px)' : 'calc(100vh - 238px)' }"
+                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef2" :props="defaultProps" highlight-current :default-expand-all="false"
+                        ref="treeRef2"
-                        :filter-node-method="filterNode" node-key="id" :data="bxsDeviceData" v-bind="$attrs"
+                        :props="defaultProps"
-                        style="overflow: auto" >
+                        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 }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
+                                <Icon
-                                    v-if="data.icon" />
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
                     </el-tree>
                 </el-collapse-item>
-                <el-collapse-item title="在线设备" name="2" v-if="yqfDeviceData.length != 0">
+                <el-collapse-item title="监测设备" name="2" v-if="yqfDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 330px)' : 'calc(100vh - 238px)' }"
+                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef3" :props="defaultProps" highlight-current :default-expand-all="false"
+                        ref="treeRef3"
-                        :filter-node-method="filterNode" node-key="id" :data="yqfDeviceData" v-bind="$attrs"
+                        :props="defaultProps"
-                        style="overflow: auto">
+                        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 }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
+                                <Icon
-                                    v-if="data.icon" />
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
                     </el-tree>
                 </el-collapse-item>
             </el-collapse>
+            <div v-if="treeType == '2'" v-loading="loading">
+                <el-tree
+                    :style="{ height: 'calc(100vh - 188px)' }"
+                    class="pt10"
+                    ref="treeRef4"
+                    :props="defaultProps"
+                    highlight-current
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    v-bind="$attrs"
+                    :data="data"
+                    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 }"
+                                v-if="data.icon"
+                            />
+                            <span style="margin-left: 4px">{{ node.label }}</span>
+                        </span>
+                    </template>
+                </el-tree>
+            </div>
         </div>
     </div>
 </template>
@@ -83,7 +178,7 @@ import { useRoute } from 'vue-router'
 defineOptions({
     name: 'govern/tree'
 })
-const emit = defineEmits(['changePointType'])
+const emit = defineEmits(['changePointType', 'changeTreeType'])
 interface Props {
     width?: string
     canExpand?: boolean
@@ -107,38 +202,47 @@ const defaultProps = {
     label: 'name',
     value: 'id'
 }
+const treeType = ref('1')
+const options = [
+    {
+        label: '设备',
+        value: '1'
+    },
+    {
+        label: '工程',
+        value: '2'
+    }
+]
 //治理设备数据
 const zlDeviceData = ref<any>([])
 const zlDevList = ref<any>([])
 //便携式设备数据
 const bxsDeviceData = ref<any>([])
-//在线设备数据
+//监测设备数据
 const yqfDeviceData = ref<any>([])
 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)
                     })
-                zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))    
+                    zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
                 } else if (item.name == '便携式设备') {
                     bxsDeviceData.value = []
                     item.children.map((vv: any) => {
                         bxsDeviceData.value.push(vv)
                     })
-                }else if (item.name == '在线设备') {
+                } else if (item.name == '监测设备') {
                     yqfDeviceData.value = []
                     item.children.map((vv: any) => {
                         yqfDeviceData.value.push(vv)
                     })
                 }
             })
-
         }
     },
     {
@@ -148,7 +252,9 @@ watch(
 )
 
 watch(filterText, val => {
-    if (activeName.value == '0') {
+    if (treeType.value == '2') {
+        treeRef4.value!.filter(val)
+    } else if (activeName.value == '0') {
         treeRef1.value!.filter(val)
     } else if (activeName.value == '1') {
         treeRef2.value!.filter(val)
@@ -157,12 +263,10 @@ watch(filterText, val => {
     }
 })
 watch(process, val => {
-    
+    if (val == '' || val == undefined) {
-    if (val == '') {
         zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
     } else {
         zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
-      
     }
 
     setTimeout(() => {
@@ -170,10 +274,7 @@ watch(process, val => {
     }, 0)
 })
 
-
-
 const changeDevice = (val: any) => {
-
     let arr1: any = []
     //zlDeviceData
     zlDevList.value.forEach((item: any) => {
@@ -206,22 +307,28 @@ const changeDevice = (val: any) => {
         arr2.map((item: any) => {
             item.checked = false
         })
-        treeRef1?.value && treeRef1.value.setCurrentKey(arr1[0]?.id)
         emit('changePointType', activeName.value, arr1[0])
+        setTimeout(() => {
+            treeRef1.value?.setCurrentKey(arr1[0]?.id)
+        }, 100)
     }
     if (val == '1') {
         arr1.map((item: any) => {
             item.checked = false
         })
-        treeRef2?.value && treeRef2.value.setCurrentKey(arr2[0]?.id)
         emit('changePointType', activeName.value, arr2[0])
+        setTimeout(() => {
+            treeRef2.value?.setCurrentKey(arr2[0]?.id)
+        }, 100)
     }
     if (val == '2') {
         arr3.map((item: any) => {
             item.checked = false
         })
-        treeRef3?.value && treeRef3.value.setCurrentKey(arr3[0]?.id)
         emit('changePointType', activeName.value, arr3[0])
+        setTimeout(() => {
+            treeRef3.value?.setCurrentKey(arr3[0]?.id)
+        }, 100)
     }
     // if(activeName.value){
     //    emit('changePointType', activeName.value)
@@ -248,7 +355,7 @@ function filterProcess(nodes: any) {
             // 递归处理子节点
             const children = node.children ? filterProcess(node.children) : []
 
-            // 对于装置层级（level=2），只保留 process 值匹配的节点
+            // 对于设备层级（level=2），只保留 process 值匹配的节点
             if (node.level === 2) {
                 if (node.process == process.value) {
                     return {
@@ -263,8 +370,7 @@ function filterProcess(nodes: any) {
             // 1. 如果有满足条件的子节点则保留
             // 2. 如果本身 process 值匹配则保留
             // 3. 如果是叶子节点也保留（监测点通常没有子节点）
-            if (children.length > 0 || node.process == process.value || 
+            if (children.length > 0 || node.process == process.value || !node.children || node.children.length === 0) {
-                (!node.children || node.children.length === 0)) {
                 return {
                     ...node,
                     children: children
@@ -276,7 +382,6 @@ function filterProcess(nodes: any) {
         .filter(Boolean) // 移除null节点
 }
 
-
 // function filterProcess(nodes: any) {
 //     if (process.value == '') {
 //         return nodes
@@ -332,26 +437,43 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 //在线
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
-defineExpose({ treeRef1, treeRef2 })
+// 工程
+const treeRef4 = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef1, treeRef2, treeRef3, treeRef4 })
 onMounted(() => {
-     
     setTimeout(() => {
-       
+        setActiveName()
-        if (zlDeviceData.value.length != 0) {
-            zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
-            activeName.value = '0'
-        }
-        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
-            activeName.value = '1'
-        }
-        if (!zlDeviceData.value && !bxsDeviceData.value) {
-            activeName.value = ''
-        }
-        nextTick(() => {
-            changeDevice(activeName.value)
-        })
     }, 500)
 })
+const setActiveName = () => {
+    if (zlDeviceData.value.length != 0) {
+        zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
+        activeName.value = '0'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
+        activeName.value = '1'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
+        activeName.value = '2'
+    }
+    if (!zlDeviceData.value && !bxsDeviceData.value) {
+        activeName.value = '2'
+    }
+    nextTick(() => {
+        changeDevice(activeName.value)
+    })
+}
+const loading = ref(false)
+const changeTreeType = (val: string) => {
+    loading.value = true
+    emit('changeTreeType', val)
+    if (val == '1') {
+        setActiveName()
+    }
+    setTimeout(() => {
+        loading.value = false
+    }, 1000)
+}
 </script>
 
 <style lang="scss" scoped>
@@ -382,4 +504,7 @@ onMounted(() => {
     display: flex;
     align-items: center;
 }
+:deep(.el-input-group__prepend) {
+    background-color: var(--el-fill-color-blank);
+}
 </style>

src/components/tree/select.vue

@@ -5,7 +5,7 @@
             style='cursor: pointer' />
         <div class='cn-tree' :style='{ opacity: menuCollapse ? 0 : 1 }'>
             <div style='display: flex; align-items: center' class='mb10'>
-                <el-input maxlength="32" show-word-limit v-model.trim='filterText' placeholder='请输入内容' clearable>
+                <el-input maxlength="32"  v-model.trim='filterText' placeholder='请输入内容' clearable>
                     <template #prefix>
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>
@@ -24,6 +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'>
@@ -119,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) => {
@@ -156,11 +218,12 @@ const updateNodeCheckStatus = (currentCount: number) => {
     const allNodes = treeRef.value.store._getAllNodes()
     allNodes.forEach((node: any) => {
         if (node.level === 3) { // 监测点层级
+            
             // 如果已达到最大数量且该节点未被选中，则禁用勾选
-            if (isMaxSelected && !node.checked) {
+            if (isMaxSelected && !node.data.checked) {
-                node.disabled = true
+                node.data.disabled = true
             } else {
-                node.disabled = false
+                node.data.disabled = false
             }
         }
     })

src/layouts/admin/components/navBar/tabs.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="nav-tabs" ref="tabScrollbarRef">
+        
         <div
             v-for="(item, idx) in navTabs.state.tabsView"
             @click="onTab(item)"
@@ -71,8 +72,11 @@ const onTab = (menu: RouteLocationNormalized) => {
 }
 
 const onContextmenu = (menu: RouteLocationNormalized, el: MouseEvent) => {
+    
     // 禁用刷新
     state.contextmenuItems[0].disabled = route.path !== menu.path
+  
+    
     // 禁用关闭其他和关闭全部
     state.contextmenuItems[4].disabled = state.contextmenuItems[3].disabled =
         navTabs.state.tabsView.length == 1 ? true : false
@@ -210,8 +214,8 @@ onMounted(() => {
     overflow-x: auto;
     overflow-y: hidden;
     margin-right: var(--ba-main-space);
-    scrollbar-width: none;
+    // scrollbar-width: none;
-
+// overflow-x: auto;
     &::-webkit-scrollbar {
         height: 5px;
     }

src/layouts/admin/components/navMenus.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="nav-menus" :class="configStore.layout.layoutMode">
-        <div @click="savePng" class="nav-menu-item">
+        <!-- <div @click="savePng" class="nav-menu-item">
             <Icon
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
@@ -23,7 +23,7 @@
                 name="fa-solid fa-expand"
                 size="18"
             />
-        </div>
+        </div> -->
 
         <el-dropdown style="height: 100%" @command="handleCommand">
             <div class="admin-info" :class="state.currentNavMenu == 'adminInfo' ? 'hover' : ''">
@@ -47,7 +47,8 @@
                 name="fa fa-cogs"
                 size="18"
             />
-        </div> -->"
+        </div> -->
+        "
 
         <Config />
         <PopupPwd ref="popupPwd" />
@@ -71,7 +72,6 @@ import PopupPwd from './popup/password.vue'
 import AdminInfo from './popup/adminInfo.vue'
 import { useNavTabs } from '@/stores/navTabs'
 
-
 const adminInfo = useAdminInfo()
 const navTabs = useNavTabs()
 const configStore = useConfig()
@@ -106,7 +106,7 @@ const onFullScreen = () => {
     })
 }
 
-const handleCommand = (key: string) => {
+const handleCommand = async (key: string) => {
     // console.log(key)
     switch (key) {
         case 'adminInfo':
@@ -116,10 +116,13 @@ const handleCommand = (key: string) => {
             popupPwd.value.open()
             break
         case 'layout':
-            navTabs.closeTabs()
+            await window.location.reload()
-            window.localStorage.clear()
+            setTimeout(() => {
-            adminInfo.reset()
+                navTabs.closeTabs()
-            router.push({ name: 'login' })
+                window.localStorage.clear()
+                adminInfo.reset()
+                router.push({ name: 'login' })
+            }, 0)
             break
         default:
             break

src/layouts/admin/components/popup/adminInfo.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable width="600px" v-model.trim="dialogVisible" :title="title">
+    <el-dialog draggable width="500px" v-model.trim="dialogVisible" :title="title">
   
             <el-form :inline="false" :model="form" label-width="auto" class="form-one">
                 <el-form-item label="用户名称:">

src/layouts/admin/components/popup/password.vue

@@ -9,7 +9,12 @@
                     <el-input v-model.trim="form.newPwd" type="password" placeholder="请输入新密码" show-password />
                 </el-form-item>
                 <el-form-item label="确认密码:" prop="confirmPwd">
-                    <el-input v-model.trim="form.confirmPwd" type="password" placeholder="请输入确认密码" show-password />
+                    <el-input
+                        v-model.trim="form.confirmPwd"
+                        type="password"
+                        placeholder="请输入确认密码"
+                        show-password
+                    />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
@@ -28,8 +33,10 @@ import { ElMessage } from 'element-plus'
 import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
 import { validatePwd } from '@/utils/common'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import router from '@/router'
+import { useNavTabs } from '@/stores/navTabs'
 const adminInfo = useAdminInfo()
+const navTabs = useNavTabs()
 const dialogVisible = ref(false)
 const title = ref('修改密码')
 const formRef = ref()
@@ -96,9 +103,16 @@ const submit = () => {
                 updatePassword({
                     id: adminInfo.$state.userIndex,
                     newPassword: form.newPwd
-                }).then((res: any) => {
+                }).then(async (res: any) => {
                     ElMessage.success('密码修改成功')
                     dialogVisible.value = false
+                    
+                    setTimeout(() => {
+                         navTabs.closeTabs()
+                        window.localStorage.clear()
+                        adminInfo.reset()
+                        router.push({ name: 'login' })
+                    }, 0)
                 })
             })
         }

src/layouts/admin/index.vue

@@ -51,11 +51,11 @@ onBeforeMount(() => {
 })
 
 const init = async () => {
-    await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
+    await Promise.all([ dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
-        dictData.state.area = res[0].data
+        // dictData.state.area = res[0].data
-        dictData.state.basic = res[1].data
+        dictData.state.basic = res[0].data
         // dictData.state.userList=res[4].data
-        adminInfo.dataFill(res[2].data)
+        adminInfo.dataFill(res[1].data)
         // dictData.state.areaTree = res[3].data
     })
     /**
@@ -85,6 +85,7 @@ const init = async () => {
         handleAdminRoute(res.data)
         if (route.params.to) {
             const lastRoute = JSON.parse(route.params.to as string)
+
             if (lastRoute.path != adminBaseRoutePath) {
                 let query = !isEmpty(lastRoute.query) ? lastRoute.query : {}
                 routePush({ path: lastRoute.path, query: query })

src/router/index.ts

@@ -26,7 +26,7 @@ router.beforeEach((to, from, next) => {
         const token = adminInfo.getToken()
         // token 不存在
         if (token === null || token === '') {
-            ElMessage.error('您还没有登录，请先登录')
+            // ElMessage.error('您还没有登录，请先登录')
             next('/login')
         } else {
             next()

src/router/static.ts

@@ -35,6 +35,16 @@ export const adminBaseRoute = {
                 title: pageTitle('router.supplementaryRecruitment')
             }
         },
+        {
+            // 版本维护
+            path: '/version',
+            name: 'version',
+            component: () => import('@/views/govern/manage/basic/version.vue'),
+            meta: {
+                title: pageTitle('router.version')
+            }
+        },
+        
         {
             path: 'cockpit',
             name: '项目管理',

src/stores/navTabs.ts

@@ -4,6 +4,7 @@ import { STORE_TAB_VIEW_CONFIG } from '@/stores/constant/cacheKey'
 import type { NavTabs } from '@/stores/interface/index'
 import type { RouteLocationNormalized, RouteRecordRaw } from 'vue-router'
 import { adminBaseRoutePath } from '@/router/static'
+import { set } from 'lodash'
 
 export const useNavTabs = defineStore(
     'navTabs',
@@ -20,7 +21,7 @@ export const useNavTabs = defineStore(
             // 从后台加载到的菜单路由列表
             tabsViewRoutes: [],
             // 按钮权限节点
-            authNode: new Map(),
+            authNode: new Map()
         })
 
         function addTab(route: RouteLocationNormalized) {
@@ -29,6 +30,7 @@ export const useNavTabs = defineStore(
                 if (state.tabsView[key].path === route.path) {
                     state.tabsView[key].params = route.params ? route.params : state.tabsView[key].params
                     state.tabsView[key].query = route.query ? route.query : state.tabsView[key].query
+                    state.tabsView[key].meta = route.query ? route.meta : state.tabsView[key].meta
                     return
                 }
             }
@@ -66,7 +68,7 @@ export const useNavTabs = defineStore(
         }
 
         const setTabsViewRoutes = (data: RouteRecordRaw[]): void => {
-            state.tabsViewRoutes = encodeRoutesURI(data)
+            state.tabsViewRoutes = encodeRoutesURI(JSON.parse(JSON.stringify(data)))
         }
 
         const setAuthNode = (key: string, data: string[]) => {
@@ -81,21 +83,79 @@ export const useNavTabs = defineStore(
             state.tabFullScreen = fullScreen
         }
 
-        return { state, addTab, closeTab, closeTabs, setActiveRoute, setTabsViewRoutes, setAuthNode, fillAuthNode, setFullScreen }
+        const refresh = () => {
+            // setTimeout(() => {
+            // console.log(123, state.tabsViewRoutes)
+
+            let list = matchAndReturnRouteData(state.tabsViewRoutes, state.tabsView)
+            state.tabsView = []
+            list.forEach(item => {
+                addTab(item)
+            })
+            // }, 1000)
+        }
+        return {
+            state,
+            addTab,
+            closeTab,
+            closeTabs,
+            setActiveRoute,
+            setTabsViewRoutes,
+            setAuthNode,
+            fillAuthNode,
+            setFullScreen,
+            refresh
+        }
     },
     {
         persist: {
             key: STORE_TAB_VIEW_CONFIG,
-            paths: ['state.tabFullScreen'],
+            paths: ['state.tabFullScreen']
-        },
+        }
     }
 )
 
+/**
+ * 核心逻辑：
+ * 1. 递归遍历树形菜单，筛选出与routeList中name匹配的节点
+ * 2. 将匹配到的节点格式转换为routeList的结构并返回
+ */
+function matchAndReturnRouteData(tree, routeList) {
+    // 1. 构建路由name映射（name -> 完整路由对象）
+    const routeMap = new Map()
+    routeList.forEach(route => {
+        if (route.name) {
+            routeMap.set(route.name, route)
+        }
+    })
+
+    // 2. 递归遍历树形菜单，收集匹配的节点
+    const matchedNodes = []
+    function recursion(node) {
+        // 匹配当前节点
+        if (routeMap.has(node.name)) {
+            // 深度克隆路由对象，避免修改原数据
+            const matchedRoute = JSON.parse(JSON.stringify(routeMap.get(node.name)))
+            matchedNodes.push(matchedRoute)
+        }
+        // 递归处理子节点
+        if (node.children && node.children.length) {
+            node.children.forEach(child => recursion(child))
+        }
+    }
+
+    // 遍历所有顶级节点
+    tree.forEach(node => recursion(node))
+
+    // 3. 返回匹配后的第二个数据格式（和routeList结构一致）
+    return matchedNodes
+}
+
 /**
  * 对iframe的url进行编码
  */
 function encodeRoutesURI(data: RouteRecordRaw[]) {
-    data.forEach((item) => {
+    data.forEach(item => {
         if (item.meta?.menu_type == 'iframe') {
             item.path = adminBaseRoutePath + '/iframe/' + encodeURIComponent(item.path)
         }

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/styles/vxeTable.css

@@ -0,0 +1,58 @@
+.vxe-header--row {
+  background: var(--vxe-table-header-background-color);
+  color: var(--vxe-table-header-font-color);
+}
+
+.is--checked.vxe-checkbox,
+.is--checked.vxe-checkbox .vxe-checkbox--icon,
+.is--checked.vxe-custom--checkbox-option,
+.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,
+.is--checked.vxe-export--panel-column-option,
+.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,
+.is--checked.vxe-table--filter-option,
+.is--checked.vxe-table--filter-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-checkbox,
+.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,
+.is--indeterminate.vxe-custom--checkbox-option,
+.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-export--panel-column-option,
+.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-table--filter-option,
+.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,
+.vxe-table--render-default .is--checked.vxe-cell--checkbox,
+.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,
+.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,
+.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,
+.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon {
+  color: var(--el-color-primary-light-3);
+}
+
+.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
+  color: var(--el-color-primary-light-5);
+}
+
+.vxe-table--render-default .vxe-body--row.row--current,
+.vxe-table--render-default .vxe-body--row.row--current:hover {
+  background-color: var(--el-color-primary-light-8);
+}
+
+.vxe-table--tooltip-wrapper {
+  z-index: 10000 !important;
+}
+
+.is--disabled {
+  background-color: var(--vxe-input-disabled-color);
+}
+
+.vxe-modal--wrapper {
+  z-index: 5000 !important;
+}

src/styles/vxeTable.min.css

@@ -0,0 +1 @@
+.vxe-header--row{background:var(--vxe-table-header-background-color);color:var(--vxe-table-header-font-color)}.is--checked.vxe-checkbox,.is--checked.vxe-checkbox .vxe-checkbox--icon,.is--checked.vxe-custom--checkbox-option,.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--checked.vxe-export--panel-column-option,.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,.is--checked.vxe-table--filter-option,.is--checked.vxe-table--filter-option .vxe-checkbox--icon,.is--indeterminate.vxe-checkbox,.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,.is--indeterminate.vxe-custom--checkbox-option,.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--indeterminate.vxe-export--panel-column-option,.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,.is--indeterminate.vxe-table--filter-option,.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--checkbox,.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon{color:var(--el-color-primary-light-3)}.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon{color:var(--el-color-primary-light-5)}.vxe-table--render-default .vxe-body--row.row--current,.vxe-table--render-default .vxe-body--row.row--current:hover{background-color:var(--el-color-primary-light-8)}.vxe-table--tooltip-wrapper{z-index:10000 !important}.is--disabled{background-color:var(--vxe-input-disabled-color)}.vxe-modal--wrapper{z-index:5000 !important}

src/styles/vxeTable.scss

@@ -60,7 +60,10 @@
 .vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
     color: var(--el-color-primary-light-5);
 }
-
+.vxe-table--render-default .vxe-body--row.row--current,
+.vxe-table--render-default .vxe-body--row.row--current:hover {
+    background-color: var(--el-color-primary-light-8);
+}
 // .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
 //     color: #fff0;
 // }
@@ -74,11 +77,11 @@
 .vxe-modal--wrapper {
     z-index: 5000 !important;
 }
-.vxe-table--body .vxe-body--row:nth-child(even) {
+// .vxe-table--body .vxe-body--row:nth-child(even) {
-    background-color: #f9f9f9;
+//     background-color: #f9f9f9;
-    // background-color: var(--el-color-primary-light-9);
+//     // background-color: var(--el-color-primary-light-9);
-}
+// }
 
-.vxe-table--body .vxe-body--row:nth-child(odd) {
+// .vxe-table--body .vxe-body--row:nth-child(odd) {
-    background-color: #ffffff;
+//     background-color: #ffffff;
-}
+// }

src/template/dialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog width="600px" v-model.trim='dialogVisible' :title='title'>
+    <el-dialog width="500px" v-model.trim='dialogVisible' :title='title'>
         <el-scrollbar>
             <el-form :inline='false' :model='form' label-width='auto' class="form-one" :rules='rules' ref='formRef'>
                 <el-form-item label='角色名称'>
@@ -41,8 +41,8 @@ const form = reactive({
     id: ''
 })
 const rules = {
-    name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
+    name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
-    code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }]
+    code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }]
 }
 
 const open = (text: string, data?: anyObj) => {