修改补召

# Conflicts:
#	src/views/pqs/voltageSags/Region/components/echart.vue

.env.LNqr

@@ -0,0 +1,6 @@
+# 辽宁嵌入
+NODE_ENV = LNqr
+VITE_NAME="LNqr"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

.env.hainan

@@ -0,0 +1,5 @@
+NODE_ENV = hainan
+VITE_NAME="hainan"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

.env.qujing

@@ -0,0 +1,6 @@
+# 云南曲靖
+NODE_ENV = qujing
+VITE_NAME="qujing"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

README.md

@@ -18,7 +18,7 @@ pnpm i
 #运行项目
 npm run dev
 
-#冀北现场启动命令 区分是否加载现场电网一张图内网api
+#jb现场启动命令 区分是否加载现场电网一张图内网api
 npm run dev:jibei
 
 #去除后台所有模块名 如除/xxxx-boot
@@ -26,9 +26,9 @@ npm run dev:removeMode
 
 
 
-#因海南和冀北技术监督不同 通过修改文件的方式来区分
+#因海南和jb技术监督不同 通过修改文件的方式来区分
 #海南打包   需要吧pqs目录下supervise_hn 文件夹改成supervise 原文件改成supervise_jb
-#冀北打包   需要吧pqs目录下supervise_jb 文件夹改成supervise  原文件改成supervise_hn
+#jb打包   需要吧pqs目录下supervise_jb 文件夹改成supervise  原文件改成supervise_hn
 ```
 
 #### 页面编写-示例

index.html

@@ -15,7 +15,7 @@
     <script src="/static/luckysheet/plugin.js"></script>
     <script src="/static/luckysheet/luckysheet.umd.js"></script>
 
-    <!-- 冀北地图 -->
+    <!-- jb地图 -->
     <!--引入样式文件-->
     <script src="%VITE_NARIMAP%"></script>
     <!-- <script src="%VITE_NRGISCOMMON%"></script> -->

package.json

@@ -6,9 +6,15 @@
   "scripts": {
     "dev": "vite --mode dev",
     "dev:jibei": "vite --mode jibei",
+    "dev:hainan": "vite --mode hainan",
+    "dev:qujing": "vite --mode qujing",
+    "dev:LNqr": "vite --mode LNqr",
     "dev:removeMode": "vite --mode removeMode",
     "build": "vite build --mode dev",
     "build:jibei": "vite build --mode jibei",
+    "build:hainan": "vite build --mode hainan",
+    "build:qujing": "vite build --mode qujing",
+    "build:LNqr": "vite build --mode LNqr",
     "build:removeMode": "vite build --mode removeMode",
     "preview": "vite preview"
   },
@@ -19,7 +25,7 @@
     "@form-create/element-ui": "^3.1.24",
     "@fortawesome/fontawesome-free": "^6.5.1",
     "@kjgl77/datav-vue3": "^1.7.4",
-    "@vue-office/docx": "^1.6.2",
+    "@vue-office/docx": "^1.6.3",
     "@vue-office/excel": "^1.7.8",
     "@vue-office/pdf": "^2.0.2",
     "@vueuse/core": "^10.7.0",

public/plugin/offline/api2.0.js

@@ -1504,7 +1504,7 @@ window.BMAP_AUTHENTIC_KEY = "Yp57V71dkOPiXjiN8VdcFRsVELzlVNKK";
             for (d in b) c = c + "&" + d + "=" + encodeURIComponent(b[d]);
             var e = function (a) {
                 a && (rb = o, setTimeout(function () {
-                    sb.src = B.oc + "images/blank.gif?" + a.src
+                    // sb.src = B.oc + "images/blank.gif?" + a.src
                 }, 50))
             },
                 f = function () {

public/plugin/offline/api3.0.js

@@ -1536,7 +1536,7 @@ window.BMAP_AUTHENTIC_KEY = ''
                     a &&
                         ((ob = q),
                         setTimeout(function () {
-                            pb.src = B.Wc + 'images/blank.gif?' + a.src
+                            // pb.src = B.Wc + 'images/blank.gif?' + a.src
                         }, 50))
                 },
                 g = function () {

src/App.vue

@@ -13,9 +13,11 @@ onMounted(async () => {
     const response = await fetch('/')
     const WebSocketUrl:any = response.headers.get('X-WebSocket-Url')
     const WebSocketUrl2:any = response.headers.get('X-WebSocket-Url2')
+    const WebSocketUrl3:any = response.headers.get('X-WebSocket-Url3')
     const MqttUrl:any = response.headers.get('X-MqttUrl-Url')
-    localStorage.setItem('WebSocketUrl2', WebSocketUrl2)
     localStorage.setItem('WebSocketUrl', WebSocketUrl)
+    localStorage.setItem('WebSocketUrl2', WebSocketUrl2)
+    localStorage.setItem('WebSocketUrl3', WebSocketUrl3)
     localStorage.setItem('MqttUrl', MqttUrl)
 })
 </script>

src/api/admin/user.js

@@ -1,5 +1,6 @@
 import createAxios from '@/utils/request' 
 
+
 // 密码规则修改
 export function ruleUpdate(data) {
     return createAxios({
@@ -24,3 +25,77 @@ export function unlockRoot(data) {
         data
     })
 }
+
+//根据客户端名查询信息
+export function getClientInfoByPath() {
+   
+    return createAxios({
+        url: '/user-boot/authClient/getAuthClientByName/njcn',
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        }
+      
+    })
+}
+
+//客户端会话配置更新
+export function updateClientSessionConfig(data) {
+    return createAxios({
+        url: '/user-boot/authClient/sessionConfigUpdate',
+        method: 'post',
+        data
+    })
+}
+
+//获取用户配置
+export function getUserConfig() {
+    return createAxios({
+        url: '/user-boot/password/getUserStrategyList',
+        method: 'post'
+    })
+}
+
+//查询系统列表
+export function getSystemList() {
+    return createAxios({
+      url: '/system-boot/config/getSysConfigData',
+      method: 'get'
+    })
+}
+
+//激活系统配置
+export function activeSystemConfig(data) {
+    return createAxios({
+        url: '/system-boot/config/updateSysConfig',
+        method: 'post',
+        data
+    })
+}
+
+//删除系统配置
+export function deleteSystemConfig( data) {
+    return createAxios({
+            url: '/system-boot/config/removeSysConfigById',
+            method: 'get',
+            params: data
+    })
+}
+
+//新增系统配置
+export function addSystemConfig(data) {
+    return createAxios({
+        url: '/system-boot/config/addSysConfig',
+        method: 'post',
+        data
+    })
+}
+
+//修改系统配置
+export function updateSystemConfig(data) {
+    return createAxios({
+        url: '/system-boot/config/updateSysConfig',
+        method: 'post',
+        data
+    })
+}

src/api/device-boot/Business.ts

@@ -129,11 +129,27 @@ export function queryAllByType(params: any) {
 //获取用户
 export function selectUserList(data: any) {
     return createAxios({
-        url: '/supervision-boot/userReport/selectUserList',
+        url: '/device-boot/userReport/selectUserList',
         method: 'post',
         data
     })
 }
+//获取用户
+export function selectUserAssessMentList(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/selectUserAssessMentList',
+        method: 'post',
+        data
+    })
+}
+//绑定用户
+export function bindAssessmentId(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/bindAssessmentId',
+        method: 'get',
+        params: data
+    })
+}
 //查询列表
 export function getStatusManageList(data: any) {
     return createAxios({
@@ -190,3 +206,11 @@ export function exportTerminalBase() {
         responseType: 'blob'
     })
 }
+//一键分配终端
+export function allotTerminal(data: any) {
+    return createAxios({
+        url: '/device-boot/nodeDevice/oneKeyDistribution',
+        method: 'post',
+        params: data
+    })
+}

src/api/device-boot/line.ts

@@ -45,3 +45,13 @@ export const getLineOverLimitData = (id: string) => {
         method: 'post'
     })
 }
+
+//导出数据总览
+export function dataVerifyExcel(params: any) {
+    return request({
+        url: '/device-boot/dataVerify/dataVerifyExcel',
+        method: 'get',
+        params,
+        responseType: 'blob'
+    })
+}

src/api/device-boot/modelManage.ts

@@ -32,3 +32,12 @@ export function getDevTypeList() {
         
     })
 }
+
+
+export const getDeviceTypeList = (params: any) => {
+  return createAxios({
+    url: '/device-boot/devType/pageDevTypeList',
+    method: 'POST',
+    data: params
+  })
+}

src/api/device-boot/sensitiveLoadMange.ts

@@ -0,0 +1,103 @@
+import request from '@/utils/request'
+
+// 新增敏感用户
+export function saveUser(data: any) {
+    return request({
+        url: '/device-boot/pqSensitiveUser/save',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改敏感用户
+export function updateUser(data: any) {
+    return request({
+        url: '/device-boot/pqSensitiveUser/update',
+        method: 'post',
+        data: data
+    })
+}
+
+// 删除敏感用户
+export function deleteUser(data: any) {
+    return request({
+        url: '/device-boot/pqSensitiveUser/delete',
+        method: 'post',
+        data: data
+    })
+}
+
+/**
+ * 干扰源接入功能删除流程
+ */
+export const deleteUserReport = (data: any) => {
+    return request({
+        url: '/device-boot/userReport/deleteUserReport',
+        method: 'POST',
+        data
+    })
+}
+/**
+ * 提交表单数据
+ */
+export const submitFormData = (data: any) => {
+    return request({
+        url: '/device-boot/userReport/add',
+        method: 'POST',
+        data: data
+    })
+}
+// 根据id获取用户档案录入的详细数据
+export const getById = (data: any) => {
+    return request({
+        url: '/device-boot/userReport/getById',
+        method: 'get',
+        params: data
+    })
+}
+
+/**
+ * 提交表单数据
+ */
+export const addEditor = (data: any) => {
+    return request({
+        url: '/device-boot/userReportRenewal/addEditor',
+        method: 'POST',
+        data: data
+    })
+}
+
+// 根据id获取用户档案录入的详细数据
+export const getByDeptDevLine = (params: any) => {
+    return request({
+        url: '/device-boot/line/getByDeptDevLine',
+        method: 'get',
+        params
+    })
+}
+/**
+ * 根据id获取用户档案录入的详细数据
+ */
+export const getUserReportUpdateById = (id: any) => {
+    return request({
+        url: '/device-boot/userReportRenewal/getUserReportUpdateById?businessId='+id,
+        method: 'POST',
+
+    })
+}
+
+// 根据id获取用户档案录入的详细数据
+export const getUserReportById = (id: any) => {
+    return request({
+        url: '/device-boot/userReport/getUserReportById?id='+id,
+        method: 'get'
+    })
+}
+// 根据id查询文件信息集合
+export const getFileById = (params: any) => {
+    return request({
+        url: '/device-boot/fileUrl/getFileById',
+        method: 'get',
+        params
+    })
+}

src/api/event-boot/report.ts

@@ -1,13 +1,36 @@
 import createAxios from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 
 //事件报告
+// export function getEventReport(data) {
+//     return createAxios({
+//         url: '/event-boot/report/getEventReport',
+//         method: 'post',
+//         data
+//     })
+// }
+
 export function getEventReport(data) {
     return createAxios({
-        url: '/event-boot/report/getEventReport',
+        url: '/event-boot/report/createEventReport',
         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
+        }
     })
 }
+
+
 // 生成报告
 export function getAreaReport(data) {
     return createAxios({
@@ -15,8 +38,39 @@ export function getAreaReport(data) {
         method: 'post',
         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)
+    }
+}
+
 //查询所有模板
 export function getList(data) {
     return createAxios({
@@ -38,6 +92,17 @@ export function getLineExport(data) {
         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
+        }
     })
 }
 export function getVoltage(data: any) {

src/api/harmonic-boot/area.ts

@@ -20,6 +20,14 @@ export function getAreaDept() {
         method: 'post'
     })
 }
+// 承载能力评估去除前缀
+export function getAreaDeptRemoveMode(params) {
+    return request({
+        url: '/user-boot/dept/loginDeptTree',
+        method: 'GET',
+        params: params
+    })
+}
 export function getOnlineRateDataCensus(data:any) {
     return request({
         url: '/device-boot/terminalOnlineRateData/getOnlineRateDataCensus',

src/api/harmonic-boot/harmonic.ts

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 export function getHistoryResult(data: any) {
     return request({
         url: '/harmonic-boot/harmonic/getHistoryResult',
@@ -14,5 +14,35 @@ export function exportModelJB(data: any) {
         method: 'post',
         responseType: 'blob',
         data: data
+    }).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/process-boot/reportForms.ts

@@ -1,4 +1,5 @@
 import createAxios from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 
 export function exportModel(data: any) {
     return createAxios({
@@ -6,5 +7,54 @@ export function exportModel(data: any) {
         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
+        }
     })
 }
+export function areaHarmonicReport(data: any) {
+    return createAxios({
+        url: '/harmonic-boot/areaHarmonicReport/areaHarmonicReport',
+        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/system-boot/MonitoringPoint.ts

@@ -0,0 +1,42 @@
+import request from "@/utils/request";
+
+//查询所有模板
+export function getList(data: any) {
+    return request({
+        url: "/system-boot/EventTemplate/getList",
+        method: "post",
+        data,
+    });
+}
+//字典树
+export function getDictTree(data: any) {
+    return request({
+        url: "/system-boot/reportDict/DictTree",
+        method: "post",
+        params:data
+    });
+}
+//新增模板
+export function addData(data: any) {
+    return request({
+        url: "/system-boot/EventTemplate/add",
+        method: "post",
+        data,
+    });
+}
+//修改模板
+export function updateData(data: any) {
+    return request({
+        url: "/system-boot/EventTemplate/update",
+        method: "post",
+        data,
+    });
+}
+//删除模板
+export function deleteData(data: any) {
+    return request({
+        url: "/system-boot/EventTemplate/delete",
+        method: "post",
+        data,
+    });
+}

src/api/system-boot/ReportTemplate.ts

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+//获取字典树数据
+export function getDictTree(data) {
+    return request({
+        url: "/system-boot/reportDict/DictTree",
+        method: "post",
+        params:data
+    });
+}
+
+//查询字典列表
+export function getReportDictList(data: any) {
+    return request({
+        url: "/system-boot/reportDict/getReportDictList",
+        method: "post",
+        data
+    });
+}
+//新增字典表
+export function addDict(data: any) {
+    return request({
+        url: "/system-boot/reportDict/addDict",
+        method: "post",
+        data
+    });
+}
+//更新字典表
+export function updateDict(data: any) {
+    return request({
+        url: "/system-boot/reportDict/updateDict",
+        method: "put",
+        data
+    });
+}
+//删除字典表
+export function deleteDict(data: any) {
+    return request({
+        url: "/system-boot/reportDict/deleteDict",
+        method: "delete",
+        params:data
+    });
+}

src/api/system-boot/area.ts

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+//区域树形表格接口
+export function areaTree(data: any) {
+    return request({
+        url: '/system-boot/area/areaTree',
+        method: 'post',
+        params: data,
+    })
+}
+export function areaAdd(data: any) {
+    return request({
+        url: '/system-boot/area/add',
+        method: 'post',
+        data: data,
+    })
+}
+export function areaDelete(data: any) {
+    return request({
+        url: '/system-boot/area/delete',
+        method: 'post',
+        data: data,
+    })
+}
+export function update(data: any) {
+    return request({
+        url: '/system-boot/area/update',
+        method: 'post',
+        data: data,
+    })
+}
+export function selectPid(data: any) {
+    return request({
+        url: '/system-boot/area/selectPid',
+        method: 'post',
+        data: data,
+    })
+}

src/api/system-boot/file.ts

@@ -7,8 +7,20 @@ const SYSTEM_PREFIX = '/system-boot'
  * @param file
  */
 export const uploadFile = (file: any, path: string) => {
+    const regex = /\[|\]/g
+    // 替换规则：[ 换成 (，] 换成 )
+
+    const newFile = new File(
+        [file], // 原文件的二进制内容
+        file.name.replace(regex, match => (match === '[' ? '(' : ')')), // 新的文件名
+        {
+            type: file.type, // 复用原文件的MIME类型
+            lastModified: file.lastModified // 复用最后修改时间
+        }
+    )
+
     let form = new FormData()
-    form.append('file', file)
+    form.append('file', newFile)
     form.append('path', path)
     return createAxios({
         url: SYSTEM_PREFIX + '/file/upload',
@@ -19,7 +31,7 @@ export const uploadFile = (file: any, path: string) => {
         data: form
     }).then(res => {
         if (res.code == `A0000`) {
-            ElMessage.success('上传成功!')
+            ElMessage.success('文件上传成功!')
             return res
         }
     })

src/api/user-boot/user.ts

@@ -43,6 +43,30 @@ export async function login(params: any) {
         params
     })
 }
+//辽宁嵌入登录获取token
+export async function loginLNqr(data: any) {
+    return request({
+        url: '/pqs-auth/oauth/lnLogin',
+        method: 'get',
+        params: data
+    })
+}
+
+export async function lnRefreshToken(data: any) {
+    return request({
+        url: '/pqs-auth/oauth/lnRefreshToken',
+        method: 'get',
+        params: data
+    })
+}
+
+export async function logout() {
+    return request({
+        url: '/pqs-auth/oauth/logout',
+        method: 'DELETE',
+    })
+}
+
 
 //获取用户信息
 export function getUserById() {
@@ -70,6 +94,17 @@ export function refreshToken(): Promise<any> {
     })
 }
 
+
+export function lnRefreshTokenTo(): Promise<any> {
+    // 调用useAdminInfo函数获取管理员信息，并将其赋值给adminInfo变量
+    const adminInfo = useAdminInfo()
+    return lnRefreshToken({
+        refreshToken: adminInfo.refresh_token,
+        clientId: "njcn",
+        clientSecret:"njcnpqs"
+    })
+}
+
 /**
  * 获取营销用户列表
  * @returns {AxiosPromise}

src/components/FormCreate/src/utils/index.ts

@@ -23,7 +23,7 @@ export function upper(str) {
 }
 
 export function makeOptionsRule(t, to, userOptions) {
-  console.log(userOptions[0])
+  //console.log(userOptions[0])
   const options = [
     { label: t('props.optionsType.struct'), value: 0 },
     { label: t('props.optionsType.json'), value: 1 },

src/components/PreviewFile/index.vue

@@ -1,11 +1,19 @@
 <template>
     <div style="overflow: auto; height: 100vh">
-        <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
+        <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
-        <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url" :options="excelOptions" />
+        <vue-office-excel
+            v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')"
+            :src="url"
+            :options="excelOptions"
+        />
         <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url" /> -->
-        <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
+        <iframe v-if="urlKey.includes('.pdf')||urlKey.includes('.txt')" :src="url" style="width: 100%; height: 99%"></iframe>
-        <img v-if="url.includes('.png') || url.includes('.jpg') || url.includes('.gif') || url.includes('.bmp')"
+        <img
-            :src="url" />
+            v-if="
+                urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
+            "
+            :src="url"
+        />
     </div>
 </template>
 <script lang="ts" setup>
@@ -19,22 +27,33 @@ import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
 import { downloadFile } from '@/api/system-boot/file'
+import { previewFile } from '@/utils/fileDownLoad'
+
 const { push, options, currentRoute } = useRouter()
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+const VITE_FLAG = false//import.meta.env.VITE_NAME == 'jibei'
 // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
 const url = ref('')
 const excelOptions = ref({})
-if(VITE_FLAG){
+const urlKey = currentRoute.value?.href?.split('?')[1]
+
+if (VITE_FLAG) {
     url.value = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
     excelOptions.value = ref({
         xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
     })
-}else{
+} else {
-    //下载
+    setTimeout(async () => {
-    
+        const previewUrl = await previewFile(currentRoute.value?.href?.split('?')[1])
-}
+        url.value = previewUrl
+        excelOptions.value = ref({
+            xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
+        })
+    }, 0)
+ }
 
 onMounted(() => {
+    // 从路由参数获取文件路径
+
     console.log()
 })
 </script>

src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -707,7 +707,7 @@ const processSave = async () => {
 //   return result.value || ' '
 // }
 onBeforeMount(() => {
-  console.log(props, 'propspropspropsprops')
+  //console.log(props, 'propspropspropsprops')
 })
 onMounted(() => {
   initBpmnModeler()

src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue

@@ -15,7 +15,7 @@ const addTask = (event, options: any = {}) => {
   const ElementFactory = bpmnInstances().elementFactory
   const create = bpmnInstances().modeler.get('create')
 
-  console.log(ElementFactory, create)
+  //console.log(ElementFactory, create)
 
   const shape = ElementFactory.createShape(assign({ type: 'bpmn:UserTask' }, options))
 
@@ -23,8 +23,8 @@ const addTask = (event, options: any = {}) => {
     shape.businessObject.di.isExpanded = options.isExpanded
   }
 
-  console.log(event, 'event')
+  //console.log(event, 'event')
-  console.log(shape, 'shape')
+  //console.log(shape, 'shape')
   create.start(event, shape)
 }
 </script>

src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue

@@ -172,7 +172,7 @@ const unwatchBpmn = watch(
         return
       }
 
-      console.log('props.bpmnModeler 有值了！！！')
+      //console.log('props.bpmnModeler 有值了！！！')
       const w = window as any
       w.bpmnInstances = {
         modeler: props.bpmnModeler,

src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue

@@ -179,7 +179,7 @@ onBeforeUnmount(() => {
 watch(
   () => props.businessObject,
   (val) => {
-    console.log(val, 'val')
+    //console.log(val, 'val')
     nextTick(() => {
       resetFlowCondition()
     })

src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue

@@ -376,7 +376,7 @@ const openListenerForm = (listener, index?) => {
 }
 // 移除监听器
 const removeListener = (listener, index?) => {
-  console.log(listener, 'listener')
+  //console.log(listener, 'listener')
   ElMessageBox.confirm('确认移除该监听器吗？', '提示', {
     confirmButtonText: '确 认',
     cancelButtonText: '取 消'

src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts

@@ -20,7 +20,7 @@ export function initListenerForm(listener) {
           self.eventDefinitionType = key.replace('time', '').toLowerCase()
         }
       }
-      console.log(k)
+      //console.log(k)
       self.eventTimeDefinitions = listener.eventDefinitions[0][k].body
     }
   }

src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue

@@ -68,7 +68,7 @@ const modelConfig = computed(() => {
 const bpmnInstances = () => (window as any)?.bpmnInstances
 
 const initDataList = () => {
-  console.log(window, 'window')
+  //console.log(window, 'window')
   rootElements.value = bpmnInstances().modeler.getDefinitions().rootElements
   messageIdMap.value = {}
   signalIdMap.value = {}

src/components/bpmnProcessDesigner/src/utils/xml2json.js

@@ -39,7 +39,7 @@ function xml2json(xml) {
 
 function xmlObj2json(xml) {
   const xmlObj = xmlStr2XmlObj(xml)
-  console.log(xmlObj)
+ // console.log(xmlObj)
   let jsonObj = {}
   if (xmlObj.childNodes.length > 0) {
     jsonObj = xml2json(xmlObj)

src/components/cockpit/integrity/index.vue

@@ -183,7 +183,7 @@ const tableStore: any = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.citTotalNum != 0
             } else {
-                return k.citName != '上送国网' && k.citName != '非上送国网'
+                return  !k.citName.includes('上送')
             }
         })
     }
@@ -223,7 +223,7 @@ const echart = () => {
 
             series: [
                 {
-                    name: '异常总数',
+                    name: '',
                     type: 'bar',
                     barWidth: 12,
                     data: [100],
@@ -240,7 +240,7 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 1,
-                                        color: '#57bc6e' // 100% 处的颜色
+                                        color: '#FF9100' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false
@@ -249,7 +249,7 @@ const echart = () => {
                     }
                 },
                 {
-                    name: '异常占比',
+                    name: '',
                     type: 'bar',
                     barWidth: 13,
                     data: [
@@ -270,11 +270,11 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 0,
-                                        color: '#FF9100' // 0% 处的颜色
+                                        color: '#57bc6e ' // 0% 处的颜色
                                     },
                                     {
                                         offset: 1,
-                                        color: '#FF9100' // 100% 处的颜色
+                                        color: '#57bc6e' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false

src/components/cockpit/onlineRate/index.vue

@@ -181,7 +181,7 @@ const tableStore: any = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.citTotalNum != 0
             } else {
-                return k.citName != '上送国网' && k.citName != '非上送国网'
+                return  !k.citName.includes('上送')
             }
         })
         
@@ -222,7 +222,7 @@ const echart = () => {
 
             series: [
                 {
-                    name: '异常总数',
+                    name: '',
                     type: 'bar',
                     barWidth: 12,
                     data: [100],
@@ -239,7 +239,7 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 1,
-                                        color: '#57bc6e' // 100% 处的颜色
+                                        color: '#FF9100' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false
@@ -248,7 +248,7 @@ const echart = () => {
                     }
                 },
                 {
-                    name: '异常占比',
+                    name: '',
                     type: 'bar',
                     barWidth: 13,
                     data: [
@@ -269,11 +269,11 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 0,
-                                        color: '#FF9100' // 0% 处的颜色
+                                        color: '#57bc6e' // 0% 处的颜色
                                     },
                                     {
                                         offset: 1,
-                                        color: '#FF9100' // 100% 处的颜色
+                                        color: '#57bc6e' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false

src/components/cockpit/terminalEvaluation/index.vue

@@ -233,7 +233,7 @@ const tableStore: any = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.count != 0
             } else {
-                return k.name != '上送国网' && k.name != '非上送国网'
+                return !k.citName.includes('上送')
             }
         })
     }

src/components/echarts/MyEchart.vue

@@ -17,6 +17,7 @@ const config = useConfig()
 // import { nextTick } from 'process'
 const emit = defineEmits(['triggerPoint', 'group', 'echartClick'])
 color[0] = config.layout.elementUiPrimary[0]
+
 const chartRef = ref<HTMLDivElement>()
 
 const props = defineProps(['options', 'isInterVal', 'pieInterVal'])
@@ -70,6 +71,8 @@ const initChart = () => {
                     const value =
                         item.value === 3.14159 || item.value === 0.14159
                             ? '暂无数据'
+                            : item.value === 0.14158
+                            ? 0
                             : Math.round(item.value * 100) / 100 // 处理特殊值
                     tips += `<div style=" display: flex;justify-content: space-between;">
                            <span>${item.marker}
@@ -154,7 +157,6 @@ const initChart = () => {
         if (params.seriesName == '暂态触发点') {
             emit('triggerPoint', params.data)
         } else {
-
             emit('echartClick', params)
         }
     })

src/components/echarts/MyEchartMap.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeUnmount, ref, watch, onMounted, defineEmits } from 'vue'
+import { onBeforeUnmount, ref, watch, onMounted,  } from 'vue'
 import * as echarts from 'echarts'
 import 'echarts-gl'
 import 'echarts-liquidfill'
@@ -19,14 +19,21 @@ const myCharts = ref()
 const showCircle = ref(false)
 
 const fetchConfig = async (name: string) => {
-    const res = await import(`../../assets/map/${name.replace(/市$/, "")}.json`)
+    try {
+        // 处理城市名称（去掉末尾的"市"）并尝试导入对应文件
+        const res = await import(`../../assets/map/${name.replace(/市$/, '')}.json`)
         return res.default
+    } catch (error) {
+        const chinaRes = await import(`../../assets/map/中国.json`) // 请确认中国文件的实际命名
+        return chinaRes.default
+    }
+    // const res = await import(`../../assets/map/${name.replace(/市$/, "")}.json`)
+    // return res.default
     // GetEchar(res.default)
 }
 // fetchConfig()
 
 const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
-onMounted(() => { })
 
 const GetEchar = async (name: string) => {
     let chartDom = document.getElementById('chartMap')
@@ -36,6 +43,7 @@ const GetEchar = async (name: string) => {
     name == dictData.state.area?.[0].name ? (showCircle.value = false) : (showCircle.value = true)
 
     echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图
+
     let option = {
         title: {
             left: 'center',
@@ -91,6 +99,7 @@ const GetEchar = async (name: string) => {
             // top: 10,
             //    bottom: 0,
             roam: true,
+             
             label: {
                 normal: {
                     show: true,
@@ -170,6 +179,7 @@ const GetEchar = async (name: string) => {
     }, 0)
     window.addEventListener('resize', resizeHandler)
     const flag1 = ref(true)
+
     // 点击事件
     myCharts.value.off('click')
     myCharts.value.on('click', (e: any) => {

src/components/echarts/analytics.vue

@@ -6,29 +6,40 @@
             </div>
             <el-tabs type="border-card">
                 <el-tab-pane label="暂态波形上送" :style="'height:' + vhh">
-                    <el-table stripe :data="Data" :height="height" border style="width: 100%"
+                    <vxe-table
-                        header-cell-class-name="table_header">
+                        stripe
-                        <el-table-column align="center" prop="number" label="事件段"></el-table-column>
+                        :data="Data"
-                        <el-table-column align="center" prop="number" label="波形起始点相位(°)">
+                        :height="height"
-                            <el-table-column align="center" prop="number" label="A相"></el-table-column>
+                        border
-                            <el-table-column align="center" prop="number" label="B相"></el-table-column>
+                        style="width: 100%"
-                            <el-table-column align="center" prop="number" label="C相"></el-table-column>
+                        header-cell-class-name="table_header"
-                        </el-table-column>
+                    >
-                        <el-table-column align="center" prop="number" label="跳变段电压变化率(V/ms)">
+                        <vxe-column align="center" field="number" title="事件段"></vxe-column>
-                            <el-table-column align="center" prop="number" label="A相"></el-table-column>
+                        <vxe-colgroup align="center" field="number1" title="波形起始点相位(°)">
-                            <el-table-column align="center" prop="number" label="B相"></el-table-column>
+                            <vxe-column align="center" field="number2" title="A相"></vxe-column>
-                            <el-table-column align="center" prop="number" label="C相"></el-table-column>
+                            <vxe-column align="center" field="number3" title="B相"></vxe-column>
-                        </el-table-column>
+                            <vxe-column align="center" field="number4" title="C相"></vxe-column>
-                        <el-table-column align="center" prop="number" label="相位跳变(°)">
+                        </vxe-colgroup>
-                            <el-table-column align="center" prop="number" label="A相"></el-table-column>
+                        <vxe-colgroup align="center" field="number" title="跳变段电压变化率(V/ms)">
-                            <el-table-column align="center" prop="number" label="B相"></el-table-column>
+                            <vxe-column align="center" field="number5" title="A相"></vxe-column>
-                            <el-table-column align="center" prop="number" label="C相"></el-table-column>
+                            <vxe-column align="center" field="number6" title="B相"></vxe-column>
-                        </el-table-column>
+                            <vxe-column align="center" field="number7" title="C相"></vxe-column>
-                        <el-table-column align="center" prop="number" label="总分段数目"></el-table-column>
+                        </vxe-colgroup>
-                        <el-table-column align="center" prop="number" label="三相电压不平衡度(%)" width="180"></el-table-column>
+                        <vxe-colgroup align="center" field="number" title="相位跳变(°)">
-                        <el-table-column align="center" prop="number" label="暂降类型"></el-table-column>
+                            <vxe-column align="center" field="number8" title="A相"></vxe-column>
-                        <el-table-column align="center" prop="number" label="暂降原因"></el-table-column>
+                            <vxe-column align="center" field="number9" title="B相"></vxe-column>
-                    </el-table>
+                            <vxe-column align="center" field="number10" title="C相"></vxe-column>
+                        </vxe-colgroup>
+                        <vxe-column align="center" field="number11" title="总分段数目"></vxe-column>
+                        <vxe-column
+                            align="center"
+                            field="number12"
+                            title="三相电压不平衡度(%)"
+                            width="180"
+                        ></vxe-column>
+                        <vxe-column align="center" field="number13" title="触发类型"></vxe-column>
+                        <vxe-column align="center" field="number14" title="暂降原因"></vxe-column>
+                    </vxe-table>
                 </el-tab-pane>
             </el-tabs>
         </div>
@@ -73,7 +84,25 @@ export default {
             subName: '',
             waveDatas: [],
 
-            Data: [],
+            Data: [
+                {
+                    number: 1,
+                    number1: 0,
+                    number2: 0,
+                    number3: 0,
+                    number4: 0,
+                    number5: 0,
+                    number6: 0,
+                    number7: 0,
+                    number8: 0,
+                    number9: 0,
+                    number10: 0,
+                    number11: 1,
+                    number12: 0,
+                    number13: '其他',
+                    number14: '其他'
+                }
+            ],
             height: null,
             vhh: null,
             ptpass: '',
@@ -88,7 +117,7 @@ export default {
             zoom: ''
         }
     },
-    created() { },
+    created() {},
     watch: {
         value: function (a, b) {
             if (a == 2) {
@@ -116,10 +145,10 @@ export default {
             this.zoom = 1 / document.body.style.zoom
             if (this.flag) {
                 // console.log(123);
-                this.vh = mainHeight(250).height
+                this.vh = mainHeight(280).height
             } else {
                 // console.log(3333);
-                this.vh = mainHeight(270).height
+                this.vh = mainHeight(305).height
             }
         },
         query() {
@@ -197,6 +226,8 @@ export default {
                     '#FF9999'
                 ]
             }
+            console.log('🚀 ~ this.boxoList:', this.boxoList)
+
             var option = {
                 tooltip: {
                     top: '10px',
@@ -239,7 +270,7 @@ export default {
 
                 title: {
                     left: 'center',
-                    text: '发生时刻：' + this.boxoList.startTime + ' PT变化:' + this.boxoList.measurementPointName,
+                    text: '发生时刻：' + this.boxoList.startTime + ' PT变化:' + this.boxoList.pt,
                     textStyle: {
                         fontSize: 16,
                         color: _this.DColor ? '#fff' : echartsColor.WordColor
@@ -378,6 +409,33 @@ export default {
                     }
                 ],
                 series: [
+                    {
+                        name: '跳变期',
+                        type: 'line',
+                        data: [],
+                        showSymbol: true, // 强制显示标记
+                        symbol: 'rect', // 标记形状为方块
+                        symbolSize: 10, // 方块大小
+                        itemStyle: {
+                            color: '#888888', // 方块颜色为灰色
+                            borderWidth: 0
+                        },
+
+                        markArea: {
+                            silent: true, // 不响应交互
+                            itemStyle: { color: '#ccc' },
+                            data: [
+                                [
+                                    { xAxis: '0' }, // 第一个跳变期起始
+                                    { xAxis: '5' } // 第一个跳变期结束
+                                ],
+                                [
+                                    { xAxis: '210' }, // 第二个跳变期起始
+                                    { xAxis: '220' } // 第二个跳变期结束
+                                ]
+                            ]
+                        }
+                    },
                     {
                         name: 'A相',
                         type: 'line',

src/components/echarts/rmsWorker.js

@@ -0,0 +1,322 @@
+// 辅助函数
+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, requestId } = 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({
+            requestId,
+            titles: titles,
+            success: true,
+            waveDatas,
+            time: wp.time,
+            type: wp.waveType,
+            severity: wp.yzd,
+            iphasic: iphasicValue
+        })
+    } catch (error) {
+        self.postMessage({
+            requestId,
+            success: false,
+            error: error.message
+        })
+    }
+}

src/components/echarts/shuWorker.js

@@ -0,0 +1,207 @@
+// waveData.worker.js
+self.addEventListener('message', function (e) {
+    const { wp, value, iphasic, isOpen, boxoList, requestId } = 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({
+        requestId,
+        success: true,
+        waveDatas,
+        time,
+        type,
+        severity,
+        titles,
+        iphasic: iphasicValue
+    })
+})

src/components/echarts/waveForm.vue

@@ -2,7 +2,7 @@
     <div v-if="view2">
         <el-row>
             <el-col :span="12">
-                <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
+                <!-- <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
                 <el-select
                     style="min-width: 200px; width: 200px"
                     @change="changeView"
@@ -15,52 +15,31 @@
                         :label="item.label"
                         :value="item.value"
                     ></el-option>
-                </el-select>
+                </el-select> -->
-                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary"
+                <el-radio-group v-model.trim="value" @change="changeView">
-                    @click="AdvancedAnalytics">高级分析</el-button> -->
+                    <el-radio-button label="一次值" :value="1" />
+                    <el-radio-button label="二次值" :value="2" />
+                </el-radio-group>
+                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary" @click="AdvancedAnalytics">
+                    高级分析
+                </el-button> -->
             </el-col>
             <el-col :span="12">
-                <el-button
+                <el-button @click="backbxlb" icon="el-icon-Back" style="float: right">返回</el-button>
-                    @click="backbxlb"
-                    class="el-icon-refresh-right"
-                    icon="el-icon-Back"
-                    style="float: right"
-                >
-                    返回
-                </el-button>
             </el-col>
         </el-row>
-        <div v-loading="loading" style="height: calc(100vh - 190px)">
+        <div v-loading="loading" style="height: calc(100vh - 190px)" class="mt10">
-            <el-tabs v-if="view4" class="default-main" v-model="bxactiveName" @tab-click="bxhandleClick">
+            <el-tabs v-if="view4" type="border-card"  v-model="bxactiveName"
-                <el-tab-pane
+                @tab-click="bxhandleClick">
-                    label="瞬时波形"
+                <el-tab-pane label="瞬时波形" name="ssbx" class="boxbx pt10 pb10"
-                    name="ssbx"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'">
-                    class="boxbx pt10 pb10"
+                    <shushiboxi ref="shushiboxiRef" v-if="bxactiveName == 'ssbx' && showBoxi" :value="value"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+                        :parentHeight="parentHeight" :boxoList="boxoList" :wp="wp"></shushiboxi>
-                >
-                    <shushiboxi
-                        ref="shushiboxiRef"
-                        v-if="bxactiveName == 'ssbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></shushiboxi>
                 </el-tab-pane>
-                <el-tab-pane
+                <el-tab-pane label="RMS波形" class="boxbx pt10 pb10" name="rmsbx"
-                    label="RMS波形"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'">
-                    class="boxbx pt10 pb10"
+                    <rmsboxi ref="rmsboxiRef" v-if="bxactiveName == 'rmsbx' && showBoxi" :value="value"
-                    name="rmsbx"
+                        :parentHeight="parentHeight" :boxoList="boxoList" :wp="wp"></rmsboxi>
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <rmsboxi
-                        ref="rmsboxiRef"
-                        v-if="bxactiveName == 'rmsbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></rmsboxi>
                 </el-tab-pane>
             </el-tabs>
             <el-empty v-else description="暂无数据" style="height: calc(100vh - 190px)" />
@@ -106,14 +85,14 @@ const options = ref([
     }
 ])
 const shushiboxiRef = ref()
-const bxecharts = ref(mainHeight(95).height as any)
+const bxecharts = ref(mainHeight(145).height as any)
 const view2 = ref(true)
-const boxoList = ref(null)
+const boxoList: any = ref(null)
 const wp = ref(null)
 const showBoxi = ref(true)
 const view3 = ref(false)
 const view4 = ref(false)
-const GJList = ref([])
+const GJList = ref({})
 
 const open = async (row: any) => {
     loading.value = true
@@ -122,6 +101,7 @@ const open = async (row: any) => {
             row.loading = false
             if (res != undefined) {
                 boxoList.value = row
+                boxoList.value.pt = res.data.pt
                 wp.value = res.data
                 loading.value = false
                 view4.value = true
@@ -129,12 +109,10 @@ const open = async (row: any) => {
         })
         .catch(() => {
             loading.value = false
+            backbxlb()
         })
 }
 const bxhandleClick = (tab: any) => {
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-
     loading.value = true
     if (tab.name == 'ssbx') {
         bxactiveName.value = 'ssbx'
@@ -149,8 +127,7 @@ const bxhandleClick = (tab: any) => {
 const backbxlb = () => {
     boxoList.value = null
     wp.value = null
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
+
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
 
     emit('backbxlb')
 }
@@ -168,10 +145,13 @@ const AdvancedAnalytics = () => {
     analysis({
         eventIndex: boxoList.value.eventId
     }).then(res => {
-        GJList.value = res.data
+        //     GJList.value = res.data
+        //     view3.value = true
+        //     view2.value = false
+    })
+    GJList.value = {}
     view3.value = true
     view2.value = false
-    })
 }
 const changeView = () => {
     if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()

src/components/form/datePicker/index.vue

@@ -127,7 +127,7 @@ const timeChange = (e: number) => {
 
 // 当前
 const nowTime = () => {
-    console.log(interval.value, '000000000')
+    //console.log(interval.value, '000000000')
     timeChange(interval.value)
 }
 // 上一个
@@ -312,7 +312,7 @@ const next = () => {
             }
         } else {
             month = month + 3
-            console.log('🚀 ~ next ~ presentM:', presentM, month)
+           // console.log('🚀 ~ next ~ presentM:', presentM, month)
 
             // 季度进位后，超过当前月份是不科学的
             if (year == presentY && !props.nextFlag) {
@@ -327,7 +327,7 @@ const next = () => {
                             endTime = year + '-0' + presentM + '-' + presentD
                         }
                     } else if (presentM > 3 && presentM < 7) {
-                        console.log(123123)
+                       // console.log(123123)
                         // 第二季度
                         startTime = year + '-04-01'
                         if (presentD < 10) {
@@ -380,7 +380,7 @@ const next = () => {
                 }
             }
         }
-        console.log(startTime, endTime)
+       // console.log(startTime, endTime)
     } else if (interval.value == 5) {
     } else if (interval.value == 4) {
         //根据开始时间推

src/components/table/header/index.vue

@@ -1,29 +1,20 @@
 <template>
     <div ref="tableHeader" class="cn-table-header">
         <div class="table-header ba-scroll-style">
-            <el-form
+            <el-form style="flex: 1; height: 32px; display: flex; flex-wrap: wrap" ref="headerForm" @submit.prevent=""
-                style="flex: 1; height: 32px; display: flex; flex-wrap: wrap"
+                @keyup.enter="onComSearch" label-position="left" :inline="true">
-                ref="headerForm"
-                @submit.prevent=""
-                @keyup.enter="onComSearch"
-                label-position="left"
-                :inline="true"
-            >
                 <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 630px">
                     <template #label>
                         <el-checkbox v-if="showTimeAll" v-model="timeAll" label="统计时间" />
                         <span v-else>{{ dateLabel }}</span>
                     </template>
-                    <DatePicker
+                    <DatePicker ref="datePickerRef" v-if="timeAll" :nextFlag="nextFlag"
-                        ref="datePickerRef"
+                        :theCurrentTime="theCurrentTime"></DatePicker>
-                        v-if="timeAll"
-                        :nextFlag="nextFlag"
-                        :theCurrentTime="theCurrentTime"
-                    ></DatePicker>
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
-                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" />
+                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" @change-value="onAreaChange"
+                        style="width: 200px;" />
                 </el-form-item>
                 <slot name="select"></slot>
             </el-form>
@@ -32,43 +23,24 @@
                     <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
+                <el-button @click="onComSearch" v-if="showSearch" :loading="tableStore.table.loading" type="primary"
-                    @click="onComSearch"
+                    :icon="Search">
-                    v-if="showSearch"
-                    :loading="tableStore.table.loading"
-                    type="primary"
-                    :icon="Search"
-                >
                     查询
                 </el-button>
-                <el-button
+                <el-button @click="onResetForm" v-if="showSearch && showReset" :loading="tableStore.table.loading"
-                    @click="onResetForm"
+                    :icon="RefreshLeft">
-                    v-if="showSearch && showReset"
-                    :loading="tableStore.table.loading"
-                    :icon="RefreshLeft"
-                >
                     重置
                 </el-button>
-                <el-button
+                <el-button @click="onExport" v-if="showExport" :loading="tableStore.table.exportLoading" type="primary"
-                    @click="onExport"
+                    icon="el-icon-Download">
-                    v-if="showExport"
-                    :loading="tableStore.table.loading"
-                    type="primary"
-                    icon="el-icon-Download"
-                >
                     导出
                 </el-button>
             </template>
             <slot name="operation"></slot>
         </div>
-        <el-form
+        <el-form :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
-            :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
+            ref="headerFormSecond" @submit.prevent="" @keyup.enter="onComSearch" label-position="left"
-            ref="headerFormSecond"
+            :inline="true"></el-form>
-            @submit.prevent=""
-            @keyup.enter="onComSearch"
-            label-position="left"
-            :inline="true"
-        ></el-form>
     </div>
 </template>
 
@@ -81,7 +53,7 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import { Search, RefreshLeft } from '@element-plus/icons-vue'
 import { defineProps } from 'vue'
-const emit = defineEmits(['selectChange'])
+const emit = defineEmits(['selectChange', 'areaChange'])
 const tableStore = inject('tableStore') as TableStore
 const tableHeader = ref()
 const datePickerRef = ref()
@@ -132,6 +104,10 @@ const headerFormSecondStyleClose = {
     padding: '0'
 }
 
+const onAreaChange = data => {
+    emit('areaChange', { label: data.label })
+}
+
 watch(
     () => tableStore?.table.params.deptIndex,
     newVal => {
@@ -232,6 +208,16 @@ const onResetForm = () => {
     //时间重置成默认值
     datePickerRef.value?.setTheDate(3)
 
+    if (props.showTimeAll) {
+        timeAll.value = false
+        delete tableStore.table.params.searchBeginTime
+        delete tableStore.table.params.searchEndTime
+        delete tableStore.table.params.startTime
+        delete tableStore.table.params.endTime
+        delete tableStore.table.params.timeFlag
+        delete tableStore.table.params.interval
+    }
+
     if (props.datePicker && timeAll.value) {
         tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
         tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
@@ -248,7 +234,6 @@ const setTheDate = (val: any) => {
 }
 // 导出
 const onExport = () => {
-    
     tableStore.onTableAction('export', { showAllFlag: true })
 }
 
@@ -284,6 +269,7 @@ defineExpose({
     padding: 13px 15px;
     font-size: 14px;
     overflow: hidden;
+
     .table-header-operate-text {
         margin-left: 6px;
     }
@@ -311,7 +297,7 @@ defineExpose({
     margin-left: 12px;
 }
 
-.mlr-12 + .el-button {
+.mlr-12+.el-button {
     margin-left: 12px;
 }
 
@@ -346,7 +332,7 @@ defineExpose({
         border-radius: 0;
     }
 
-    .el-button + .el-button {
+    .el-button+.el-button {
         margin: 0;
     }
 
@@ -357,6 +343,7 @@ defineExpose({
 
 html.dark {
     .table-search-button-group {
+
         button:focus,
         button:active {
             background-color: var(--el-color-info-dark-2);

src/components/table/index.vue

@@ -1,24 +1,44 @@
 <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-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-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"
+                            :row="scope.row"
+                            :column="scope.column"
+                            :index="scope.rowIndex"
+                            :key="
+                                key +
                                 '-' +
                                 item.render +
                                 '-' +
                                 (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            " />
+                            "
+                        />
                     </template>
                 </Column>
             </template>
@@ -27,11 +47,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>

src/components/tree/allocation.vue

@@ -0,0 +1,187 @@
+<template>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
+        <div class="mt15 mr10" style="display: flex; justify-content: end">
+            <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" show-word-limit 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 - 235px)' }"
+                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 { emit } from 'process'
+import { ref, watch } from 'vue'
+import { t } from 'vxe-table'
+import { useConfig } from '@/stores/config'
+
+defineOptions({
+    name: 'govern/tree'
+})
+
+interface Props {
+    width?: string
+    canExpand?: boolean
+    showPush?: boolean
+}
+const loading = ref(false)
+const props = withDefaults(defineProps<Props>(), {
+    width: '280px',
+    canExpand: true,
+    showPush: false
+})
+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/index.vue

@@ -147,7 +147,7 @@ const onMenuCollapse = () => {
 }
 // 查看详情
 const viewDetails = (data: any) => {
-    console.log('🚀 ~ viewDetails ~ data:', data)
+   // console.log('🚀 ~ viewDetails ~ data:', data)
     if (data.level == 3) {
         // 变电站详情
         // substationDetails
@@ -201,7 +201,7 @@ onMounted(async () => {
 })
 
 const scrollToNode = (id: string) => {
-    console.log("🚀 ~ scrollToNode ~ id:", id)
+   // console.log("🚀 ~ scrollToNode ~ id:", id)
     if (!treeRef.value) return
 
     // 获取目标节点的元素

src/components/tree/pqs/Terminal.vue

@@ -28,66 +28,66 @@ const info = (id: any) => {
     expanded.value = [id]
     getTerminalTree().then(res => {
         // let arr: any[] = []
-        if (VITE_FLAG) {
+        // if (VITE_FLAG) {
-            res.data.forEach((item: any) => {
+        //     res.data.forEach((item: any) => {
-                item.icon = 'el-icon-Menu'
+        //         item.icon = 'el-icon-Menu'
-                item.plevel = item.level
+        //         item.plevel = item.level
-                item.level = 0
+        //         item.level = 0
-                item.children.forEach((item2: any) => {
+        //         item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-HomeFilled'
+        //             item2.icon = 'el-icon-HomeFilled'
 
-                    item2.plevel = item2.level
+        //             item2.plevel = item2.level
-                    item2.level = 100
+        //             item2.level = 100
-                    expanded.value.push(item2.id)
+        //             expanded.value.push(item2.id)
-                    item2.children.forEach((item3: any) => {
+        //             item2.children.forEach((item3: any) => {
-                        item3.icon = 'el-icon-CollectionTag'
+        //                 item3.icon = 'el-icon-CollectionTag'
-                        item3.plevel = item3.level
+        //                 item3.plevel = item3.level
-                        item3.level = 200
+        //                 item3.level = 200
-                        item3.children.forEach((item4: any) => {
+        //                 item3.children.forEach((item4: any) => {
-                            item4.icon = 'el-icon-Flag'
+        //                     item4.icon = 'el-icon-Flag'
-                            item4.plevel = item4.level
+        //                     item4.plevel = item4.level
-                            item4.level = 300
+        //                     item4.level = 300
-                            // arr.push(item4)
+        //                     // arr.push(item4)
-                            item4.children.forEach((item5: any) => {
+        //                     item4.children.forEach((item5: any) => {
-                                item5.icon = 'el-icon-OfficeBuilding'
+        //                         item5.icon = 'el-icon-OfficeBuilding'
-                                item5.plevel = item5.level
+        //                         item5.plevel = item5.level
-                                item5.level = 300
+        //                         item5.level = 300
-                                // item5.id = item4.id
+        //                         // item5.id = item4.id
-                                item5.children.forEach((item6: any) => {
+        //                         item5.children.forEach((item6: any) => {
-                                    item6.icon = 'el-icon-HelpFilled'
+        //                             item6.icon = 'el-icon-HelpFilled'
-                                    item6.plevel = 4
+        //                             item6.plevel = 4
-                                    if (item6.name == '电网侧' && item6.children.length == 0) {
+        //                             if (item6.name == '电网侧' && item6.children.length == 0) {
-                                        item6.level = 400
+        //                                 item6.level = 400
-                                    } else {
+        //                             } else {
-                                        item6.level = 400
+        //                                 item6.level = 400
-                                    }
+        //                             }
-                                    item6.children.forEach((item7: any) => {
+        //                             item6.children.forEach((item7: any) => {
-                                        item7.icon = 'el-icon-Film'
+        //                                 item7.icon = 'el-icon-Film'
-                                        item7.plevel = item7.level
+        //                                 item7.plevel = item7.level
-                                        item7.level = 400
+        //                                 item7.level = 400
-                                        item7.children.forEach((item8: any) => {
+        //                                 item7.children.forEach((item8: any) => {
-                                            item8.icon = 'el-icon-Collection'
+        //                                     item8.icon = 'el-icon-Collection'
-                                            item8.plevel = item8.level
+        //                                     item8.plevel = item8.level
-                                            item8.level = 500
+        //                                     item8.level = 500
-                                            item8.children.forEach((item9: any) => {
+        //                                     item8.children.forEach((item9: any) => {
-                                                item9.icon = 'el-icon-Share'
+        //                                         item9.icon = 'el-icon-Share'
-                                                item9.plevel = item9.level
+        //                                         item9.plevel = item9.level
-                                                item9.level = 600
+        //                                         item9.level = 600
-                                                item9.children.forEach((item10: any) => {
+        //                                         item9.children.forEach((item10: any) => {
-                                                    item10.icon = 'el-icon-Location'
+        //                                             item10.icon = 'el-icon-Location'
-                                                    item10.plevel = item10.level
+        //                                             item10.plevel = item10.level
-                                                    item10.level = 700
+        //                                             item10.level = 700
-                                                })
+        //                                         })
-                                            })
+        //                                     })
-                                        })
+        //                                 })
-                                    })
+        //                             })
-                                })
+        //                         })
-                            })
+        //                     })
-                        })
+        //                 })
-                    })
+        //             })
-                })
+        //         })
-            })
+        //     })
-        } else {
+        // } else {
             res.data.forEach((item: any) => {
                 item.icon = 'el-icon-Menu'
                 item.plevel = item.level
@@ -129,7 +129,7 @@ const info = (id: any) => {
                     })
                 })
             })
-        }
+        // }
 
         tree.value = res.data
 

src/components/tree/pqs/algorithmTree.vue

@@ -8,7 +8,6 @@
                 style="width: 100%; height: 100%"
                 v-bind="$attrs"
                 default-expand-all
-                
                 @onAddTree="onAddTree"
             />
         </div>
@@ -20,7 +19,6 @@ import { nextTick, onMounted, ref, useAttrs } from 'vue'
 import Tree from '../index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { queryAllAlgorithmLibrary } from '@/api/supervision-boot/database/index'
 defineOptions({
@@ -36,7 +34,7 @@ const tree = ref()
 const treeRef = ref()
 
 const loadData = (id?: any) => {
-    console.log('🚀 ~ loadData ~ id:', id)
+   // console.log('🚀 ~ loadData ~ id:', id)
     let nodeKey = ''
     queryAllAlgorithmLibrary().then(res => {
         res.data.forEach((item: any) => {
@@ -72,8 +70,28 @@ const loadData = (id?: any) => {
 const onAddTree = () => {
     emit('onAddTree')
 }
+const setKey = (id: string) => {
+    treeRef.value.treeRef.setCurrentKey(id)
+    return findNodeById(tree.value, id)
+}
+const findNodeById = (tree1: any, targetId: any) => {
+    for (const node of tree1) {
+        // 1. 当前节点匹配ID，直接返回该节点
+        if (node.id === targetId) {
+            return node
+        }
+        // 2. 当前节点有子节点，递归查找子节点
+        if (node.children && node.children.length > 0) {
+            const result: any = findNodeById(node.children, targetId)
+            // 子节点中找到结果，立即返回（终止递归）
+            if (result) return result
+        }
+    }
+    // 3. 遍历完未找到，返回null
+    return null
+}
 loadData()
-defineExpose({ loadData })
+defineExpose({ loadData, setKey })
 </script>
 <style lang="scss">
 .point-tree {
@@ -85,4 +103,3 @@ defineExpose({ loadData })
     border: 1px solid var(--el-border-color);
 }
 </style>
- 

src/components/tree/pqs/areaTree.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="point-tree">
+        <div style="flex: 1; overflow: hidden">
+            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
+import { useConfig } from '@/stores/config'
+import { getAreaList } from '@/api/common'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
+defineOptions({
+    name: 'pms/pointTree'
+})
+interface Props {
+    showSelect?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    showSelect: true
+})
+const emit = defineEmits(['init'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const tree = ref()
+const treeRef = ref()
+
+const loadData = () => {
+    let nodeKey = ''
+    getAreaList().then(res => {
+        processTreeData(res.data, res.data[0].level)
+        let firstLevel6Node = getDeepestFirstChildData(res.data)
+
+        nodeKey = firstLevel6Node.id
+        emit('init', firstLevel6Node)
+
+        tree.value = res.data
+        if (nodeKey) {
+            nextTick(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+
+                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
+            })
+        }
+    })
+}
+const scrollToNode = (id: string) => {
+    // 树滚动
+    treeRef.value.scrollToNode(id)
+}
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1, alias: string = '') {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+        item.alias = alias + `${item.name}`
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level, level == '-1' ? '' : item.alias + '>')
+        }
+    })
+}
+/**
+ * 递归获取树形结构中一直向下的第一个children的最后一组有效数据
+ * @param {Array} treeData - 原始递归树形数据
+ * @returns {Object|null} 路径最后一组有效数据，无有效数据时返回null
+ */
+function getDeepestFirstChildData(treeData) {
+    // 递归辅助函数：逐层查找第一个children
+    function findDeepestNode(currentNode) {
+        // 检查当前节点是否有有效的children数组
+        if (currentNode && Array.isArray(currentNode.children) && currentNode.children.length > 0) {
+            // 有下一级children，继续递归查找下一级第一个元素
+            return findDeepestNode(currentNode.children[0])
+        }
+        // 没有下一级children，返回当前节点（递归终止）
+        return currentNode
+    }
+
+    // 边界处理：原始数据非数组/空数组时返回null
+    if (!Array.isArray(treeData) || treeData.length === 0) {
+        return null
+    }
+
+    // 从根节点第一个元素开始递归查找
+    return findDeepestNode(treeData[0])
+}
+
+defineExpose({ treeRef, scrollToNode, tree })
+loadData()
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>

src/components/tree/pqs/assessTree.vue

@@ -11,7 +11,6 @@ import { nextTick, onMounted, ref, useAttrs } from 'vue'
 import Tree from '../index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { defineProps } from 'vue'
 import { getTree } from '@/api/advance-boot/assess'

src/components/tree/pqs/bearingTree.vue

@@ -36,6 +36,7 @@ const adminInfo = useAdminInfo()
 const dictData = useDictData()
 const config = useConfig()
 const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
 const tree = ref()
 const treeRef = ref()
 const formData = ref({
@@ -54,6 +55,9 @@ const loadData = () => {
     }) || { code: '' }
     let form = JSON.parse(JSON.stringify(formData.value))
     form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
+    if (VITE_FLAG && form.statisticalType.code == 'Power_Network') {
+        form.statisticalType.deptName = 'qujing'
+    }
     let nodeKey = ''
     getTerminalTreeForFive(form).then(res => {
         console.log(res)
@@ -67,56 +71,62 @@ const loadData = () => {
                 }
             ]
         }
-        res.data.forEach((item: any) => {
+        // if (VITE_FLAG) {
-            item.icon = 'el-icon-HomeFilled'
+        processTreeData(res.data)
-            item.color = config.getColorVal('elementUiPrimary')
+        let firstLevel6Node = findFirstLevel6Node(res.data)
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-CollectionTag'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-Flag'
-                    item3.color = config.getColorVal('elementUiPrimary')
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-OfficeBuilding'
-                        item4.color = config.getColorVal('elementUiPrimary')
-                        item4.children.forEach((item5: anyObj) => {
-                            if (item5.level == 7) {
-                                item5.icon = 'el-icon-DataAnalysis'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                item5.children.forEach((item6: anyObj) => {
-                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
-                                    item6.pid = item4.id
-                                    item6.icon = 'fa-solid fa-location-dot'
-                                    item6.color = config.getColorVal('elementUiPrimary')
-                                    if (item6.comFlag == 0) {
-                                        item6.color = 'red !important'
-                                    } else if (item6.comFlag == 1) {
-                                        item6.color = '#00f93b !important'
-                                    } else if (item6.comFlag == 2) {
-                                        item6.color = '#8c8c8c !important'
-                                    }
-                                })
-                            } else {
-                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
-                                item5.pid = item4.id
-                                item5.icon = 'fa-solid fa-location-dot'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                if (item5.comFlag == 0) {
-                                    item5.color = 'red !important'
-                                } else if (item5.comFlag == 1) {
-                                    item5.color = '#00f93b !important'
-                                } else if (item5.comFlag == 2) {
-                                    item5.color = '#8c8c8c !important'
-                                }
-                            }
-                        })
-                    })
-                })
-            })
-        })
 
-        nodeKey = res.data[0].children[0].children[0].children[0].children[0].id
+        nodeKey = firstLevel6Node.id
-        emit('init', res.data[0].children[0].children[0].children[0].children[0])
+        emit('init', firstLevel6Node)
+        // res.data.forEach((item: any) => {
+        //     item.icon = 'el-icon-HomeFilled'
+        //     item.color = config.getColorVal('elementUiPrimary')
+        //     item.children.forEach((item2: any) => {
+        //         item2.icon = 'el-icon-CollectionTag'
+        //         item2.color = config.getColorVal('elementUiPrimary')
+        //         item2.children.forEach((item3: any) => {
+        //             item3.icon = 'el-icon-Flag'
+        //             item3.color = config.getColorVal('elementUiPrimary')
+        //             item3.children.forEach((item4: any) => {
+        //                 item4.icon = 'el-icon-OfficeBuilding'
+        //                 item4.color = config.getColorVal('elementUiPrimary')
+        //                 item4.children.forEach((item5: anyObj) => {
+        //                     if (item5.level == 7) {
+        //                         item5.icon = 'el-icon-DataAnalysis'
+        //                         item5.color = config.getColorVal('elementUiPrimary')
+        //                         item5.children.forEach((item6: anyObj) => {
+        //                             item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
+        //                             item6.pid = item4.id
+        //                             item6.icon = 'fa-solid fa-location-dot'
+        //                             item6.color = config.getColorVal('elementUiPrimary')
+        //                             if (item6.comFlag == 0) {
+        //                                 item6.color = 'red !important'
+        //                             } else if (item6.comFlag == 1) {
+        //                                 item6.color = '#00f93b !important'
+        //                             } else if (item6.comFlag == 2) {
+        //                                 item6.color = '#8c8c8c !important'
+        //                             }
+        //                         })
+        //                     } else {
+        //                         item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
+        //                         item5.pid = item4.id
+        //                         item5.icon = 'fa-solid fa-location-dot'
+        //                         item5.color = config.getColorVal('elementUiPrimary')
+        //                         if (item5.comFlag == 0) {
+        //                             item5.color = 'red !important'
+        //                         } else if (item5.comFlag == 1) {
+        //                             item5.color = '#00f93b !important'
+        //                         } else if (item5.comFlag == 2) {
+        //                             item5.color = '#8c8c8c !important'
+        //                         }
+        //                     }
+        //                 })
+        //             })
+        //         })
+        //     })
+        // })
+
+        // nodeKey = res.data[0].children[0].children[0].children[0].children[0].id
+        // emit('init', res.data[0].children[0].children[0].children[0].children[0])
 
         tree.value = res.data
         if (nodeKey) {
@@ -127,9 +137,113 @@ const loadData = () => {
         }
     })
 }
+
 const setKey = (key: string) => {
     treeRef.value.treeRef.setCurrentKey(key)
 }
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1) {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level)
+        }
+    })
+}
+/**
+ * 递归查找树形结构中第一个level===6的节点（找到即终止递归）
+ * @param {Object|Array} tree - 树形数据（根节点数组 或 单个根节点）
+ * @returns {Object|null} 第一个level为6的节点，无则返回null
+ */
+function findFirstLevel6Node(tree: any) {
+    // 统一处理入参：如果是数组，遍历根节点数组（按顺序找第一个符合条件的）
+    if (Array.isArray(tree)) {
+        for (const rootNode of tree) {
+            const result = traverse(rootNode)
+            // 找到第一个匹配节点，立即返回（终止根节点遍历）
+            if (result) return result
+        }
+        // 所有根节点遍历完未找到
+        return null
+    } else {
+        // 入参是单个节点，直接递归遍历
+        return traverse(tree)
+    }
+
+    // 核心递归遍历函数
+    function traverse(node) {
+        // 终止条件1：节点不存在，返回null
+        if (!node) return null
+
+        // 终止条件2：找到level===6的节点，立即返回（终止递归）
+        if (node.level === 6) {
+            return node
+        }
+
+        // 终止条件3：节点无children，返回null
+        if (!node.children || node.children.length === 0) {
+            return null
+        }
+
+        // 按顺序遍历当前节点的子节点
+        for (const child of node.children) {
+            const foundNode = traverse(child)
+            // 子节点中找到目标节点，立即返回（终止后续子节点遍历）
+            if (foundNode) {
+                return foundNode
+            }
+        }
+
+        // 当前节点及所有子节点都无匹配，返回null
+        return null
+    }
+}
+
 defineExpose({ setKey })
 loadData()
 </script>

src/components/tree/pqs/index.vue

@@ -11,7 +11,7 @@
         />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
-                <el-input v-model="filterText" placeholder="请输入内容" clearable>
+                <el-input v-model="filterText" placeholder="请输入内容" maxlength="10" show-word-limit clearable>
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>

src/components/tree/pqs/pointTree.vue

@@ -28,6 +28,7 @@ import { useDictData } from '@/stores/dictData'
 import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { defineProps } from 'vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
 defineOptions({
     name: 'pms/pointTree'
 })
@@ -61,6 +62,9 @@ const loadData = () => {
     }) || { code: '' }
     let form = JSON.parse(JSON.stringify(formData.value))
     form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
+    if (VITE_FLAG && form.statisticalType.code == 'Power_Network') {
+        form.statisticalType.deptName = 'qujing'
+    }
     let nodeKey = ''
     getTerminalTreeForFive(form).then(res => {
         //console.log('---',res)
@@ -74,62 +78,71 @@ const loadData = () => {
                 }
             ]
         }
-        res.data.forEach((item: any) => {
+        // if (VITE_FLAG) {
-            item.icon = 'el-icon-HomeFilled'
+        processTreeData(res.data)
-            item.color = config.getColorVal('elementUiPrimary')
+        let firstLevel6Node = findFirstLevel6Node(res.data)
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-CollectionTag'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-Flag'
-                    item3.color = config.getColorVal('elementUiPrimary')
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-OfficeBuilding'
-                        item4.color = config.getColorVal('elementUiPrimary')
-                        item4.children.forEach((item5: anyObj) => {
-                            if (item5.level == 7) {
-                                item5.icon = 'el-icon-DataAnalysis'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                item5.children.forEach((item6: anyObj) => {
-                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
-                                    item6.pid = item4.id
-                                    item6.icon = 'fa-solid fa-location-dot'
-                                    item6.color = config.getColorVal('elementUiPrimary')
-                                    if (item6.comFlag == 0) {
-                                        item6.color = 'red !important'
-                                    } else if (item6.comFlag == 1) {
-                                        item6.color = '#00f93b !important'
-                                    } else if (item6.comFlag == 2) {
-                                        item6.color = '#8c8c8c !important'
-                                    }
-                                })
-                            } else {
-                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
-                                item5.pid = item4.id
-                                item5.icon = 'fa-solid fa-location-dot'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                if (item5.comFlag == 0) {
-                                    item5.color = 'red !important'
-                                } else if (item5.comFlag == 1) {
-                                    item5.color = '#00f93b !important'
-                                } else if (item5.comFlag == 2) {
-                                    item5.color = '#8c8c8c !important'
-                                }
-                            }
-                        })
-                    })
-                })
-            })
-        })
 
-        nodeKey =
+        nodeKey = firstLevel6Node.id
-            res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
+        emit('init', firstLevel6Node)
-            res.data[0].children[0].children[0].children[0].children[0]?.id
+        // } else {
-        emit(
+        //     // 正常树处理
-            'init',
+        //     res.data.forEach((item: any) => {
-            res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
+        //         item.icon = 'el-icon-HomeFilled'
-                res.data[0].children[0].children[0].children[0].children[0]
+        //         item.color = config.getColorVal('elementUiPrimary')
-        )
+        //         item.children.forEach((item2: any) => {
+        //             item2.icon = 'el-icon-CollectionTag'
+        //             item2.color = config.getColorVal('elementUiPrimary')
+        //             item2.children.forEach((item3: any) => {
+        //                 item3.icon = 'el-icon-Flag'
+        //                 item3.color = config.getColorVal('elementUiPrimary')
+        //                 item3.children.forEach((item4: any) => {
+        //                     item4.icon = 'el-icon-OfficeBuilding'
+        //                     item4.color = config.getColorVal('elementUiPrimary')
+        //                     item4.children.forEach((item5: anyObj) => {
+        //                         if (item5.level == 7) {
+        //                             item5.icon = 'el-icon-DataAnalysis'
+        //                             item5.color = config.getColorVal('elementUiPrimary')
+        //                             item5.children.forEach((item6: anyObj) => {
+        //                                 item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
+        //                                 item6.pid = item4.id
+        //                                 item6.icon = 'fa-solid fa-location-dot'
+        //                                 item6.color = config.getColorVal('elementUiPrimary')
+        //                                 if (item6.comFlag == 0) {
+        //                                     item6.color = 'red !important'
+        //                                 } else if (item6.comFlag == 1) {
+        //                                     item6.color = '#00f93b !important'
+        //                                 } else if (item6.comFlag == 2) {
+        //                                     item6.color = '#8c8c8c !important'
+        //                                 }
+        //                             })
+        //                         } else {
+        //                             item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
+        //                             item5.pid = item4.id
+        //                             item5.icon = 'fa-solid fa-location-dot'
+        //                             item5.color = config.getColorVal('elementUiPrimary')
+        //                             if (item5.comFlag == 0) {
+        //                                 item5.color = 'red !important'
+        //                             } else if (item5.comFlag == 1) {
+        //                                 item5.color = '#00f93b !important'
+        //                             } else if (item5.comFlag == 2) {
+        //                                 item5.color = '#8c8c8c !important'
+        //                             }
+        //                         }
+        //                     })
+        //                 })
+        //             })
+        //         })
+        //     })
+
+        //     nodeKey =
+        //         res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
+        //         res.data[0].children[0].children[0].children[0].children[0]?.id
+        //     emit(
+        //         'init',
+        //         res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
+        //             res.data[0].children[0].children[0].children[0].children[0]
+        //     )
+        // }
 
         tree.value = res.data
         if (nodeKey) {
@@ -145,6 +158,109 @@ const scrollToNode = (id: string) => {
     // 树滚动
     treeRef.value.scrollToNode(id)
 }
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1, alias: string = '') {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+        item.alias = alias + `${item.name}`
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level, level == '-1' ? '' : item.alias + '>')
+        }
+    })
+}
+/**
+ * 递归查找树形结构中第一个level===6的节点（找到即终止递归）
+ * @param {Object|Array} tree - 树形数据（根节点数组 或 单个根节点）
+ * @returns {Object|null} 第一个level为6的节点，无则返回null
+ */
+function findFirstLevel6Node(tree: any) {
+    // 统一处理入参：如果是数组，遍历根节点数组（按顺序找第一个符合条件的）
+    if (Array.isArray(tree)) {
+        for (const rootNode of tree) {
+            const result = traverse(rootNode)
+            // 找到第一个匹配节点，立即返回（终止根节点遍历）
+            if (result) return result
+        }
+        // 所有根节点遍历完未找到
+        return null
+    } else {
+        // 入参是单个节点，直接递归遍历
+        return traverse(tree)
+    }
+
+    // 核心递归遍历函数
+    function traverse(node) {
+        // 终止条件1：节点不存在，返回null
+        if (!node) return null
+
+        // 终止条件2：找到level===6的节点，立即返回（终止递归）
+        if (node.level === 6) {
+            return node
+        }
+
+        // 终止条件3：节点无children，返回null
+        if (!node.children || node.children.length === 0) {
+            return null
+        }
+
+        // 按顺序遍历当前节点的子节点
+        for (const child of node.children) {
+            const foundNode = traverse(child)
+            // 子节点中找到目标节点，立即返回（终止后续子节点遍历）
+            if (foundNode) {
+                return foundNode
+            }
+        }
+
+        // 当前节点及所有子节点都无匹配，返回null
+        return null
+    }
+}
+
 defineExpose({ treeRef, scrollToNode, tree })
 loadData()
 </script>

src/components/tree/pqs/standardTree.vue

@@ -28,7 +28,7 @@ const tree = ref()
 const treeRef = ref()
 
 const loadData = (id?: any) => {
-    console.log('🚀 ~ loadData ~ id:', id)
+   
     let nodeKey = ''
     queryAll().then(res => {
         res.data.forEach((item: any) => {

src/layouts/admin/components/globalPopUp.vue

@@ -11,25 +11,25 @@
                     :data="eventList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
                 >
                     <!-- <vxe-column type="seq" width="70px" title="序号"></vxe-column> -->
-                    <vxe-column field="time" width="180px" sortable title="发生时刻"></vxe-column>
+                    <vxe-column field="time" width="180px"       sortable title="暂降发生时刻"></vxe-column>
-                    <vxe-column field="lineName" title="监测点"></vxe-column>
-                    <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
-                    <vxe-column field="powerCompany" title="供电公司" width="100px"></vxe-column>
-                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)">
-                        <template #default="{ row }">
-                            {{ Math.floor(row.persistTime * 1000) / 1000 }}
-                        </template>
-                    </vxe-column>
                     <vxe-column field="eventValue" width="160px" sortable title="暂降(骤升)幅值(%)">
                         <template #default="{ row }">
                             {{ Math.floor(row.eventValue * 10000) / 100 }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="eventType" width="100px" title="暂降类型">
+                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)">
+                        <template #default="{ row }">
+                            {{ Math.floor(row.persistTime * 1000) / 1000 }}
+                        </template>
+                    </vxe-column>
+                    <vxe-column field="eventType" width="100px" title="触发类型">
                         <template #default="{ row }">
                             {{ event.filter(item => item.id == row.eventType)[0]?.name || '/' }}
                         </template>
                     </vxe-column>
+                    <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
+                    <vxe-column field="powerCompany" title="供电公司" width="100px"></vxe-column>
+                    <vxe-column field="lineName" title="监测点"></vxe-column>
                 </vxe-table>
                 <div class="table-pagination mt10">
                     <el-pagination
@@ -50,7 +50,8 @@ import { ref, reactive, onMounted } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
-import MQTT from '@/utils/mqtt'
+// import MQTT from '@/utils/mqtt'
+import socketClient from '@/utils/webSocketClient'
 const dictData = useDictData()
 const event = dictData.getBasicData('Event_Statis')
 import { useAdminInfo } from '@/stores/adminInfo'
@@ -68,37 +69,71 @@ const handleClose = (done: any) => {
     drawer.value = false
     done()
 }
-const init = async () => {
+const dataSocket = reactive({
-    const mqttClient = new MQTT('/sendEvent')
+    socketServe: socketClient.Instance
-    // 设置消息接收回调
+})
-    try {
+// const init = async () => {
-        await mqttClient.init()
+//     const mqttClient = new MQTT('/sendEvent')
+//     // 设置消息接收回调
+//     try {
+//         await mqttClient.init()
 
-        // 订阅主题
+//         // 订阅主题
-        await mqttClient.subscribe()
+//         await mqttClient.subscribe()
-        // 设置消息接收回调
+//         // 设置消息接收回调
-        mqttClient.onMessage((topic, message) => {
+//         mqttClient.onMessage((topic, message) => {
-            const msg = JSON.parse(message.toString())
+//             const msg = JSON.parse(message.toString())
-            console.log('🚀 ~ init ~ msg:', msg)
+//         //    console.log('🚀 ~ init ~ msg:', msg)
-            if (msg.deptList.includes(adminInfo.$state.deptId)) {
+//             if (msg.deptList.includes(adminInfo.$state.deptId)) {
+//                 drawer.value = true
+//                 isLoading.value = true
+//                 eventList.value.unshift(msg)
+//                 setTimeout(() => {
+//                     isLoading.value = false
+//                 }, 500)
+//             }
+//         })
+//     } catch (error) {
+//         // console.error('MQTT 初始化失败:', error)
+//     }
+// }
+const socket = async () => {
+    const url = localStorage.getItem('WebSocketUrl3') || 'null' //'ws://192.168.2.130:10203/event/'
+
+    // const url = 'ws://192.168.1.68:10203/event/'
+
+    await dataSocket.socketServe.connect(`${url}${adminInfo.id}`)
+
+    await dataSocket.socketServe.registerCallBack('message', (res: any) => {
+        if (res.deptList.includes(adminInfo.$state.deptId)) {
             drawer.value = true
             isLoading.value = true
-                eventList.value.unshift(msg)
+            eventList.value.unshift(res)
             setTimeout(() => {
                 isLoading.value = false
             }, 500)
         }
+        // logList.value.push({
+        //     type: res.code == 500 ? 'error' : '',
+        //     time: formatDate(new Date(), 'YYYY-MM-DD hh:mm:ss'),
+        //     name: res.message
+        // })
     })
-    } catch (error) {
-        console.error('MQTT 初始化失败:', error)
-    }
 }
+
+onUnmounted(() => {
+    dataSocket.socketServe?.closeWs()
+})
+
 onMounted(() => {
     // startMqtt('/sendEvent', (topic, message) => {
     //     const msg = JSON.parse(message.toString())
     //     console.log(msg)
     // })
-    init()
+
+    setTimeout(() => {
+        socket()
+    }, 3000)
 })
 defineExpose({
     open,

src/layouts/admin/components/logo.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="layout-logo">
-        <img v-if="!config.layout.menuCollapse" class="logo-img" :src="getTheme.logoUrl" />
+        <img  v-if="!config.layout.menuCollapse && getTheme && getTheme.logoUrl"  class="logo-img" :src="getTheme.logoUrl" />
         <!--        <div-->
         <!--            v-if="!config.layout.menuCollapse"-->
         <!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
@@ -28,7 +28,9 @@ import { Session } from '@/utils/storage'
 import { setNavTabsWidth } from '@/utils/layout'
 
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = window.localStorage.getItem('getTheme') 
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : null
 const onMenuCollapse = function () {
     if (config.layout.shrink && !config.layout.menuCollapse) {
         closeShade()

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

@@ -9,7 +9,7 @@
             />
         </div>
         <span class="nav-bar-title">
-            {{ getTheme.name }}
+            {{ getTheme?.name || '' }}
             <span style="font-size: 14px">({{ Version || 'v1.0.0' }})</span>
             <!-- <span style="font-size: 14px;" v-if="Version?.versionName">
                 ({{ Version?.versionName }})
@@ -28,8 +28,10 @@ import { getLastData } from '@/api/systerm'
 
 const Version: any = ref(null)
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = window.localStorage.getItem('getTheme') 
-
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : { name: '' }
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
         config.setLayout('menuCollapse', true)
@@ -37,10 +39,13 @@ const onMenuCollapse = () => {
     config.setLayout('menuCollapse', false)
 }
 onMounted(() => {
+    if(!VITE_FLAG){
          getLastData({ versionType: 'WEB' }).then(res => {
             Version.value = res.data.versionName
         })
-    document.title = getTheme.name
+    }
+   
+    document.title = getTheme?.name || ''
 })
 </script>
 

src/layouts/admin/components/navMenus.vue

@@ -8,41 +8,14 @@
                     name="el-icon-BellFilled"
                     size="18"
                 />
-                <span class="nav-menu-text" v-if="globalPopUpRef?.eventList.length != 0">
+                <span class="nav-menu-text" v-if="globalPopUpRef?.eventList?.length > 0">
-                    {{ (globalPopUpRef?.eventList.length>99? '99+':globalPopUpRef?.eventList.length)    || 0 }}
+                    {{ globalPopUpRef.eventList.length > 99 ? '99+' : globalPopUpRef.eventList.length }}
                 </span>
             </div>
         </el-tooltip>
-        <!-- <el-tooltip effect="dark" content="截图" placement="bottom">
+
-            <div @click="savePng" class="nav-menu-item">
-                <Icon
-                    :color="configStore.getColorVal('headerBarTabColor')"
-                    class="nav-menu-icon"
-                    name="el-icon-Camera"
-                    size="18"
-                />
-            </div>
-        </el-tooltip>
-        <el-tooltip effect="dark" :content="state.isFullScreen ? '缩小' : '放大'" placement="bottom">
-            <div @click="onFullScreen" class="nav-menu-item" :class="state.isFullScreen ? 'hover' : ''">
-                <Icon
-                    :color="configStore.getColorVal('headerBarTabColor')"
-                    class="nav-menu-icon"
-                    v-if="state.isFullScreen"
-                    name="fa-solid fa-compress"
-                    size="18"
-                />
-                <Icon
-                    :color="configStore.getColorVal('headerBarTabColor')"
-                    class="nav-menu-icon"
-                    v-else
-                    name="fa-solid fa-expand"
-                    size="18"
-                />
-            </div>
-        </el-tooltip> -->
         <el-dropdown style="height: 100%" @command="handleCommand">
-            <div class="admin-info" :class="state.currentNavMenu == 'adminInfo' ? 'hover' : ''">
+            <div class="admin-info" :class="state.currentNavMenu === 'adminInfo' ? 'hover' : ''">
                 <el-avatar :size="25" fit="fill">
                     <img src="@/assets/avatar.png" alt="" />
                 </el-avatar>
@@ -52,97 +25,113 @@
                 <el-dropdown-menu>
                     <el-dropdown-item command="adminInfo">个人资料</el-dropdown-item>
                     <el-dropdown-item command="changePwd">修改密码</el-dropdown-item>
-                    <el-dropdown-item command="layout">退出登录</el-dropdown-item>
+                    <el-dropdown-item command="logout">退出登录</el-dropdown-item>
                 </el-dropdown-menu>
             </template>
         </el-dropdown>
-        <!-- <div @click="configStore.setLayout('showDrawer', true)" class="nav-menu-item">
+
-            <Icon
-                :color="configStore.getColorVal('headerBarTabColor')"
-                class="nav-menu-icon"
-                name="fa fa-cogs"
-                size="18"
-            />
-        </div> -->
         <Config />
         <PopupPwd ref="popupPwd" />
         <AdminInfo ref="popupAdminInfo" />
-        <!-- <TerminalVue /> -->
-        <!-- 全局暂降事件 -->
         <globalPopUp ref="globalPopUpRef" />
     </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
-import screenfull from 'screenfull'
 import { useConfig } from '@/stores/config'
-import { ElMessage } from 'element-plus'
-import Config from './config.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
-import router from '@/router'
+import { useNavTabs } from '@/stores/navTabs'
-import globalPopUp from './globalPopUp.vue'
+import { logout } from '@/api/user-boot/user'
-import { routePush } from '@/utils/router'
+import Config from './config.vue'
-import html2canvas from 'html2canvas'
 import PopupPwd from './popup/password.vue'
 import AdminInfo from './popup/adminInfo.vue'
-import { useNavTabs } from '@/stores/navTabs'
+const { replace } = useRouter()
+// 环境标识
+const IS_LNQR = import.meta.env.VITE_NAME === 'LNqr'
 
 const adminInfo = useAdminInfo()
 const navTabs = useNavTabs()
 const configStore = useConfig()
+
+// 引用
 const popupPwd = ref()
 const popupAdminInfo = ref()
-const state = reactive({
-    isFullScreen: false,
-    currentNavMenu: '',
-    showLayoutDrawer: false,
-    showAdminInfoPopover: false
-})
 const globalPopUpRef = ref()
-const savePng = () => {
+
-    html2canvas(document.body, {
+// 状态
-        scale: 1,
+const state = reactive({
-        useCORS: true
+    currentNavMenu: ''
-    }).then(function (canvas) {
+})
-        var link = document.createElement('a')
+
-        link.href = canvas.toDataURL('image/png')
+// 打开暂降事件
-        link.download = 'screenshot.png'
+const temporaryLandingEvent = () => {
-        link.click()
+    if (globalPopUpRef.value) {
-    })
+        globalPopUpRef.value.open()
-}
-const onFullScreen = () => {
-    if (!screenfull.isEnabled) {
-        ElMessage.warning('layouts.Full screen is not supported')
-        return false
     }
-    screenfull.toggle()
-    screenfull.onchange(() => {
-        state.isFullScreen = screenfull.isFullscreen
-    })
 }
 
-const handleCommand = (key: string) => {
+// 下拉菜单命令
-    console.log(key)
+const handleCommand = async (key: string) => {
     switch (key) {
         case 'adminInfo':
-            popupAdminInfo.value.open()
+            popupAdminInfo.value?.open()
             break
         case 'changePwd':
-            popupPwd.value.open()
+            popupPwd.value?.open()
             break
-        case 'layout':
+        case 'logout':
-            navTabs.closeTabs()
+            await handleLogout()
-            window.localStorage.clear()
-            adminInfo.reset()
-            router.push({ name: 'login' })
-            break
-        default:
             break
     }
 }
-const temporaryLandingEvent = () => {
+
-    globalPopUpRef.value.open()
+// 统一登出逻辑
+const handleLogout = async () => {
+    try {
+        // 1. 调用后端登出接口
+        await logout()
+        console.log('✅ 后端登出成功')
+    } catch (err) {
+        console.error('❌ 登出接口异常', err)
+    } finally {
+        // 2. 清理本地所有数据
+        clearLocalData()
+
+        // 3. LNqr 环境跳 CAS 登出
+        if (IS_LNQR) {
+            redirectToCasLogout()
+        } else {
+            // 普通环境直接跳登录页
+           replace('/login')
+        }
+    }
+}
+
+// 清理本地数据
+const clearLocalData = () => {
+    // 清空 localStorage
+    window.localStorage.clear()
+
+    // 清空用户状态
+    adminInfo.reset()
+
+    // 清空标签页
+    navTabs.closeTabs()
+
+    console.log('✅ 本地数据已全部清空')
+}
+
+// CAS 登出跳转
+const redirectToCasLogout = () => {
+    const casLogoutUrl =
+        'http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/logout?service=http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login?service=http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn'
+    window.location.href = casLogoutUrl
+    // 清 Cookie
+    document.cookie.split(';').forEach(cookie => {
+        const name = cookie.split('=')[0].trim()
+        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`
+    })
 }
 </script>
 
@@ -156,7 +145,6 @@ const temporaryLandingEvent = () => {
     height: 60px;
     display: flex;
     align-items: center;
-    // height: 100%;
     margin-left: auto;
     background-color: v-bind('configStore.getColorVal("headerBarBackground")');
 
@@ -212,37 +200,15 @@ const temporaryLandingEvent = () => {
     }
 }
 
-.dropdown-menu-box :deep(.el-dropdown-menu__item) {
+.nav-menu-text {
-    justify-content: center;
+    position: absolute;
-}
+    top: 13px;
-
+    left: 20px;
-.admin-info-base {
+    font-size: 12px;
-    display: flex;
+    background: #ff0000;
-    justify-content: center;
+    color: #fff;
-    flex-wrap: wrap;
+    border-radius: 5px;
-    padding-top: 10px;
+    padding: 0 3px;
-
-    .admin-info-other {
-        display: block;
-        width: 100%;
-        text-align: center;
-        padding: 10px 0;
-
-        .admin-info-name {
-            font-size: var(--el-font-size-large);
-        }
-    }
-}
-
-.admin-info-footer {
-    padding: 10px 0;
-    margin: 0 -12px -12px -12px;
-    display: flex;
-    justify-content: space-around;
-}
-
-.pt2 {
-    padding-top: 2px;
 }
 
 @keyframes twinkle {
@@ -256,15 +222,4 @@ const temporaryLandingEvent = () => {
         transform: scale(1);
     }
 }
-.nav-menu-text {
-    position: absolute;
-    top: 13px;
-    left:  20px;
-    font-size: 12px;
-    display: inline-block;
-    background-color: #ff0000;
-    color: #fff;
-    border-radius: 5px;
-    padding: 0 3px;
-}
 </style>

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

@@ -28,7 +28,9 @@ 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 navTabs = useNavTabs()
 const adminInfo = useAdminInfo()
 const dialogVisible = ref(false)
 const title = ref('修改密码')
@@ -97,8 +99,14 @@ const submit = () => {
                     id: adminInfo.$state.userIndex,
                     newPassword: form.newPwd
                 }).then((res: any) => {
-                    ElMessage.success('密码修改成功')
+                    ElMessage.success('密码修改成功,请重新登录!')
                     dialogVisible.value = false
+                     setTimeout(() => {
+                    navTabs.closeTabs()
+                    window.localStorage.clear()
+                    adminInfo.reset()
+                    router.push({ name: 'login' })
+                }, 0)
                 })
             })
         }

src/layouts/components/UserInfo/src/components/LockDialog.vue

@@ -29,7 +29,7 @@ const emit = defineEmits(['update:modelValue'])
 const dialogVisible = computed({
   get: () => props.modelValue,
   set: (val) => {
-    console.log('set: ', val)
+ 
     emit('update:modelValue', val)
   }
 })

src/router/index.ts

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

src/stores/config.ts

@@ -110,7 +110,7 @@ export const useConfig = defineStore(
         }
 
         const getColorVal = function (name: keyof Layout): string {
-            const colors = layout[name] as string[]
+            const colors = layout[name] as string[] || ['#082E6C',  '#0e8780']
             if (layout.isDark) {
                 return colors[1]
             } else {

src/stores/monitoringPoint.ts

@@ -29,12 +29,10 @@ export const useMonitoringPoint = defineStore(
         const setShowCheckBox = (val: boolean) => {
             if (val && state.lineIds.length === 0) {
                 state.lineIds = [state.lineId]
-                console.log('====================================')
-                console.log(state.lineIds)
-                console.log('====================================')
             }
             state.showCheckBox = val
         }
+
         return { state, setValue, setShowCheckBox }
     },
     {

src/styles/app.scss

@@ -404,6 +404,11 @@ body,
 .el-select__wrapper {
     height: 32px !important;
 }
+.BMap_center,
+.BMap_top,
+.BMap_bottom {
+    background-color: #fff;
+}
 @font-face {
     font-family: 'AlimamaFangYuanTiVF';
     src: url('../assets/font/ali/AlimamaFangYuanTiVF-Thin.woff') format('woff'),

src/template/table.vue

@@ -75,10 +75,10 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
-            fixed: 'right',
+            
             buttons: [
                 {
                     name: 'edit',

src/utils/chartAxisHelper.ts

@@ -0,0 +1,59 @@
+const AXIS_DECIMALS = 2
+
+export function roundAxisValue(val: number, decimals = AXIS_DECIMALS): number {
+    if (!Number.isFinite(val)) return 0
+    const factor = 10 ** decimals
+    return Math.round(val * factor) / factor
+}
+
+/** Y 轴刻度：最多 2 位小数，末尾 0 去掉（如 1.00 → 1，0.10 → 0.1） */
+export function formatAxisLabel(value: number): string {
+    if (!Number.isFinite(value)) return '0'
+    return String(Number(roundAxisValue(value).toFixed(AXIS_DECIMALS)))
+}
+
+/** 瞬间波形 Y 轴范围 */
+export function calcShuYAxisRange(dataMin: number, dataMax: number): { min: number; max: number } {
+    const min = Number(dataMin)
+    const max = Number(dataMax)
+    if (!Number.isFinite(min) || !Number.isFinite(max)) {
+        return { min: 0, max: 1 }
+    }
+
+    let axisMax = max * 1.1
+    let axisMin = min > 0 ? min - min * 0.1 : min * 1.1
+
+    if (axisMax <= axisMin) {
+        const pad = Math.abs(max) * 0.1 || 0.01
+        axisMax = max + pad
+        axisMin = min - pad
+    }
+
+    return {
+        min: roundAxisValue(axisMin),
+        max: roundAxisValue(axisMax)
+    }
+}
+
+/** RMS 波形 Y 轴范围 */
+export function calcRmsYAxisRange(dataMin: number, dataMax: number): { min: number; max: number } {
+    const min = Number(dataMin)
+    const max = Number(dataMax)
+    if (!Number.isFinite(min) || !Number.isFinite(max)) {
+        return { min: 0, max: 1 }
+    }
+
+    let axisMax = max * 1.06 * 1.1
+    let axisMin = min - min * 0.2
+
+    if (axisMax <= axisMin) {
+        const pad = Math.abs(max - min) * 0.1 || Math.abs(max) * 0.1 || 0.01
+        axisMax = max + pad
+        axisMin = min - pad
+    }
+
+    return {
+        min: roundAxisValue(axisMin),
+        max: roundAxisValue(axisMax)
+    }
+}

src/utils/constantRequest.ts

@@ -7,7 +7,7 @@ export const PROCESS_BOOT = '/process-boot'
 //工作流模块
 export const BPM_BOOT = '/bpm-boot'
 
-//冀北技术监督
+//网公司技术监督
 export const SUPERVISION_BOOT = '/supervision-boot'
 
 //终端模块

src/utils/dictionary.ts

@@ -220,6 +220,57 @@ export const harmonicOptions = [
     { label: '49次', value: 49 },
     { label: '50次', value: 50 }
 ]
+export const harmonicOptions1 = [
+    { label: '2次', value: 2 },
+    { label: '3次', value: 3 },
+    { label: '4次', value: 4 },
+    { label: '5次', value: 5 },
+    { label: '6次', value: 6 },
+    { label: '7次', value: 7 },
+    { label: '8次', value: 8 },
+    { label: '9次', value: 9 },
+    { label: '10次', value: 10 },
+    { label: '11次', value: 11 },
+    { label: '12次', value: 12 },
+    { label: '13次', value: 13 },
+    { label: '14次', value: 14 },
+    { label: '15次', value: 15 },
+    { label: '16次', value: 16 },
+    { label: '17次', value: 17 },
+    { label: '18次', value: 18 },
+    { label: '19次', value: 19 },
+    { label: '20次', value: 20 },
+    { label: '21次', value: 21 },
+    { label: '22次', value: 22 },
+    { label: '23次', value: 23 },
+    { label: '24次', value: 24 },
+    { label: '25次', value: 25 },
+    { label: '26次', value: 26 },
+    { label: '27次', value: 27 },
+    { label: '28次', value: 28 },
+    { label: '29次', value: 29 },
+    { label: '30次', value: 30 },
+    { label: '31次', value: 31 },
+    { label: '32次', value: 32 },
+    { label: '33次', value: 33 },
+    { label: '34次', value: 34 },
+    { label: '35次', value: 35 },
+    { label: '36次', value: 36 },
+    { label: '37次', value: 37 },
+    { label: '38次', value: 38 },
+    { label: '39次', value: 39 },
+    { label: '40次', value: 40 },
+    { label: '41次', value: 41 },
+    { label: '42次', value: 42 },
+    { label: '43次', value: 43 },
+    { label: '44次', value: 44 },
+    { label: '45次', value: 45 },
+    { label: '46次', value: 46 },
+    { label: '47次', value: 47 },
+    { label: '48次', value: 48 },
+    { label: '49次', value: 49 },
+    { label: '50次', value: 50 }
+]
 //简谐波次数
 export const inharmonicOptions = [
     { label: '0.5次', value: 1 },

src/utils/echartMethod.ts

@@ -11,6 +11,7 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
     } else if (value > -1 && value < 0 && isMin == false) {
         return 0
     }
+
     let base
     if (Math.abs(o) >= 100) {
         base = 100
@@ -19,8 +20,11 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
     } else if (Math.abs(o) >= 1) {
         base = 1
     } else {
-        base = 0.1
+        const multiple = 1 / 0.1
+
+        base = Math.ceil(Math.abs(o) * multiple) / multiple
     }
+
     let calculatedValue
     if (isMin) {
         if (value < 0) {
@@ -35,18 +39,19 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
             calculatedValue = value + num * value
         }
     }
+
     if (base === 0.1) {
-        return parseFloat(calculatedValue.toFixed(1))
+        // return parseFloat(calculatedValue.toFixed(1))
+        return Math.ceil(calculatedValue * 10) / 10
     } else if (isMin) {
         return Math.floor(calculatedValue / base) * base
     } else {
         return Math.ceil(calculatedValue / base) * base
     }
 }
-
 // 处理y轴最大最小值
 export const yMethod = (arr: any) => {
-    let num = 0.1
+    let num = 0.2
     let numList = dataProcessing(arr)
     let maxValue = 0
     let minValue = 0
@@ -54,12 +59,9 @@ export const yMethod = (arr: any) => {
     let min = 0
     maxValue = Math.max(...numList)
     minValue = Math.min(...numList)
-    const o = maxValue - minValue
+    const o = maxValue - minValue == 0 ? maxValue : maxValue - minValue
-    if (Math.abs(o) >= 300) {
-        num = 0.02
-    }
-
     min = calculateValue(o, minValue, num, true)
+
     max = calculateValue(o, maxValue, num, false)
     // if (-100 >= minValue) {
     //     min = Math.floor((minValue + num * minValue) / 100) * 100
@@ -158,8 +160,6 @@ export const exportCSV = (title: object, data: any, filename: string) => {
     URL.revokeObjectURL(link.href)
 }
 
-
-
 /**
  * 补全时间序列数据中缺失的条目
  * @param rawData 原始数据，格式为 [["时间字符串", "数值", "单位", "类型"], ...]

src/utils/fileDownLoad.ts

@@ -1,36 +1,52 @@
 import { downloadFile } from '@/api/system-boot/file'
+
+const sanitizeUrl = (url: string): string => {
+    return url.replace(/\[/g, '(').replace(/\]/g, ')')
+}
+
 // 下载文件
 export const download = (urls: string) => {
-    downloadFile({ filePath: urls }).then((res: any) => {
+    //console.log('下载', urls)
-        let blob = new Blob([res], {
+    
-            type: urls.includes('.pdf')
+    downloadFile({ filePath: urls })
-                ? 'application/pdf'
+        .then((res: any) => {
-                : urls.includes('.zip')
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
-                ? 'application/zip'
+            const getFileType = (url: string) => {
-                : urls.includes('.doc')
+                const ext = url.split('.').pop()?.toLowerCase() || ''
-                ? 'application/msword'
+                const mimeMap: Record<string, string> = {
-                : urls.includes('.docx')
+                    pdf: 'application/pdf',
-                ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+                    zip: 'application/zip',
-                : urls.includes('.xls')
+                    doc: 'application/msword',
-                ? 'application/vnd.ms-excel'
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                : urls.includes('.xlsx')
+                    xls: 'application/vnd.ms-excel',
-                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                : urls.includes('.png')
+                    png: 'image/png',
-                ? 'image/png'
+                    jpeg: 'image/jpeg',
-                : urls.includes('.jpeg')
+                    jpg: 'image/jpg'
-                ? 'image/jpeg'
+                }
-                : urls.includes('.jpg')
+                return mimeMap[ext] || ''
-                ? 'image/jpg'
+            }
-                : ''
+          
-        })
+            const blob = new Blob([res], { type: getFileType(urls) })
+         
+            // 2. 提取文件名并保留原生后缀（核心修复点）
+            const fileName = urls.split('/').at(-1) || '下载文件' // 先提取URL最后一段（文件名）
+
+            // 3. 创建下载链接
             const url = window.URL.createObjectURL(blob)
             const link = document.createElement('a')
-        let name = removeLastDotSuffix(urls.split('/')[2])
             link.href = url
-        link.download = name
+            link.download = fileName // 直接使用原文件名（保留后缀）
             document.body.appendChild(link)
             link.click()
+
+            // 4. 清理资源（优化）
             link.remove()
+            window.URL.revokeObjectURL(url) // 释放blob URL
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
         })
 }
 function removeLastDotSuffix(str: string) {
@@ -39,3 +55,37 @@ function removeLastDotSuffix(str: string) {
     // 如果存在 .，截取到 . 之前的部分；否则返回原字符串
     return lastDotIndex !== -1 ? str.slice(0, lastDotIndex) : str
 }
+
+// 预览文件
+export const previewFile = async (urls: any) => {
+    //console.log('预览', urls)
+    let url = ''
+    await downloadFile({ filePath: decodeURI(urls) })
+        .then((res: any) => {           
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
+            const getFileType = (url: string) => {
+                const ext = url.split('.').pop()?.toLowerCase() || ''
+                const mimeMap: Record<string, string> = {
+                    pdf: 'application/pdf',
+                    zip: 'application/zip',
+                    doc: 'application/msword',
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    xls: 'application/vnd.ms-excel',
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    png: 'image/png',
+                    jpeg: 'image/jpeg',
+                    jpg: 'image/jpg'
+                }
+                return mimeMap[ext] || ''
+            }           
+            const blob = new Blob([res], { type: getFileType(decodeURI(urls)) })
+            // 3. 创建下载链接
+            url = window.URL.createObjectURL(blob)
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
+        })
+    //console.log('url', url)
+    return url
+}

src/utils/mqtt.ts

@@ -27,8 +27,8 @@ class MQTT {
         clean: true,
         connectTimeout: 30 * 1000,
         clientId: `mqttjs_${Math.random().toString(16).substr(2, 8)}`,
-        username: 't_user',
+        username: '',
-        password: 'njcnpqs',
+        password: '',
         reconnectPeriod: 1000, // 默认1秒重试一次
         maxReconnectTimes: 3 // 默认最大重连5次
     }
@@ -50,12 +50,16 @@ class MQTT {
         if (this.client) {
             throw new Error('MQTT 客户端已初始化')
         }
-
+        const mqttUrl = localStorage.getItem('MqttUrl')
+        console.log('MQTT URL:', mqttUrl)
+        if (!mqttUrl || mqttUrl === 'null') {
+            return Promise.resolve()
+        }
         try {
-            const mqttUrl =
+            // const mqttUrl =
-                localStorage.getItem('MqttUrl') == 'null'
+            //     localStorage.getItem('MqttUrl') == 'null'
-                    ? 'ws://192.168.1.68:8083/mqtt'
+            //         ? 'ws://192.168.1.68:8083/mqtt'
-                    : localStorage.getItem('MqttUrl')
+            //         : localStorage.getItem('MqttUrl')
 
             this.client = mqtt.connect(mqttUrl, this.defaultOptions as IClientOptions)
             this.setupEventListeners()
@@ -77,12 +81,12 @@ class MQTT {
 
                 this.client?.on('error', error => {
                     clearTimeout(timeout)
-                    console.error('MQTT 连接错误:', error)
+                    console.log('MQTT 连接错误:', error)
                     reject(error)
                 })
             })
         } catch (error) {
-            console.error('初始化 MQTT 失败:', error)
+            // console.log('初始化 MQTT 失败:', error)
             throw error
         }
     }
@@ -131,7 +135,7 @@ class MQTT {
         return new Promise((resolve, reject) => {
             this.client?.subscribe(this.topic, { qos: this.defaultOptions.qos, ...subscribeOptions }, error => {
                 if (error) {
-                    console.error('订阅失败:', error)
+                    console.log('订阅失败:', error)
                     reject(error)
                 } else {
                     console.log('订阅成功')
@@ -153,7 +157,7 @@ class MQTT {
         return new Promise((resolve, reject) => {
             this.client?.unsubscribe(this.topic, error => {
                 if (error) {
-                    console.error('取消订阅失败:', error)
+                    console.log('取消订阅失败:', error)
                     reject(error)
                 } else {
                     console.log('取消订阅成功')
@@ -188,7 +192,7 @@ class MQTT {
         return new Promise((resolve, reject) => {
             this.client?.publish(this.topic, message, { qos: this.defaultOptions.qos, ...options }, error => {
                 if (error) {
-                    console.error('消息发布失败:', error)
+                    console.log('消息发布失败:', error)
                     reject(error)
                 } else {
                     console.log('消息发布成功')

src/utils/request.ts

@@ -1,11 +1,12 @@
 import type { AxiosRequestConfig, Method } from 'axios'
 import axios from 'axios'
 import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
-import { refreshToken } from '@/api/user-boot/user'
+import { lnRefreshToken, lnRefreshTokenTo, refreshToken } from '@/api/user-boot/user'
 import router from '@/router/index'
 import { useAdminInfo } from '@/stores/adminInfo'
-import { debounce } from 'lodash-es';
+import { debounce } from 'lodash-es'
-let loginExpireTimer:any = null
+const IS_LN_VERSION = import.meta.env.VITE_NAME === 'LNqr'
+let loginExpireTimer: any = null
 window.requests = []
 window.tokenRefreshing = false
 const pendingMap = new Map()
@@ -84,7 +85,8 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     config.url == '/system-boot/file/upload' ||
                     config.url == '/harmonic-boot/grid/getAssessOverview' ||
                     config.url == '/system-boot/file/getFileVO' ||
-                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData'
+                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
+                    config.url == '/supervision-boot/userReport/bindAssessmentId'
                 )
             )
                 removePending(config)
@@ -103,11 +105,16 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                 if (token) {
                     ;(config.headers as anyObj).Authorization = token
                 } else {
-                    config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
+                    config.headers.Authorization = 'Basic bmpjbjpuamNucHFz'
                 }
             }
-            if (config.url == '/user-boot/user/generateSm2Key' || config.url == '/pqs-auth/oauth/token') {
+            if (
-                config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
+                config.url == '/user-boot/user/generateSm2Key' ||
+                config.url == '/pqs-auth/oauth/token' ||
+                config.url == '/pqs-auth/oauth/lnLogin'||
+                config.url == '/pqs-auth/oauth/lnRefreshToken'
+            ) {
+                config.headers.Authorization = 'Basic bmpjbjpuamNucHFz'
             }
 
             return config
@@ -141,15 +148,35 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                 if (!window.tokenRefreshing) {
                     window.tokenRefreshing = true
 
+                    if(IS_LN_VERSION){
+                        //辽宁版本
+                        return lnRefreshTokenTo().then(res => {
+                            adminInfo.setToken(res.data.access_token, 'auth')
+                            adminInfo.setToken(res.data.refresh_token, 'refresh')
+                            window.requests.forEach(cb => cb(res.data.access_token))
+                            window.requests = []
+
+                            return Axios(response.config)
+                        }).catch(err => {
+                            // refresh_token + CAS 都过期 → 重新走CAS登录
+                            window.location.href = '/api/pqs-auth/oauth/lnCheck'
+                            return Promise.reject(err)
+                            }).finally(() => {
+                                window.tokenRefreshing = false
+                            })
+                    }else {
+                        //通用版本
                         return refreshToken()
                             .then(res => {
                                 adminInfo.setToken(res.data.access_token, 'auth')
+                                adminInfo.setToken(res.data.refresh_token, 'refresh')
                                 window.requests.forEach(cb => cb(res.data.access_token))
                                 window.requests = []
 
                                 return Axios(response.config)
                             })
                             .catch(err => {
+                                window.location.reload()
                                 adminInfo.removeToken()
                                 router.push({ name: 'login' })
                                 return Promise.reject(err)
@@ -157,6 +184,8 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                             .finally(() => {
                                 window.tokenRefreshing = false
                             })
+                    }
+
                 } else {
                     return new Promise(resolve => {
                         // 用函数形式将 resolve 存入，等待刷新后再执行
@@ -181,6 +210,13 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     router.push({ name: 'login' })
                     loginExpireTimer = null // 执行后清空定时器
                 }, 100) // 可根据实际情况调整延迟时间
+                return Promise.reject(response.data)
+            }  else if (response.data.code == 'A0121') {
+                //统一认证过期
+                const casLogoutUrl =
+                    'http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login?service=http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn'
+                window.location.href = casLogoutUrl
+
                 return Promise.reject(response.data)
             } else {
                 if (options.showCodeMessage) {

src/utils/tableStore.ts

@@ -19,7 +19,7 @@ interface TableStoreParams {
     publicHeight?: number //计算高度
     resetCallback?: () => void // 重置
     loadCallback?: () => void // 接口调用后的回调
-    exportProcessingData?:() => void //导出处理数据
+    exportProcessingData?: () => void //导出处理数据
     beforeSearchFun?: () => void // 接口调用前的回调
 }
 
@@ -45,8 +45,9 @@ export default class TableStore {
             pageNum: 1,
             pageSize: 20
         },
-        filename:null,
+        filename: null,
         loading: true,
+        exportLoading: false,
         column: [],
         loadCallback: null,
         exportProcessingData: null,
@@ -76,6 +77,7 @@ export default class TableStore {
     }
 
     index() {
+   
         this.table.beforeSearchFun && this.table.beforeSearchFun()
         this.table.data = []
         this.table.loading = true
@@ -84,13 +86,11 @@ export default class TableStore {
             this.initData = JSON.parse(JSON.stringify(this.table.params))
         }
         if (!this.timeAll) {
-            delete this.table.params.startTime;
+            delete this.table.params.startTime
-            delete this.table.params.endTime;
+            delete this.table.params.endTime
-            delete this.table.params.searchBeginTime;
+            delete this.table.params.searchBeginTime
-            delete this.table.params.searchEndTime;
+            delete this.table.params.searchEndTime
-            delete this.table.params.timeFlag;
+            delete this.table.params.timeFlag
-
-      
         }
         createAxios(
             Object.assign(
@@ -98,10 +98,12 @@ export default class TableStore {
                     url: this.url,
                     method: this.method
                 },
+          
                 requestPayload(this.method, this.table.params, this.paramsPOST)
             )
         )
             .then((res: any) => {
+              
                 if (res.data) {
                     this.table.data = res.data.records || res.data
                     this.table.total = res.data?.total || res.data.length || 0
@@ -135,8 +137,10 @@ export default class TableStore {
             [
                 'search',
                 () => {
+             
                     this.table.params.pageNum = 1
                     this.index()
+                   
                 }
             ],
             [
@@ -202,8 +206,10 @@ export default class TableStore {
             [
                 'export',
                 () => {
+                   
+                     this.table.exportLoading = true
                     // this.index()
-                    console.log('export')
+             
                     let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
                     createAxios(
                         Object.assign(
@@ -213,11 +219,16 @@ export default class TableStore {
                             },
                             requestPayload(this.method, params, this.paramsPOST)
                         )
-                    ).then(res => {
+                    )
+                        .then(res => {
                             this.table.allData = filtration(res.data.records || res.data)
-                        console.log('11111',this.table.allData)
                             this.table.exportProcessingData && this.table.exportProcessingData()
                             this.table.allFlag = data.showAllFlag || true
+                            this.table.exportLoading = false
+                           
+                        })
+                        .catch(() => {
+                            this.table.exportLoading = false
                         })
                 }
             ]

src/utils/tree.ts

@@ -147,7 +147,39 @@ export const filter = <T = any>(
 
   return listFilter(tree)
 }
+export const filterTree = <T = any>(
+  tree: T[],
+  func: (n: T) => boolean,
+  config: Partial<TreeHelperConfig> = {}
+): T[] => {
+  config = getConfig(config)
+  const children = config.children as string
 
+  function listFilter(list: T[]) {
+    return list
+      .map((node: any) => ({ ...node }))
+      .filter((node) => {
+        // 1. 如果当前节点匹配 → 直接保留【所有子节点】，不再过滤下级
+        if (func(node)) {
+          return true;
+        }
+        
+        // 2. 如果当前节点不匹配，递归过滤子节点
+        if (node[children]) {
+          const filteredChildren = listFilter(node[children]);
+          if (filteredChildren.length > 0) {
+            node[children] = filteredChildren;
+            return true;
+          }
+        }
+        
+        // 3. 都不匹配，过滤掉
+        return false;
+      })
+  }
+
+  return listFilter(tree)
+}
 export const forEach = <T = any>(
   tree: T[],
   func: (n: T) => any,

src/utils/waveCache.ts

@@ -0,0 +1,42 @@
+const MAX_CACHE_SIZE = 30
+
+const cache = new Map<string, unknown>()
+
+function dataFingerprint(data: unknown[][] | undefined): string {
+    if (!data?.length) return '0'
+    const first = data[0]
+    const last = data[data.length - 1]
+    return `${data.length}:${first?.[0]}:${last?.[0]}`
+}
+
+export function buildWaveCacheKey(
+    type: 'shu' | 'rms',
+    wp: Record<string, any> | undefined,
+    value: number,
+    isOpen: boolean,
+    boxoList: Record<string, any>
+): string {
+    if (!wp) return ''
+    const waveFp =
+        type === 'shu' ? dataFingerprint(wp.listWaveData) : dataFingerprint(wp.listRmsData)
+    const boxoFp = boxoList?.startTime ?? boxoList?.lineName ?? boxoList?.equipmentName ?? ''
+    return `${type}|${wp.time}|${wp.waveType}|${wp.iphasic}|${value}|${isOpen}|${waveFp}|${boxoFp}`
+}
+
+export function getWaveCache<T>(key: string): T | null {
+    if (!key || !cache.has(key)) return null
+    const value = cache.get(key) as T
+    cache.delete(key)
+    cache.set(key, value)
+    return value
+}
+
+export function setWaveCache(key: string, value: unknown): void {
+    if (!key) return
+    if (cache.has(key)) cache.delete(key)
+    cache.set(key, value)
+    while (cache.size > MAX_CACHE_SIZE) {
+        const oldest = cache.keys().next().value
+        if (oldest !== undefined) cache.delete(oldest)
+    }
+}

src/utils/waveWorkerPool.ts

@@ -0,0 +1,96 @@
+import { toRaw } from 'vue'
+
+type WorkerMessageHandler = (data: any) => void
+
+let shuWorker: Worker | null = null
+let rmsWorker: Worker | null = null
+
+/** 递归剥离 Vue 响应式代理，得到可 structuredClone 的纯对象 */
+export function toPlainDeep<T>(value: T): T {
+    const raw = toRaw(value as object) as T
+    if (Array.isArray(raw)) {
+        return raw.map(item => toPlainDeep(item)) as T
+    }
+    if (raw !== null && typeof raw === 'object') {
+        const out: Record<string, unknown> = {}
+        for (const [key, val] of Object.entries(raw)) {
+            out[key] = toPlainDeep(val)
+        }
+        return out as T
+    }
+    return raw
+}
+
+const BOXO_LIST_KEYS = [
+    'systemType',
+    'powerStationName',
+    'measurementPointName',
+    'startTime',
+    'featureAmplitude',
+    'duration',
+    'engineeringName',
+    'equipmentName',
+    'evtParamVVaDepth',
+    'evtParamTm',
+    'lineName',
+    'persistTime',
+    'subName'
+] as const
+
+export function buildWorkerPayload(
+    type: 'shu' | 'rms',
+    wp: Record<string, any>,
+    boxoList: Record<string, any>,
+    extras: { requestId: number; value: number; isOpen: boolean; iphasic?: number }
+) {
+    const plainWp = toPlainDeep(wp)
+    const wpPayload: Record<string, unknown> = {
+        pt: plainWp.pt,
+        ct: plainWp.ct,
+        waveTitle: plainWp.waveTitle,
+        iphasic: plainWp.iphasic,
+        time: plainWp.time,
+        waveType: plainWp.waveType,
+        yzd: plainWp.yzd
+    }
+    if (type === 'shu') {
+        wpPayload.listWaveData = plainWp.listWaveData
+    } else {
+        wpPayload.listRmsData = plainWp.listRmsData
+    }
+
+    const plainBoxo: Record<string, unknown> = {}
+    const rawBoxo = toPlainDeep(boxoList)
+    for (const key of BOXO_LIST_KEYS) {
+        if (rawBoxo[key] !== undefined) {
+            plainBoxo[key] = rawBoxo[key]
+        }
+    }
+
+    return {
+        requestId: extras.requestId,
+        value: extras.value,
+        isOpen: extras.isOpen,
+        iphasic: extras.iphasic,
+        wp: wpPayload,
+        boxoList: plainBoxo
+    }
+}
+
+export function getShuWorker(onMessage: WorkerMessageHandler): Worker {
+    if (!shuWorker) {
+        shuWorker = new Worker(new URL('../components/echarts/shuWorker.js', import.meta.url))
+    }
+    shuWorker.onmessage = e => onMessage(e.data)
+    shuWorker.onerror = error => console.error('Shu worker error:', error)
+    return shuWorker
+}
+
+export function getRmsWorker(onMessage: WorkerMessageHandler): Worker {
+    if (!rmsWorker) {
+        rmsWorker = new Worker(new URL('../components/echarts/rmsWorker.js', import.meta.url))
+    }
+    rmsWorker.onmessage = e => onMessage(e.data)
+    rmsWorker.onerror = error => console.error('Rms worker error:', error)
+    return rmsWorker
+}

src/utils/webSocketClient.ts

@@ -44,12 +44,10 @@ export default class SocketService {
             return
         }
         
+        console.log("🚀 ~ SocketService ~ connect ~ url:", url)
+       if (url === null || (typeof url === 'string' && url.includes('null'))) return;
+
         setTimeout(() => {
-            // ws://192.168.1.69:10407/mgtt
-            // const url =
-            //     (localStorage.getItem('WebSocketUrl') == 'null'
-            //         ? 'ws://192.168.1.130:10405'
-            //         : localStorage.getItem('WebSocketUrl')) + id
             this.ws = new WebSocket(url)
 
             this.ws.onopen = () => this.handleOpen()
@@ -58,10 +56,9 @@ export default class SocketService {
             this.ws.onmessage = event => this.handleMessage(event)
         }, 0)
     }
-
     // 处理连接成功事件
     private handleOpen(): void {
-        ElMessage.success('webSocket连接服务端成功了')
+        // ElMessage.success('webSocket连接服务端成功了')
         console.log('连接服务端成功了')
         this.connected = true
         this.connectRetryCount = 0
@@ -90,7 +87,7 @@ export default class SocketService {
 
         if (event.data == '连接成功') {
             this.sendHeartbeat()
-        } else if (event.data == 'connect') {
+        } else if (event.data == 'over') {
         } else if (event.data.length > 10) {
             let message: MessageType
             try {
@@ -104,7 +101,7 @@ export default class SocketService {
 
             // 通过接受服务端发送的type字段来回调函数
 
-            if ((message.key || message.code) && this.callBackMapping['message']) {
+            if ((message.key || message.code || message.time) && this.callBackMapping['message']) {
                 this.callBackMapping['message']!(message)
             } else {
                 console.log('抛弃====>')
@@ -112,7 +109,8 @@ export default class SocketService {
                 // 丢弃或继续写你的逻辑
             }
         } else {
-            ElMessage.error(event.data)
+            this.callBackMapping['message']!({ Flag: false })
+            // ElMessage.error(event.data)
         }
     }
 

src/views/LN/newEnergy/highAndLowPressure/index.vue

@@ -50,12 +50,12 @@
                                     min-width="150px"
                                     show-overflow-tooltip
                                 ></vxe-column>
-                                <vxe-column field="startTime" title="暂降发生时刻" min-width="150px"></vxe-column>
+                                <vxe-column field="startTime" title="暂降发生时刻" min-width="180px" sortable></vxe-column>
                                 <vxe-column
                                     field="featureAmplitude"
                                     title="暂降(骤升)幅值(%)"
                                     sortable
-                                    min-width="150px"
+                                    min-width="160px"
                                 ></vxe-column>
                                 <vxe-column
                                     field="advanceReason"

src/views/LN/newEnergy/newEnergyAnalysis/index.vue

@@ -301,7 +301,7 @@ const options1 = [
 const height = mainHeight(20)
 const heightB = mainHeight(448)
 const heightA = mainHeight(180)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
@@ -786,7 +786,7 @@ onMounted(() => {
 })
 
 const handleNodeClick = (data: any, node: any) => {
-    console.log('🚀 ~ handleNodeClick ~ data:', data)
+    //console.log('🚀 ~ handleNodeClick ~ data:', data)
     if (data.level == 6) {
         dotList.value = data
         // dotList.value.id = '6469e77fda42db12c7ca6620a092f03c1'

src/views/LN/newEnergy/newEnergyAnalysis/test.vue

@@ -321,7 +321,7 @@ const options1 = [
 ]
 const height = mainHeight(20)
 const heightB = mainHeight(445)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
@@ -757,7 +757,7 @@ const timeClick = (row: any) => {
 }
 // 点击越限
 const detailClick = (row: any, title: string, key: string) => {
-    console.log('🚀 ~ detailClick ~ row:', row)
+   // console.log('🚀 ~ detailClick ~ row:', row)
     detailRef.value.open({
         row: row,
         title: title,
@@ -802,7 +802,7 @@ onMounted(() => {
 })
 
 const handleNodeClick = (data: any, node: any) => {
-    console.log('🚀 ~ handleNodeClick ~ data:', data)
+   // console.log('🚀 ~ handleNodeClick ~ data:', data)
     if (data.level == 6) {
         dotList.value = data
         // dotList.value.id = '6469e77fda42db12c7ca6620a092f03c1'

src/views/LN/newEnergy/newEnergyLedger/index.vue

@@ -64,10 +64,10 @@ const tableStore = new TableStore({
         { field: 'longitude', title: '经度' },
         { field: 'latitude', title: '纬度' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+          
             buttons: [
                 {
                     name: 'edit',

src/views/dashboard/index.vue

@@ -38,6 +38,7 @@ const tableStore = new TableStore({
         echarts.value.Grade(tableStore.table.data.voltageStatistics)
         echarts.value.Relation(tableStore.table.data.monthlyStatistics)
         table.value.info(tableStore.table.data)
+    
     }
 })
 provide('tableStore', tableStore)

src/views/pqs/auditManage/auditList/index.vue

@@ -90,7 +90,6 @@ const loading = ref(false)
 const statistics = ref()
 
 const flg = ref(true)
-const showMqtt = ref(false)
 const zoom = ref('') //图表焦点校验
 
 const resultList = ref([