提交代码

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

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,7 +129,7 @@ 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
     })
@@ -206,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,6 +7,17 @@ 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) {
@@ -14,5 +26,35 @@ export function areaHarmonicReport(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
+        }
     })
 }
+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

@@ -31,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/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'])

src/components/echarts/MyEchartMap.vue

@@ -34,7 +34,6 @@ const fetchConfig = async (name: string) => {
 // fetchConfig()
 
 const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
-onMounted(() => {})
 
 const GetEchar = async (name: string) => {
     let chartDom = document.getElementById('chartMap')
@@ -44,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',
@@ -99,6 +99,7 @@ const GetEchar = async (name: string) => {
             // top: 10,
             //    bottom: 0,
             roam: true,
+             
             label: {
                 normal: {
                     show: true,
@@ -178,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%"
-                        header-cell-class-name="table_header">
-                        <el-table-column align="center" prop="number" label="事件段"></el-table-column>
-                        <el-table-column align="center" prop="number" label="波形起始点相位(°)">
-                            <el-table-column align="center" prop="number" label="A相"></el-table-column>
-                            <el-table-column align="center" prop="number" label="B相"></el-table-column>
-                            <el-table-column align="center" prop="number" label="C相"></el-table-column>
-                        </el-table-column>
-                        <el-table-column align="center" prop="number" label="跳变段电压变化率(V/ms)">
-                            <el-table-column align="center" prop="number" label="A相"></el-table-column>
-                            <el-table-column align="center" prop="number" label="B相"></el-table-column>
-                            <el-table-column align="center" prop="number" label="C相"></el-table-column>
-                        </el-table-column>
-                        <el-table-column align="center" prop="number" label="相位跳变(°)">
-                            <el-table-column align="center" prop="number" label="A相"></el-table-column>
-                            <el-table-column align="center" prop="number" label="B相"></el-table-column>
-                            <el-table-column align="center" prop="number" label="C相"></el-table-column>
-                        </el-table-column>
-                        <el-table-column align="center" prop="number" label="总分段数目"></el-table-column>
-                        <el-table-column align="center" prop="number" label="三相电压不平衡度(%)" width="180"></el-table-column>
-                        <el-table-column align="center" prop="number" label="暂降类型"></el-table-column>
-                        <el-table-column align="center" prop="number" label="暂降原因"></el-table-column>
-                    </el-table>
+                    <vxe-table
+                        stripe
+                        :data="Data"
+                        :height="height"
+                        border
+                        style="width: 100%"
+                        header-cell-class-name="table_header"
+                    >
+                        <vxe-column align="center" field="number" title="事件段"></vxe-column>
+                        <vxe-colgroup align="center" field="number1" title="波形起始点相位(°)">
+                            <vxe-column align="center" field="number2" title="A相"></vxe-column>
+                            <vxe-column align="center" field="number3" title="B相"></vxe-column>
+                            <vxe-column align="center" field="number4" title="C相"></vxe-column>
+                        </vxe-colgroup>
+                        <vxe-colgroup align="center" field="number" title="跳变段电压变化率(V/ms)">
+                            <vxe-column align="center" field="number5" title="A相"></vxe-column>
+                            <vxe-column align="center" field="number6" title="B相"></vxe-column>
+                            <vxe-column align="center" field="number7" title="C相"></vxe-column>
+                        </vxe-colgroup>
+                        <vxe-colgroup align="center" field="number" title="相位跳变(°)">
+                            <vxe-column align="center" field="number8" title="A相"></vxe-column>
+                            <vxe-column align="center" field="number9" title="B相"></vxe-column>
+                            <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/rmsboxi.vue

@@ -972,7 +972,7 @@ export default {
             align: "left",
           },
           textStyle: {
-            fontSize: "0.8rem",
+            fontSize: "16",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
           },
         },
@@ -983,7 +983,7 @@ export default {
           enabled: true,
           itemDistance: 5,
           textStyle: {
-            fontSize: "0.7rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             rich: {
               a: {
@@ -1019,14 +1019,14 @@ export default {
           title: {
             text: "ms",
             textStyle: {
-              fontSize: "0.6rem",
+              fontSize: "12",
               color: _this.DColor ? "#fff" : echartsColor.WordColor,
             },
             enabled: true,
             align: "high",
           },
           nameTextStyle: {
-            fontSize: "0.6rem",
+            fontSize: "12",
           },
           labels: {
             formatter: function () {
@@ -1046,7 +1046,7 @@ export default {
             onZero: false, //-----------重点
           },
           axisLabel: {
-            fontSize: "0.6rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             // interval: 50,
             formatter: function (value, index) {
@@ -1077,7 +1077,7 @@ export default {
           // min: min.toFixed(2),
           opposite: false,
           nameTextStyle: {
-            fontSize: "0.6rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
           },
           //minInterval: 1,
@@ -1090,7 +1090,7 @@ export default {
             onZero: false, //-----------重点
           },
           axisLabel: {
-            fontSize: "0.6rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             formatter: function (value, index) {
               return (value - 0).toFixed(2);
@@ -1395,7 +1395,7 @@ export default {
           left: "center",
           text: titlename,
           textStyle: {
-            fontSize: "0.8rem",
+            fontSize: "16",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
           },
         },
@@ -1406,7 +1406,7 @@ export default {
           enabled: true,
           itemDistance: 5,
           textStyle: {
-            fontSize: "0.7rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             rich: {
               a: {
@@ -1437,7 +1437,7 @@ export default {
           title: {
             text: "ms",
             textStyle: {
-              fontSize: "0.6rem",
+              fontSize: "12",
               color: _this.DColor ? "#fff" : echartsColor.WordColor,
             },
             enabled: true,
@@ -1449,7 +1449,7 @@ export default {
             },
           },
           nameTextStyle: {
-            fontSize: "0.6rem",
+            fontSize: "12",
           },
           splitLine: {
             show: false,
@@ -1464,7 +1464,7 @@ export default {
             onZero: false, //-----------重点
           },
           axisLabel: {
-            fontSize: "0.6rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             // interval: 50,
             formatter: function (value, index) {
@@ -1498,7 +1498,7 @@ export default {
           //   formatter: "{value}",
           // },
           nameTextStyle: {
-            fontSize: "0.6rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
           },
           //minInterval: 1,
@@ -1511,7 +1511,7 @@ export default {
             onZero: false, //-----------重点
           },
           axisLabel: {
-            fontSize: "0.6rem",
+            fontSize: "12",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             formatter: function (value, index) {
               return (value - 0).toFixed(2);

src/components/echarts/shushiboxi.vue

@@ -634,7 +634,7 @@ export default {
                     left: 'center',
                     text:  title,
                     textStyle: {
-                        fontSize: '0.8rem',
+                        fontSize: '16',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor
                     }
                 },
@@ -645,7 +645,7 @@ export default {
                     enabled: true,
                     itemDistance: 5,
                     textStyle: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor,
                         rich: {
                             a: {
@@ -681,7 +681,7 @@ export default {
                     title: {
                         text: 'ms',
                         textStyle: {
-                            fontSize: '0.6rem',
+                            fontSize: '12',
                             color: _this.DColor ? '#fff' : echartsColor.WordColor
                         },
                         enabled: true,
@@ -691,7 +691,7 @@ export default {
                         show: false
                     },
                     nameTextStyle: {
-                        fontSize: '0.6rem'
+                        fontSize: '12'
                     },
                     axisTick: {
                         alignWithLabel: true
@@ -703,7 +703,7 @@ export default {
                         onZero: false //-----------重点
                     },
                     axisLabel: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor,
                         formatter: function (value, index) {
                             if (_this.valA != (value - 0).toFixed(0)) {
@@ -732,7 +732,7 @@ export default {
                     min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
                     opposite: false,
                     nameTextStyle: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor
                     },
                     //minInterval: 1,
@@ -745,7 +745,7 @@ export default {
                         onZero: false //-----------重点
                     },
                     axisLabel: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor,
                         formatter: function (value, index) {
                             return (value - 0).toFixed(2)
@@ -1000,7 +1000,7 @@ export default {
                     left: 'center',
                     text: titlename,
                     textStyle: {
-                        fontSize: '0.8rem',
+                        fontSize: '16',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor
                     }
                 },
@@ -1011,7 +1011,7 @@ export default {
                     enabled: true,
                     itemDistance: 5,
                     textStyle: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor,
                         rich: {
                             a: {
@@ -1042,7 +1042,7 @@ export default {
                     title: {
                         text: 'ms',
                         textStyle: {
-                            fontSize: '0.6rem',
+                            fontSize: '12',
                             color: _this.DColor ? '#fff' : echartsColor.WordColor
                         },
                         enabled: true,
@@ -1061,10 +1061,10 @@ export default {
                         onZero: false //-----------重点
                     },
                     nameTextStyle: {
-                        fontSize: '0.6rem'
+                        fontSize: '12'
                     },
                     axisLabel: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor,
                         formatter: function (value, index) {
                             if (_this.valB != (value - 0).toFixed(0)) {
@@ -1095,7 +1095,7 @@ export default {
                     //   formatter: "{value}",
                     // },
                     nameTextStyle: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor
                     },
                     //minInterval: 1,
@@ -1108,7 +1108,7 @@ export default {
                         onZero: false //-----------重点
                     },
                     axisLabel: {
-                        fontSize: '0.6rem',
+                        fontSize: '12',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor,
                         formatter: function (value, index) {
                             return (value - 0).toFixed(2)

src/components/echarts/waveForm.vue

@@ -16,18 +16,12 @@
                         :value="item.value"
                     ></el-option>
                 </el-select>
-                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary"
-                    @click="AdvancedAnalytics">高级分析</el-button> -->
+                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary" @click="AdvancedAnalytics">
+                    高级分析
+                </el-button> -->
             </el-col>
             <el-col :span="12">
-                <el-button
-                    @click="backbxlb"
-                    class="el-icon-refresh-right"
-                    icon="el-icon-Back"
-                    style="float: right"
-                >
-                    返回
-                </el-button>
+                <el-button @click="backbxlb" icon="el-icon-Back" style="float: right">返回</el-button>
             </el-col>
         </el-row>
         <div v-loading="loading" style="height: calc(100vh - 190px)">
@@ -108,12 +102,12 @@ const options = ref([
 const shushiboxiRef = ref()
 const bxecharts = ref(mainHeight(95).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 +116,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,6 +124,7 @@ const open = async (row: any) => {
         })
         .catch(() => {
             loading.value = false
+            backbxlb()
         })
 }
 const bxhandleClick = (tab: any) => {
@@ -168,10 +164,13 @@ const AdvancedAnalytics = () => {
     analysis({
         eventIndex: boxoList.value.eventId
     }).then(res => {
-        GJList.value = res.data
-        view3.value = true
-        view2.value = false
+        //     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/table/header/index.vue

@@ -23,7 +23,7 @@
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
-                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex"  @change-value="onAreaChange" />
+                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" @change-value="onAreaChange" />
                 </el-form-item>
                 <slot name="select"></slot>
             </el-form>
@@ -81,7 +81,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','areaChange'])
+const emit = defineEmits(['selectChange', 'areaChange'])
 const tableStore = inject('tableStore') as TableStore
 const tableHeader = ref()
 const datePickerRef = ref()
@@ -132,9 +132,8 @@ const headerFormSecondStyleClose = {
     padding: '0'
 }
 
-const onAreaChange = (data) => {
-
-     emit('areaChange', {label: data.label})
+const onAreaChange = data => {
+    emit('areaChange', { label: data.label })
 }
 
 watch(
@@ -142,7 +141,6 @@ watch(
     newVal => {
         setTimeout(() => {
             areaRef.value && areaRef.value.change()
-         
         }, 0)
     }
 )
@@ -238,14 +236,14 @@ 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.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) {
@@ -264,7 +262,6 @@ const setTheDate = (val: any) => {
 }
 // 导出
 const onExport = () => {
-    
     tableStore.onTableAction('export', { showAllFlag: true })
 }
 

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/layouts/admin/components/globalPopUp.vue

@@ -25,7 +25,7 @@
                             {{ Math.floor(row.eventValue * 10000) / 100 }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="eventType" width="100px" title="暂降类型">
+                    <vxe-column field="eventType" width="100px" title="触发类型">
                         <template #default="{ row }">
                             {{ event.filter(item => item.id == row.eventType)[0]?.name || '/' }}
                         </template>
@@ -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,72 @@ const handleClose = (done: any) => {
     drawer.value = false
     done()
 }
-const init = async () => {
-    const mqttClient = new MQTT('/sendEvent')
-    // 设置消息接收回调
-    try {
-        await mqttClient.init()
+const dataSocket = reactive({
+    socketServe: socketClient.Instance
+})
+// const init = async () => {
+//     const mqttClient = new MQTT('/sendEvent')
+//     // 设置消息接收回调
+//     try {
+//         await mqttClient.init()
 
-        // 订阅主题
-        await mqttClient.subscribe()
-        // 设置消息接收回调
-        mqttClient.onMessage((topic, message) => {
-            const msg = JSON.parse(message.toString())
-           // console.log('🚀 ~ init ~ msg:', msg)
-            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)
-    }
+//         // 订阅主题
+//         await mqttClient.subscribe()
+//         // 设置消息接收回调
+//         mqttClient.onMessage((topic, message) => {
+//             const msg = JSON.parse(message.toString())
+//         //    console.log('🚀 ~ init ~ msg:', msg)
+//             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(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
+        // })
+    })
 }
+
+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/navMenus.vue

@@ -122,7 +122,7 @@ const onFullScreen = () => {
     })
 }
 
-const handleCommand = (key: string) => {
+const handleCommand = async(key: string) => {
     console.log(key)
     switch (key) {
         case 'adminInfo':
@@ -132,10 +132,17 @@ const handleCommand = (key: string) => {
             popupPwd.value.open()
             break
         case 'layout':
-            navTabs.closeTabs()
-            window.localStorage.clear()
-            adminInfo.reset()
-            router.push({ name: 'login' })
+              await window.location.reload()
+            setTimeout(() => {
+                navTabs.closeTabs()
+                window.localStorage.clear()
+                adminInfo.reset()
+                router.push({ name: 'login' })
+            }, 0)
+            // navTabs.closeTabs()
+            // window.localStorage.clear()
+            // adminInfo.reset()
+            // router.push({ name: 'login' })
             break
         default:
             break

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/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

@@ -25,14 +25,10 @@ export const useMonitoringPoint = defineStore(
             val: any
         ) => {
             state[key] = val
-           
         }
         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
         }

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/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
-    if (Math.abs(o) >= 300) {
-        num = 0.02
-    }
-
+    const o = maxValue - minValue == 0 ? maxValue : maxValue - minValue
     min = calculateValue(o, minValue, num, true)
+
     max = calculateValue(o, maxValue, num, false)
     // if (-100 >= minValue) {
     //     min = Math.floor((minValue + num * minValue) / 100) * 100
@@ -158,8 +160,6 @@ export const exportCSV = (title: object, data: any, filename: string) => {
     URL.revokeObjectURL(link.href)
 }
 
-
-
 /**
  * 补全时间序列数据中缺失的条目
  * @param rawData 原始数据，格式为 [["时间字符串", "数值", "单位", "类型"], ...]

src/utils/mqtt.ts

@@ -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 =
-                localStorage.getItem('MqttUrl') == 'null'
-                    ? 'ws://192.168.1.68:8083/mqtt'
-                    : localStorage.getItem('MqttUrl')
+            // const mqttUrl =
+            //     localStorage.getItem('MqttUrl') == 'null'
+            //         ? 'ws://192.168.1.68:8083/mqtt'
+            //         : 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

@@ -104,11 +104,11 @@ 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') {
-                config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
+                config.headers.Authorization = 'Basic bmpjbjpuamNucHFz'
             }
 
             return config
@@ -145,12 +145,14 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     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)

src/utils/tableStore.ts

@@ -77,6 +77,7 @@ export default class TableStore {
     }
 
     index() {
+   
         this.table.beforeSearchFun && this.table.beforeSearchFun()
         this.table.data = []
         this.table.loading = true
@@ -97,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
@@ -129,6 +132,7 @@ export default class TableStore {
      * @param data 携带数据
      */
     onTableAction = (event: string, data: anyObj) => {
+      
         const actionFun = new Map([
             [
                 'search',
@@ -136,6 +140,7 @@ export default class TableStore {
              
                     this.table.params.pageNum = 1
                     this.index()
+                   
                 }
             ],
             [
@@ -201,9 +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(

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

@@ -1,3 +1,4 @@
+import { Flag } from '@element-plus/icons-vue/dist/types'
 import { ElMessage, EVENT_CODE } from 'element-plus'
 
 // 定义消息类型，用于类型检查
@@ -43,13 +44,9 @@ export default class SocketService {
             console.log('您的浏览器不支持WebSocket')
             return
         }
+        if (url == 'null' || url == 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()
@@ -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,6 +109,7 @@ export default class SocketService {
                 // 丢弃或继续写你的逻辑
             }
         } else {
+            this.callBackMapping['message']!({ Flag: false })
             ElMessage.error(event.data)
         }
     }

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/userInfo/index.vue

@@ -3,7 +3,7 @@
         <TableHeader datePicker :showReset="false" showExport ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.loginName" placeholder="请输入"></el-input>
+                    <el-input v-model="tableStore.table.params.loginName" placeholder="请输入" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
             </template>
         </TableHeader>

src/views/pqs/bearingCapacity/evaluationList/components/charge.vue

@@ -289,17 +289,20 @@ const equipment = (row: any) => {}
 const assess = () => {
     // vxeRef.value.getRadioRecord()
     
-    if (equipmentList.value.length == null) {
-        return ElMessage.warning('请选择用户')
+    if (equipmentList.value.length == 0) {
+        return ElMessage.warning('请选择有终端设备的用户')
     }
     loading.value = true
     formRef.value.validate((valid: any) => {
+
         if (valid) {
             form.value.devList = equipmentList.value
             carryCapacityEvaluate(form.value).then(res => {
                 rendering(res.data)
                 loading.value = false
             })
+        }else{
+            loading.value = false
         }
     })
 }

src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue

@@ -183,7 +183,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { harmonicOptions } from '@/utils/dictionary'
+import { harmonicOptions1 } from '@/utils/dictionary'
 import { Select } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import {
@@ -202,7 +202,7 @@ import html2canvas from 'html2canvas'
 import { yMethod } from '@/utils/echartMethod'
 import { useDictData } from '@/stores/dictData'
 const props = defineProps(['rowList'])
-const harmonic = harmonicOptions.filter(item => item.value < 26)
+const harmonic = harmonicOptions1.filter(item => item.value < 26)
 const currentLod = ref(false)
 const monitoringPoint = useMonitoringPoint()
 const size = ref(19)
@@ -734,6 +734,7 @@ const choose = (e: any) => {
 
     uploadExcel(e.raw, form).then(res => {
         ElMessage.success('导入成功')
+         onSubmit()
     })
 }
 const tabChange = (e: any) => {
@@ -843,7 +844,7 @@ onMounted(() => {
 }
 .btnBox {
     display: flex;
-    justify-content: end;
+    justify-content: flex-end;
 }
 
 :deep(.vxe-table--header thead tr:first-of-type th:first-of-type) {

src/views/pqs/bearingCapacity/evaluationList/index.vue

@@ -136,7 +136,7 @@ const tableStore: any = new TableStore({
         { field: 'evaluateDate', title: '评估日期' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
@@ -157,7 +157,7 @@ const tableStore: any = new TableStore({
                 },
                 {
                     name: 'del',
-                    text: '禁止接入',
+                    text: '删除',
                     type: 'danger',
                     icon: 'el-icon-Delete',
                     render: 'confirmButton',
@@ -165,11 +165,11 @@ const tableStore: any = new TableStore({
                         confirmButtonText: '确认',
                         cancelButtonText: '取消',
                         confirmButtonType: 'danger',
-                        title: '确定禁止接入？'
+                        title: '确定删除？'
                     },
                     click: row => {
                         remove({ ids: row.id }).then(() => {
-                            ElMessage.success('禁止接入成功')
+                            ElMessage.success('删除成功')
                             tableStore.index()
                         })
                     }

src/views/pqs/bearingCapacity/userManagement/equipment.vue

@@ -157,7 +157,7 @@ defineExpose({ open })
 <style lang="scss" scoped>
 .formBox{
     display: flex;
-    justify-content: end;
+    justify-content: flex-end;
 }
 
 </style>

src/views/pqs/bearingCapacity/userManagement/index.vue

@@ -57,7 +57,13 @@
 
                     <el-form-item label="区域" prop="regionList">
                         <!-- <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" /> -->
-                        <el-cascader v-model="form.regionList" :props="props" :options="areaList"  style="width: 100%"  placeholder="请选择区域" />
+                        <el-cascader
+                            v-model="form.regionList"
+                            :props="props"
+                            :options="areaList"
+                            style="width: 100%"
+                            placeholder="请选择区域"
+                        />
                     </el-form-item>
 
                     <el-form-item label="详细地址：" prop="area">
@@ -95,7 +101,7 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import equipment from './equipment.vue'
 import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
-import { getAreaDept } from '@/api/harmonic-boot/area'
+import { getAreaDept, getAreaDeptRemoveMode } from '@/api/harmonic-boot/area'
 
 defineOptions({
     name: 'estimate/photovoltaic'
@@ -108,8 +114,9 @@ const disabled = ref(false)
 const TableHeaderRef = ref()
 const equipmentRef = ref()
 const title = ref('')
+const VITE_FLAG = import.meta.env.VITE_NAME == 'removeMode'
 //const areaList: any = dictData.areaSelect()
-const areaList = ref([])
+const areaList: any = ref([])
 const userShow: any = ref('Power_Station_Users')
 
 const form = ref({
@@ -188,6 +195,7 @@ const tableStore: any = new TableStore({
         { field: 'createTime', title: '创建日期' },
         {
             title: '操作',
+            fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
@@ -258,9 +266,7 @@ const tableStore: any = new TableStore({
         }
     ],
 
-    loadCallback: () => {
-        console.log(tableStore.table.data)
-    }
+    loadCallback: () => {}
 })
 
 tableStore.table.params.userType = ''
@@ -268,8 +274,6 @@ tableStore.table.params.userType = ''
 provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
-
-
 })
 const useChange = (e: string) => {
     userShow.value = uesrList.filter(item => item.id == e)[0].code
@@ -278,10 +282,14 @@ const useChange = (e: string) => {
 const add = async () => {
     disabled.value = false
     title.value = '新增承载能力待评估用户'
+    if (VITE_FLAG) {
+        areaList.value = dictData.state.areaTree
+    } else {
+        await getAreaDept().then(res => {
+            areaList.value = JSON.parse(JSON.stringify(res.data))
+        })
+    }
 
-    await getAreaDept().then(res => {
-        areaList.value = JSON.parse(JSON.stringify(res.data))
-    })
     dialogVisible.value = true
 }
 // 保存

src/views/pqs/business/log/TerminalLog/index.vue

@@ -8,7 +8,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable />
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
             <template #operation>

src/views/pqs/business/log/frontLog/detail.vue

@@ -4,13 +4,13 @@
         <TableHeader datePicker showExport :showReset="false">
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable />
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
         </TableHeader>
 
         <div :key="key">
-            <Table ref="tableRef" :height="'49vh'"></Table>
+            <Table ref="tableRef" :height="'calc(50vh - 100px)'"></Table>
         </div>
     </el-dialog>
 </template>
@@ -31,10 +31,12 @@ const dialogVisible = ref(false)
 const tableStore = new TableStore({
     url: '/system-boot/frontLog/queryLogCHild',
     method: 'POST',
+    filename: '前置交互日志详情',
     column: [
         {
             field: 'index',
             title: '序号',
+        
             width: '80',
             formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1

src/views/pqs/business/log/frontLog/index.vue

@@ -3,7 +3,7 @@
         <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable />
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
         </TableHeader>
@@ -77,7 +77,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

src/views/pqs/business/terminal/FrontManagement/index.vue

@@ -40,7 +40,14 @@
                 ></Table>
             </div>
             <div class="pd10" style="width: 400px" v-loading="loading">
-                <el-input v-model="filterText" placeholder="请输入内容" clearable show-word-limit @input="change">
+                <el-input
+                    v-model="filterText"
+                    placeholder="请输入内容"
+                    clearable
+                    maxlength="32"
+                    show-word-limit
+                    @input="change"
+                >
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
@@ -83,7 +90,7 @@
                                     v-else
                                     class="box-item"
                                     title="确定重启吗？"
-                                    placement="bottom"
+                                    placement="left"
                                     @confirm="restart(data)"
                                 >
                                     <template #actions="{ confirm, cancel }">
@@ -141,7 +148,7 @@
                 </el-form-item>
                 <el-form-item label="最大终端数:" prop="nodeDevNum" class="top">
                     <el-input
-                        v-model="formData.nodeDevNum"
+                        v-model.trim.number="formData.nodeDevNum"
                         onkeyup="value = value.replace(/[^0-9]/g,'')"
                         maxlength="5"
                         placeholder="请输入最大终端数"
@@ -149,7 +156,7 @@
                 </el-form-item>
                 <el-form-item label="最大进程数:" prop="maxProcessNum" class="top">
                     <el-input
-                        v-model="formData.maxProcessNum"
+                        v-model.trim.number="formData.maxProcessNum"
                         onkeyup="value = value.replace(/[^0-9]/g,'')"
                         maxlength="5"
                         placeholder="请根据监测点规模填写合适进程数（1个进程最大可承载200个监测点）"
@@ -209,7 +216,8 @@ import {
     updateNode,
     nodeDeviceTree,
     updateDeviceProcess,
-    askRestartProcess
+    askRestartProcess,
+    allotTerminal
 } from '@/api/device-boot/Business'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -240,6 +248,7 @@ const tableRef = ref()
 const processNo = ref('')
 const ruleFormRef = ref()
 const dataSource: any = ref([])
+const deviceInfoList: any = ref([])
 const defaultProps = {
     children: 'deviceInfoList',
     label: 'name'
@@ -271,7 +280,7 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '名称', field: 'name' },
-        { title: 'IP', field: 'ip' ,width:'120px' },
+        { title: 'IP', field: 'ip', width: '120px' },
         {
             title: '等级',
             field: 'nodeGrade',
@@ -288,7 +297,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '最大监测点数量',
+            title: '最大终端数量',
             field: 'nodeDevNum'
         },
         {
@@ -316,6 +325,7 @@ const tableStore = new TableStore({
 
         {
             title: '操作',
+            fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -350,7 +360,7 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         askRestartProcess({
-                            deviceRebootType: null,
+                            deviceRebootType: 1,
                             nodeId: row.id,
                             processNo: 1
                         }).then(res => {
@@ -373,11 +383,41 @@ const tableStore = new TableStore({
                         title: '确定删除吗？'
                     },
                     click: row => {
+                        if (hasDevices.value) {
+                            ElMessage.warning('此前置机绑定了设备，无法删除！')
+                            return
+                        }
+
                         delNode(row.id).then(res => {
                             ElMessage.success('删除成功')
                             tableStore.index()
                         })
                     }
+                },
+                {
+                    name: 'edit',
+                    title: '分配终端',
+                    type: 'primary',
+                    icon: 'InfoFilled',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'primary',
+                        title: '确定分配终端吗？'
+                    },
+                    click: row => {
+                        // if (!hasDevices.value) {
+                        //     ElMessage.warning('此前置机下无设备，无法分配终端！')
+                        //     return
+                        // }
+                        allotTerminal({
+                            nodeId: row.id
+                        }).then(res => {
+                            ElMessage.success(res.message)
+                            tableStore.index()
+                        })
+                    }
                 }
             ]
         }
@@ -395,12 +435,14 @@ const tableStore = new TableStore({
     }
 })
 const nodeId = ref('')
-// 点击行
+const hasDevices = ref(false)
+/// 点击行
 const currentChangeEvent = () => {
     // 确保 tableRef 和当前记录存在
     if (!tableRef.value || !tableRef.value.getRef().getCurrentRecord()) {
         loading.value = false
         dataSource.value = []
+        hasDevices.value = false
         return
     }
 
@@ -413,15 +455,26 @@ const currentChangeEvent = () => {
             nodeId.value = tableRef.value.getRef().getCurrentRecord().id
             // 检查返回的数据是否存在且不为空
             if (res.data && res.data.processDeviceList) {
-                dataSource.value = res.data.processDeviceList.filter(item => (item.name = item.processNo + ''))
+                // 检查是否有设备绑定
+                const hasAnyDevices = res.data.processDeviceList.some(
+                    item => item.deviceInfoList && item.deviceInfoList.length > 0
+                )
+                hasDevices.value = hasAnyDevices
+
+                dataSource.value = res.data.processDeviceList.filter(item => {
+                    item.name = item.processNo + ''
+                    return true // 保持原有的过滤逻辑
+                })
             } else {
                 dataSource.value = []
+                hasDevices.value = false
             }
             loading.value = false
         })
         .catch(() => {
             // 添加错误处理，确保 loading 状态也能关闭
             dataSource.value = []
+            hasDevices.value = false
             loading.value = false
         })
 
@@ -430,11 +483,11 @@ const currentChangeEvent = () => {
 
 // 重启进程
 const restart = (data: any) => {
-   // console.log('🚀 ~ restart ~ data:', data)
+    // console.log('🚀 ~ restart ~ data:', data)
     askRestartProcess({
-        deviceRebootType: data.processNo,
+        deviceRebootType: null,
         nodeId: nodeId.value,
-        processNo: 2
+        processNo: data.processNo
     }).then(res => {
         ElMessage.success('重启成功')
         currentChangeEvent()
@@ -472,7 +525,7 @@ const filterNode = (value: string, data: any, node: any) => {
 
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
-    if (data.name.indexOf(value) !== -1) {
+    if ((data.subName + data.name).indexOf(value) !== -1) {
         return true
     }
     const level = node.level
@@ -583,7 +636,7 @@ const addMenu = () => {}
 :deep(.default) {
     display: flex;
     .row--current {
-       // background-color: var(--el-color-primary-light-8) !important;
+        // background-color: var(--el-color-primary-light-8) !important;
     }
 }
 .custom-tree-node {

src/views/pqs/business/terminal/ProgramManagement/index.vue

@@ -3,7 +3,7 @@
         <TableHeader>
             <template #select>
                 <el-form-item label="终端型号">
-                    <el-select v-model="tableStore.table.params.teriminal" clearable placeholder="请选择终端型号">
+                    <el-select v-model="tableStore.table.params.devType" clearable placeholder="请选择终端型号">
                         <el-option
                             v-for="item in teriminaloption"
                             :key="item.id"
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="终端状态">
-                    <el-select v-model="tableStore.table.params.teriminalstatus" clearable placeholder="请选择终端状态">
+                    <el-select v-model="tableStore.table.params.runFlag" clearable placeholder="请选择终端状态">
                         <el-option
                             v-for="item in teriminalstatusoption"
                             :key="item.id"
@@ -23,7 +23,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="通讯状态">
-                    <el-select v-model="tableStore.table.params.state" clearable placeholder="请选择通讯状态">
+                    <el-select v-model="tableStore.table.params.comFlag" clearable placeholder="请选择通讯状态">
                         <el-option
                             v-for="item in stateoption"
                             :key="item.id"
@@ -32,7 +32,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="程序版本">
+                <!-- <el-form-item label="程序版本">
                     <el-select v-model="tableStore.table.params.program" clearable placeholder="请选择程序版本">
                         <el-option
                             v-for="item in programoption"
@@ -41,19 +41,21 @@
                             :value="item.id"
                         ></el-option>
                     </el-select>
-                </el-form-item>
-                <el-form-item label="筛选数据">
+                </el-form-item> -->
+                <!-- <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.filterName"
                         @keyup="searchEvent"
+                        maxlength="32"
+                        show-word-limit
                         placeholder="输入关键字筛选"
                     />
-                </el-form-item>
+                </el-form-item> -->
             </template>
-            <template #operation>
+            <!-- <template #operation>
                 <el-button icon="el-icon-Download" @click="add">导出</el-button>
                 <el-button icon="el-icon-Check" @click="add">批量升级</el-button>
-            </template>
+            </template> -->
         </TableHeader>
         <div :style="`height: calc(${tableStore.table.height} + 58px)`">
             <vxe-table
@@ -104,7 +106,7 @@
                 <vxe-column field="updateTime" title="最新升级时间"></vxe-column>
                 <vxe-column title="操作" min-width="100">
                     <template #default="{ row }">
-                        <el-button v-if="row.level == 4" size="small" link @click="updateprogram(row)">升级</el-button>
+                        <!-- <el-button v-if="row.level == 4" size="small" link @click="updateprogram(row)">升级</el-button> -->
                         <el-button
                             v-if="row.level == 4"
                             :disabled="row.state == 1 ? true : false"
@@ -250,8 +252,9 @@ const tableStore = new TableStore({
         }, 0)
     }
 })
-tableStore.table.params.teriminal = ''
-tableStore.table.params.state = ''
+tableStore.table.params.devType = ''
+tableStore.table.params.runFlag = ''
+tableStore.table.params.comFlag = ''
 tableStore.table.params.program = ''
 tableStore.table.params.searchEvent = ''
 tableStore.table.params.filterName = ''

src/views/pqs/business/terminal/TerminalManagement/index.vue

@@ -43,6 +43,8 @@
                         v-model="tableStore.table.params.filterName"
                         @keyup="searchEvent"
                         clearable
+                        maxlength="32"
+                        show-word-limit
                         placeholder="输入关键字筛选"
                     />
                 </el-form-item>
@@ -75,6 +77,7 @@
                 :checkbox-config="{ labelField: 'name' }"
             >
                 <vxe-column
+                    v-if="treeData && treeData.length > 0"
                     field="name"
                     align="left"
                     type="checkbox"
@@ -82,6 +85,15 @@
                     min-width="200"
                     tree-node
                 ></vxe-column>
+                <!-- 没有数据时显示普通列 -->
+                <vxe-column
+                    v-else
+                    field="name"
+                    align="left"
+                    title="电网拓扑"
+                    min-width="200"
+                    tree-node
+                ></vxe-column>
                 <vxe-column field="devType" title="终端型号">
                     <template #default="{ row }">
                         {{ teriminaloption.find((item: any) => item.id === row.devType)?.name }}

src/views/pqs/business/terminal/deviceter/index.vue

@@ -1740,8 +1740,8 @@ const optionarr = ref([
 ])
 /**母线类型 */
 const busBarType = ref([
-    { name: '实际母线', value: 0 },
-    { name: '虚拟母线', value: 1 }
+    { name: '真实母线', value: 1 },
+    { name: '虚拟母线', value: 0 }
 ])
 const bigList: any = ref([])
 const smallList: any = ref([])
@@ -1811,7 +1811,7 @@ const busBarDetail = ref({
     /**电压等级 */
     scale: '',
     /**母线类型 */
-    model: 0,
+    model: 1,
     /**母线id */
     subvIndex: '',
     /**监测点 */
@@ -2397,35 +2397,45 @@ const onsubmit = () => {
 /**
  * 提交数据
  */
-const submitData = () => {
+const submitData = async () => {
     const project = JSON.parse(JSON.stringify(AddProjectBO.value))
-
-    // project: JSON.stringify(project)
-    addTerminal(project).then((res: any) => {
-        ElMessage({
-            type: 'success',
-            message: res.message
-        })
-        reaseStatus()
-        initAddProjectBo()
-        initAddProjectBoId()
-        treedata()
+    await mainForm.value.validate((valid: any) => {
+        if (valid) {
+            addTerminal(project).then((res: any) => {
+                ElMessage({
+                    type: 'success',
+                    message: res.message
+                })
+                reaseStatus()
+                initAddProjectBo()
+                initAddProjectBoId()
+                treedata()
+            })
+        }
     })
+    // project: JSON.stringify(project)
+    
 }
 /**
  * 修改数据
  */
-const updateDate = () => {
+const updateDate = async () => {
     // console.log("updateProject:", this.updateProject);
-    let data = updateProject.value
-    updateTerminal(data).then((res: any) => {
-        ElMessage({
-            type: 'success',
-            message: res.message
-        })
-        pageStatus.value = 1
-        treedata()
+    await mainForm.value.validate((valid: any) => {
+        if (valid){
+             let data = updateProject.value
+            updateTerminal(data).then((res: any) => {
+                ElMessage({
+                    type: 'success',
+                    message: res.message
+                })
+                pageStatus.value = 1
+                treedata()
+            })
+
+        }
     })
+   
 }
 const updateProjectF = () => {
     updateProject.value = {

src/views/pqs/business/terminal/sensitiveLoadMange/detail.vue

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

src/views/pqs/business/terminal/sensitiveLoadMange/index.vue

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

src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue

@@ -74,7 +74,7 @@
         >
             <el-form :model="ruleForm" :rules="rules" ref="ruleFormRef" label-width="100px">
                 <el-form-item label="变压器名:" prop="tfName">
-                    <el-input v-model="ruleForm.tfName" placeholder="请输入" clearable></el-input>
+                    <el-input v-model="ruleForm.tfName" placeholder="请输入" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="接线方式:" prop="wiring" class="top">
                     <el-select style="width: 100%" v-model="ruleForm.wiring" clearable placeholder="请选择接线方式">
@@ -113,7 +113,7 @@
                 <el-col :span="8">
                     <div style="border-right: 1px solid; height: 100%" class="xiaoshou">
                         <div style="overflow-y: auto; height: 100%; overflow-x: auto;max-height: 350px;" class="tree mr10 xiaoshou">
-                            <el-input placeholder="输入关键字检索" v-model="filterText1" clearable></el-input>
+                            <el-input placeholder="输入关键字检索" v-model="filterText1" clearable maxlength="32" show-word-limit></el-input>
                             <el-tree
                                 style="cursor: pointer;display: inline-block;"
                                 :data="treeMenuLeftData"
@@ -163,7 +163,7 @@
                 <el-col :span="8">
                     <div style="border-left: 1px solid; height: 100%" class="xiaoshou">
                         <div style="overflow-y: auto; height: 100%;overflow-x: auto;max-height: 350px;" class="ml10 tree xiaoshou">
-                            <el-input placeholder="输入关键字检索" v-model="filterText2" clearable></el-input>
+                            <el-input placeholder="输入关键字检索" v-model="filterText2" clearable maxlength="32" show-word-limit></el-input>
                             <el-tree
                                 style="cursor: pointer"
                                 :data="treeMenuRightData"
@@ -328,7 +328,7 @@ const tableStore = new TableStore({
             field: 'tfDescribe'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -372,6 +372,7 @@ const tableStore = new TableStore({
                     click: row => {
                         delTransformer([row.tfIndex]).then(res => {
                             ElMessage.success('删除成功')
+                            menuTree.value.loadData()
                             tableStore.index()
                         })
                     }
@@ -413,6 +414,7 @@ const transformerAdd = () => {
             message: '请选择变电站'
         })
     } else {
+        ruleForm.subIndex = parentId.value
         transformerTitle.value = '新增变压器信息'
         transformerInformation.value = true
         nextTick(() => {
@@ -602,55 +604,73 @@ const maintenanceData = reactive({
 //上节点选择
 const checkLeft = (checkedNodes: any, checkedKeys: any) => {
     maintenanceData.upNode = checkedNodes.id
-    if (maintenanceData.upNode === maintenanceData.downNode) {
-        menuTreeRight.value?.setCheckedKeys([])
-        maintenanceData.downNode = ''
-    }
-    if (checkedKeys.checkedKeys.length > 1) {
-        menuTreeLeft.value?.setCheckedKeys([checkedNodes.id])
-    }
+     if (maintenanceData.upNode === maintenanceData.downNode) {
+         menuTreeRight.value?.setCheckedKeys([])
+         maintenanceData.downNode = ''
+     }
+     if (checkedKeys.checkedKeys.length > 1) {
+         menuTreeLeft.value?.setCheckedKeys([checkedNodes.id])
+     }
 }
 
 //下节点选择
 const checkRight = (checkedNodes: any, checkedKeys: any) => {
     maintenanceData.downNode = checkedNodes.id
-    if (maintenanceData.downNode === maintenanceData.upNode) {
-        menuTreeLeft.value?.setCheckedKeys([])
-        maintenanceData.upNode = ''
-    }
-    if (checkedKeys.checkedKeys.length > 1) {
-        menuTreeRight.value?.setCheckedKeys([checkedNodes.id])
-    }
+  
+     if (maintenanceData.downNode === maintenanceData.upNode) {
+         menuTreeLeft.value?.setCheckedKeys([])
+         maintenanceData.upNode = ''
+     }
+     if (checkedKeys.checkedKeys.length > 1) {
+         menuTreeRight.value?.setCheckedKeys([checkedNodes.id])
+     }
 }
 
 //节点维护提交
 const maintenanceOnsubmit = () => {
-    for (let i = 0; i < bind.value.length; i++) {
-        if (bind.value[i][0] == maintenanceData.upNode) {
-            for (let j = 0; j < bind.value.length; j++) {
-                if (bind.value[j][1] == maintenanceData.downNode) {
-                    ElMessage({
-                        type: 'warning',
-                        message: '上下节点无法选择相同母线！！！'
-                    })
-                    return
-                }
-            }
-            return
-        }
+   
+    if(maintenanceData.downNode == '' || maintenanceData.upNode == '') {
+        ElMessage({
+            type: 'warning',
+            message: '请确保上下节点各自选择一个母线！'
+        })
+         return
     }
 
-    if (bindLevel.value != 5) {
-        for (let i = 0; i < bind.value.length; i++) {
-            if (maintenanceData.upNode == bind.value[i][1] && maintenanceData.downNode == bind.value[i][0]) {
-                ElMessage({
-                    type: 'warning',
-                    message: '上下节点无法选择相同母线！！！'
-                })
-                return
-            }
-        }
+
+    if (maintenanceData.upNode == maintenanceData.downNode) {
+        ElMessage({
+            type: 'warning',
+            message: '上下节点无法选择相同母线！'
+        })
     }
+    // for (let i = 0; i < bind.value.length; i++) {
+    //     if (bind.value[i] == maintenanceData.upNode) {
+    //         for (let j = 0; j < bind.value.length; j++) {
+              
+    //             if (bind.value[j] == maintenanceData.downNode) {
+    //                 ElMessage({
+    //                     type: 'warning',
+    //                     message: '上下节点无法选择相同母线！！！'
+    //                 })
+    //                 return
+    //             }
+    //         }
+    //         return
+    //     }
+    // }
+
+    // if (bindLevel.value != 5) {
+    //     for (let i = 0; i < bind.value.length; i++) {
+    //         if (maintenanceData.upNode == bind.value[i] && maintenanceData.downNode == bind.value[i]) {
+    //             ElMessage({
+    //                 type: 'warning',
+    //                 message: '上下节点无法选择相同母线！！！'
+    //             })
+    //             return
+    //         }
+    //     }
+    // }
     
     nodeMaintenance(maintenanceData).then((res: any) => {
         if (res.code == 'A0000') {

src/views/pqs/business/terminal/transformerStrategy/index.vue

@@ -53,12 +53,12 @@
                 </el-col>
                 <el-col :span="14">
                     <div class="box">
-                        <el-form :model="form" label-width="100px" ref="ruleFormRef">
-                            <el-form-item label="名称:">
-                                <el-input v-model="form.tpName" placeholder="请输入"></el-input>
+                        <el-form :model="form" label-width="100px" ref="ruleFormRef" :rules="rules">
+                            <el-form-item label="名称:" prop="tpName">
+                                <el-input v-model="form.tpName" placeholder="请输入" maxlength="32" show-word-limit clearable></el-input>
                             </el-form-item>
                             <el-form-item label="描述:" class="mt20">
-                                <el-input v-model="form.tfDescribe" placeholder="请输入"></el-input>
+                                <el-input v-model="form.tfDescribe" placeholder="请输入" ></el-input>
                             </el-form-item>
                             <el-form-item class="mt20 ml20">
                                 <el-button @click="dialogFormVisible = false">取消</el-button>
@@ -122,13 +122,8 @@ const menuTree = ref()
 const TableHeaderRef = ref()
 
 const rules = reactive({
-    name: [{ required: true, message: '名称不可为空', trigger: 'blur' }],
-    ip: [{ required: true, message: 'ip不可为空', trigger: 'blur' }],
-    nodeGrade: [{ required: true, message: '等级不可为空', trigger: 'blur' }],
-    nodeDevNum: [{ required: true, message: '最大终端数不可为空', trigger: 'blur' }],
-    maxProcessNum: [{ required: true, message: '最大进程数不可为空', trigger: 'blur' }],
-    sort: [{ required: true, message: '排序不可为空', trigger: 'blur' }],
-    remark: [{ required: true, message: '描述不可为空', trigger: 'blur' }]
+    tpName: [{ required: true, message: '名称不可为空', trigger: 'blur' }],
+   
 })
 
 const dialogFormVisible = ref(false)
@@ -161,7 +156,7 @@ const tableStore = new TableStore({
             field: 'tfDescribe'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',

src/views/pqs/business/terminal/userLedger/components/addForm.vue

@@ -48,7 +48,7 @@
                     v-model.trim="form.projectName"
                     autocomplete="off"
                     placeholder="请输入项目名称"
-                    maxlength="64"
+                    maxlength="32"
                     show-word-limit
                 />
             </el-form-item>
@@ -112,7 +112,7 @@
                     v-model.trim="form.substation"
                     autocomplete="off"
                     placeholder="请输入厂站名称"
-                    maxlength="64"
+                    maxlength="32"
                     show-word-limit
                 />
             </el-form-item>
@@ -364,6 +364,8 @@
                     v-model.trim="form.evaluationChekDept"
                     autocomplete="off"
                     placeholder="请输入预测评估评审单位"
+                    maxlength="32"
+                    show-word-limit
                 />
             </el-form-item>
             <el-form-item for="-" label="预测评估结论：" style="width: 100%">
@@ -398,13 +400,12 @@ import { uploadFile } from '@/api/system-boot/file'
 import {
     submitFormData,
     getById,
-    updateFormData,
     addEditor,
-    resend,
-    getByDeptDevLine
-} from '@/api/supervision-boot/interfere/index'
+    getByDeptDevLine,
+    getUserReportUpdateById
+} from '@/api/device-boot/sensitiveLoadMange'
 import { getSubstationSelect } from '@/api/device-boot/line'
-import { getUserReportUpdateById } from '@/api/supervision-boot/userReport/form'
+// import { getUserReportUpdateById } from '@/api/supervision-boot/userReport/form'
 import { useRoute } from 'vue-router'
 
 const route = useRoute()

src/views/pqs/business/terminal/userLedger/components/detail.vue

@@ -1,217 +1,225 @@
 <template>
     <div class="default-main">
-         <div v-if="detailLoading" class="loading">
+        <div v-if="detailLoading" class="loading">
             <el-spin description="加载中..." />
         </div>
         <div v-else>
-        <el-descriptions :column="2" border>
-            <el-descriptions-item label="所在地市">
-                {{ detailData.city }}
-            </el-descriptions-item>
-            <el-descriptions-item label="项目名称">
-                {{ detailData.projectName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="工程预期投产日期">
-                {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
-            </el-descriptions-item>
-            <el-descriptions-item label="经纬度">
-                {{ detailData.longitude }}　 {{ detailData.latitude }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户性质">
-                {{
-                    userTypeList.find(item => {
-                        return item.value == detailData.userType
-                    })?.label
-                }}
-            </el-descriptions-item>
+            <el-descriptions :column="2" border label-width="200px">
+                <el-descriptions-item label="所在地市">
+                    {{ detailData.city }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称">
+                    {{ detailData.projectName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="工程预期投产日期">
+                    {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
+                </el-descriptions-item>
+                <el-descriptions-item label="经纬度">
+                    {{ detailData.longitude }}　 {{ detailData.latitude }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户性质">
+                    {{
+                        userTypeList.find(item => {
+                            return item.value == detailData.userType
+                        })?.label
+                    }}
+                </el-descriptions-item>
 
-            <el-descriptions-item label="归口管理部门">
-                {{ detailData.responsibleDepartment }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户状态">
-                {{
-                    userStateList.find(item => {
-                        return item.value == detailData.userStatus
-                    })?.label
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="厂站名称">
-                {{ detailData.substation }}
-            </el-descriptions-item>
+                <el-descriptions-item label="归口管理部门">
+                    {{ detailData.responsibleDepartment }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户状态">
+                    {{
+                        userStateList.find(item => {
+                            return item.value == detailData.userStatus
+                        })?.label
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="厂站名称">
+                    {{ detailData.substation }}
+                </el-descriptions-item>
 
-            <el-descriptions-item label="电压等级">
-                {{
-                    voltageLevelList.find(item => {
-                        return item.id == detailData.voltageLevel
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
-                {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估单位">
-                {{ detailData.evaluationDept }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估结论" :span="2">
-                {{ detailData.evaluationConclusion }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                :label="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData.nonlinearLoadType }}
-            </el-descriptions-item>
-            <el-descriptions-item label="是否需要治理">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData.needGovernance == 0 ? '否' : '是' }}
-                </span>
-                <span
+                <el-descriptions-item label="电压等级">
+                    {{
+                        voltageLevelList.find(item => {
+                            return item.id == detailData.voltageLevel
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="非线性终端类型"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
+                    {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估单位">
+                    {{ detailData.evaluationDept }}
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估结论" :span="2">
+                    {{ detailData.evaluationConclusion }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    :label="
+                        detailData.userType == '4' || detailData.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
+                    "
                     v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
                     "
                 >
-                    {{ proviteData.needGovernance == 0 ? '否' : '是' }}
-                </span>
-                <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="是否开展背景测试">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
-                </span>
-                <span
+                    {{ proviteData.nonlinearLoadType }}
+                </el-descriptions-item>
+                <el-descriptions-item label="是否需要治理">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        {{ proviteData.needGovernance == 0 ? '否' : '是' }}
+                    </span>
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        {{ proviteData.needGovernance == 0 ? '否' : '是' }}
+                    </span>
+                    <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="是否开展背景测试">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    </span>
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    </span>
+                    <span v-if="detailData.userType == 6">
+                        {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    </span>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
+                    <span>
+                        {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="用户协议容量（MVA）"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
+                    {{ proviteData.agreementCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item label="装机容量（MW）">
+                    {{ detailData?.ratePower }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="PCC供电设备容量（MVA）"
                     v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
                     "
                 >
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
-                </span>
-                <span v-if="detailData.userType == 6">
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
-                </span>
-            </el-descriptions-item>
-
-            <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
-                <span>
-                    {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="用户协议容量（MVA）"
-                v-if="detailData.userType == 0 || detailData.userType == 1"
-            >
-                {{ proviteData.agreementCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="装机容量（MW）">
-                {{ proviteData?.ratePower }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="PCC供电设备容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData.pccEquipmentCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="基准短路容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData.baseShortCircuitCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="系统最小短路容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.minShortCircuitCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="用户用电协议容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.userAgreementCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{ proviteData?.pccPoint }}
-            </el-descriptions-item>
-            <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{
-                    evaluationTypeList.find(item => {
-                        return item.id == proviteData?.evaluationType
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{ proviteData?.evaluationChekDept }}
-            </el-descriptions-item>
-            <el-descriptions-item label="行业" v-if="detailData.userType == 6">
-                {{
-                    industryList.find(item => {
-                        return item.id == proviteData.industry
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
-                {{ proviteData.deviceName }}
-            </el-descriptions-item>
-            <!--            <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">-->
-            <!--                {{ proviteData.powerSupplyCount }}-->
-            <!--            </el-descriptions-item>-->
-            <el-descriptions-item label="供电电源情况" v-if="detailData.userType == 6">
-                {{
-                    powerSupplyInfoOptionList.find(item => {
-                        return item.id == proviteData.powerSupplyInfo
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="供电电源" :span="2" v-if="detailData.userType == 6">
-                {{ proviteData.powerSupply }}
-            </el-descriptions-item>
-            <el-descriptions-item label="负荷级别" v-if="detailData.userType == 6">
-                {{
-                    loadLevelOptionList.find(item => {
-                        return item.id == proviteData.loadLevel
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
-                {{
-                    energyQualityIndexList.find(item => {
-                        return item.id == proviteData.energyQualityIndex
-                    })?.name
-                }}
-            </el-descriptions-item>
-        </el-descriptions>
+                    {{ proviteData.pccEquipmentCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="基准短路容量（MVA）"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData.baseShortCircuitCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="系统最小短路容量（MVA）"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.minShortCircuitCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="用户用电协议容量（MVA）"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.userAgreementCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
+                    {{ proviteData?.pccPoint }}
+                </el-descriptions-item>
+                <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
+                    {{
+                        evaluationTypeList.find(item => {
+                            return item.id == proviteData?.evaluationType
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="预测评估评审单位"
+                    v-if="detailData.userType != 0 && detailData.userType != 1"
+                >
+                    {{ proviteData?.evaluationChekDept }}
+                </el-descriptions-item>
+                <el-descriptions-item label="行业" v-if="detailData.userType == 6">
+                    {{
+                        industryList.find(item => {
+                            return item.id == proviteData.industry
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
+                    {{ proviteData.deviceName }}
+                </el-descriptions-item>
+                <!--            <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">-->
+                <!--                {{ proviteData.powerSupplyCount }}-->
+                <!--            </el-descriptions-item>-->
+                <el-descriptions-item label="供电电源情况" v-if="detailData.userType == 6">
+                    {{
+                        powerSupplyInfoOptionList.find(item => {
+                            return item.id == proviteData.powerSupplyInfo
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="供电电源" :span="2" v-if="detailData.userType == 6">
+                    {{ proviteData.powerSupply }}
+                </el-descriptions-item>
+                <el-descriptions-item label="负荷级别" v-if="detailData.userType == 6">
+                    {{
+                        loadLevelOptionList.find(item => {
+                            return item.id == proviteData.loadLevel
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
+                    {{
+                        energyQualityIndexList.find(item => {
+                            return item.id == proviteData.energyQualityIndex
+                        })?.name
+                    }}
+                </el-descriptions-item>
+            </el-descriptions>
         </div>
     </div>
 </template>
@@ -220,14 +228,13 @@ import { onMounted, ref, reactive, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { formatDate } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'
-import { getUserReportById, getUserReportUpdateById } from '@/api/supervision-boot/userReport/form'
+import { getById, getUserReportUpdateById, getByDeptDevLine, getFileById } from '@/api/device-boot/sensitiveLoadMange'
 import { getDictTreeById } from '@/api/system-boot/dictTree'
 import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { Link, View } from '@element-plus/icons-vue'
 import PreviewFile from '@/components/PreviewFile/index.vue'
-import { getByDeptDevLine } from '@/api/supervision-boot/interfere/index'
-import { addOrUpdateFile, getFileById } from '@/api/supervision-boot/interfere/index'
+// import { addOrUpdateFile, getFileById } from '@/api/supervision-boot/interfere/index'
 defineOptions({ name: 'BpmUserReportDetail' })
 
 const { query } = useRoute() // 查询参数
@@ -332,6 +339,7 @@ const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
+
     try {
         if (props.update) {
             await getUserReportUpdateById(props.id || queryId).then(res => {
@@ -339,8 +347,9 @@ const getInfo = async () => {
                 getProviteData()
             })
         } else {
-            await getUserReportById(props.id || queryId).then(res => {
+            await getById({ id: props.id || queryId }).then(res => {
                 detailData.value = res.data
+
                 getProviteData()
             })
         }
@@ -383,7 +392,6 @@ const preview = (val: any, url: any) => {
         }
         //预测评估报告
         if (val == 'predictionEvaluationReport') {
-    
             predictionEvaluationReportRef?.value.open(url)
         }
         //预测评估评审意见报告
@@ -414,11 +422,11 @@ const preview = (val: any, url: any) => {
 }
 
 const queryFiles = () => {
-    getFileById({ id: props.id }).then(res => {
-        res.data.forEach((item: any) => {
-            if (item.url.length > 0) getFileNamePaths(item.url, item.name)
-        })
-    })
+    // getFileById({ id: props.id }).then(res => {
+    //     res.data.forEach((item: any) => {
+    //         if (item.url.length > 0) getFileNamePaths(item.url, item.name)
+    //     })
+    // })
 }
 //判断userType选择取用的对象
 const getProviteData = async () => {

src/views/pqs/business/terminal/userLedger/index.vue

@@ -34,11 +34,11 @@
         </TableHeader>
         <Table ref="tableRef"  />
 
-        <el-dialog title="详情" width="60%" v-model="dialogShow" v-if="dialogShow">
+        <el-dialog title="详情" width="1000px" v-model="dialogShow" v-if="dialogShow">
             <DetailInfo :id="userId" :openType="'sourcesOfInterference'"></DetailInfo>
         </el-dialog>
-        <!-- 批量导入 -->
-        <sensitive-user-popup ref="sensitiveUserPopup" />
+        <!-- 批量导入
+        <sensitive-user-popup ref="sensitiveUserPopup" /> -->
 
         <!-- 查看详情 detail 新增/修改 create-->
         <addForm ref="addForms" @onSubmit="tableStore.index()" :openType="'sourcesOfInterference'"></addForm>
@@ -57,7 +57,7 @@ import { useRouter } from 'vue-router'
 import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
 import DetailInfo from './components/detail.vue'
 import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
-import { deleteUserReport } from '@/api/supervision-boot/delete/index'
+import { deleteUserReport } from '@/api/device-boot/sensitiveLoadMange'
 const addForms = ref()
 const dictData = useDictData()
 const sensitiveUserPopup = ref()
@@ -73,7 +73,7 @@ defineOptions({
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getUserLedgerPage',
+    url: '/device-boot/userReport/getUserLedgerPage',
     // publicHeight: 65,
     method: 'POST',
     column: [
@@ -112,9 +112,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 150,
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/database/algorithm/list.vue

@@ -20,7 +20,7 @@
                             <el-radio-button v-for="(item, i) in dotList?.childrens" :label="item.name" :value="i" />
                         </el-radio-group>
                     </div>
-                    <div v-if="information">
+                    <div >
                         <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
                         <el-button icon="el-icon-Edit" type="primary" @click="revise">修改</el-button>
                         <el-button icon="el-icon-Delete" type="primary" @click="deletes">删除</el-button>

src/views/pqs/database/case/index.vue

@@ -123,7 +123,7 @@ const tableStore = new TableStore({
             ]
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '200',
             render: 'buttons',
             buttons: [

src/views/pqs/database/stencil/components/form.vue

@@ -91,8 +91,10 @@ const submit = () => {
     formRef.value.validate(async (valid: boolean) => {
         if (valid) {
             if (urlList.value.length > 0) {
+               
                 const promises = urlList.value.map(async (item: any) => {
                     if (urlList.value[0].raw) {
+                        
                         return new Promise((resolve, reject) => {
                             uploadFile(item.raw, '/supervision/')
                                 .then((res: any) => {

src/views/pqs/database/stencil/index.vue

@@ -49,7 +49,7 @@ const tableStore = new TableStore({
             field: 'createTime'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '280',
             render: 'buttons',
             buttons: [

src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue

@@ -38,20 +38,20 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标识">
-                    <el-select
-                        v-model="tableStore.table.params.powerFlag"
-                        clearable
-                        style="width: 100%"
-                        placeholder="请选择电网标识"
-                    >
-                        <el-option
-                            v-for="item in powerFlagList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.algoDescribe"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
+                        <el-select
+                            v-model="tableStore.table.params.powerFlag"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择电网标识"
+                        >
+                            <el-option
+                                v-for="item in powerFlagList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.algoDescribe"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="终端厂家:">
                         <el-select
                             v-model="tableStore.table.params.manufacturer"
@@ -88,6 +88,14 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="关键字筛选">
+                        <el-input
+                            v-model.trim="tableStore.table.params.searchValue"
+                            clearable
+                            style="width: 200px"
+                            placeholder="请输入关键字筛选"
+                        />
+                    </el-form-item>
                 </template>
             </TableHeader>
         </div>
@@ -96,7 +104,7 @@
                 <el-tab-pane :name="0" :lazy="true" label="稳态指标符合性占比表格">
                     <Table
                         ref="tableRef"
-                        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId'  }"
+                        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
                         :scroll-y="{ enabled: true }"
                         v-if="activeName == 0"
                     />
@@ -117,6 +125,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import charts from './components/charts.vue'
+import { filterTree } from '@/utils/tree'
 defineOptions({
     name: 'harmonic-boot/area/SteadyState'
 })
@@ -214,7 +223,12 @@ const tableStore = new TableStore({
     ],
 
     loadCallback: () => {
-        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
+        tableStore.table.data = tree2List(
+            filterTree(tableStore.table.data, node => {
+                return node.name.includes(tableStore.table.params.searchValue)
+            }),
+            Math.random() * 1000
+        )
         tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
 
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
@@ -230,6 +244,7 @@ tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
 tableStore.table.params.powerFlag = 2
 tableStore.table.params.serverName = 'harmonicBoot'
+tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 const tree2List = (list: any, id?: string) => {
     //存储结果的数组

src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue

@@ -4,7 +4,7 @@
             <TableHeader datePicker area showExport>
                 <template #select>
                     <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" />
+                        <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" clearable maxlength="32" show-word-limit/>
                     </el-form-item>
                     <el-form-item label="统计类型:">
                         <el-select
@@ -129,14 +129,22 @@ const tableStore = new TableStore({
         { field: 'subName', title: '变电站', minWidth: '150' },
         { field: 'ip', title: '网络参数' ,width:'120px' },
         { field: 'scale', title: '电压等级', minWidth: '110' },
-        // {
-        //     field: 'advanceType',
-        //     title: '暂降类型',
-        //     minWidth: '90',
-        //     formatter: (row: any) => {
-        //         return row.cellValue || '其他'
-        //     }
-        // },
+        {
+            field: 'advanceType',
+            title: '暂降类型',
+            minWidth: '90',
+            formatter: (row: any) => {
+                return row.cellValue || '其他'
+            }
+        },
+         {
+            field: 'eventType',
+            title: '触发类型',
+            minWidth: '120',
+            formatter: (row: any) => {
+                return eventList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
         {
             field: 'advanceReason',
             title: '暂降原因',
@@ -145,14 +153,7 @@ const tableStore = new TableStore({
                 return row.cellValue || '其他'
             }
         },
-        {
-            field: 'eventType',
-            title: '暂态统计类型',
-            minWidth: '120',
-            formatter: (row: any) => {
-                return eventList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
+       
         // {
         //     field: 'severity', title: '严重度', minWidth: "80", formatter: (row: any) => {
         //         return row.cellValue.toFixed(2)
@@ -179,7 +180,7 @@ const tableStore = new TableStore({
         { field: 'duration', title: '持续时间(s)', minWidth: '100' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [

src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue

@@ -54,6 +54,9 @@
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="关键字筛选:">
+                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字"></el-input>
+                    </el-form-item>
                 </template>
                 <template #operation>
                     <el-button type="primary" icon="el-icon-Tickets" @click="makeUp" v-if="!VITE_FLAG">补招</el-button>
@@ -285,7 +288,7 @@ const tableStore = new TableStore({
         // tableStore.table.params.searchEndTime =  tableHeaderRef.value.datePickerRef.timeValue[1]
     },
     loadCallback: () => {
-        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
+        tableStore.table.data = tree2List(filterTreeByKeyword( tableStore.table.data,tableStore.table.params.searchValue), Math.random() * 1000)
         tableStore.table.column[0].title = formData.value.statisticalType.name
 
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
@@ -305,6 +308,7 @@ const tableStore = new TableStore({
 
 tableStore.table.params.deptIndex = ''
 tableStore.table.params.filterName = ''
+tableStore.table.params.searchValue = ''
 tableStore.table.params.statisticalType = []
 tableStore.table.params.scale = []
 tableStore.table.params.manufacturer = []
@@ -339,6 +343,78 @@ const tree2List = (list: any, id?: string) => {
     return arr
 }
 
+
+
+
+/**
+ * 树形结构按名称筛选：保留匹配节点+所有上级+所有下级，保持原树形层级
+ * @param {Array} treeData - 原始嵌套树形数据（根节点数组）
+ * @param {string} keyword - 筛选关键词（name包含该关键词即匹配）
+ * @returns {Array} 筛选后的嵌套树形数据，保持原层级
+ */
+function filterTreeByKeyword(treeData, keyword) {
+  // 关键词为空，直接返回原树（深拷贝，避免修改原数据）
+  if (!keyword || keyword.trim() === '') {
+    return JSON.parse(JSON.stringify(treeData));
+  }
+  const targetKey = keyword.trim();
+  // 存储需要保留的节点ID（匹配节点+所有上级+所有下级）
+  const keepIdSet = new Set();
+
+  // 第一步：递归遍历树形，标记所有需要保留的节点ID
+  const markKeepNodes = (node, parentNodes = []) => {
+    // 1. 若当前节点名称包含关键词，标记自身+所有上级+所有下级
+    const isMatch = node.name && node.name.includes(targetKey);
+    if (isMatch) {
+      // 标记自身
+      keepIdSet.add(node.id);
+      // 标记所有上级父节点
+      parentNodes.forEach(pNode => keepIdSet.add(pNode.id));
+      // 标记所有下级子节点（递归）
+      const markChildren = (childNode) => {
+        keepIdSet.add(childNode.id);
+        if (childNode.children && childNode.children.length) {
+          childNode.children.forEach(markChildren);
+        }
+      };
+      if (node.children && node.children.length) {
+        node.children.forEach(markChildren);
+      }
+    }
+
+    // 2. 递归遍历子节点，传递当前节点的上级链（parentNodes + 当前节点）
+    if (node.children && node.children.length) {
+      node.children.forEach(child => markKeepNodes(child, [...parentNodes, node]));
+    }
+  };
+
+  // 遍历根节点，开始标记
+  treeData.forEach(rootNode => markKeepNodes(rootNode));
+
+  // 第二步：递归重构树形，只保留标记过的节点，保持层级
+  const rebuildTree = (node) => {
+    // 若当前节点无需保留，直接返回null
+    if (!keepIdSet.has(node.id)) {
+      return null;
+    }
+    // 深拷贝当前节点，避免修改原数据
+    const newNode = { ...node };
+    // 递归处理子节点，过滤掉无需保留的，只保留有效子节点
+    if (newNode.children && newNode.children.length) {
+      const newChildren = newNode.children.map(child => rebuildTree(child)).filter(Boolean);
+      newNode.children = newChildren;
+    } else {
+      newNode.children = [];
+    }
+    return newNode;
+  };
+
+  // 重构根节点，过滤掉null的根节点
+  const filteredTree = treeData.map(rootNode => rebuildTree(rootNode)).filter(Boolean);
+  return filteredTree;
+}
+
+
 // 禁用超过当前日期的选择
 const disabledDate = (date: Date) => {
     return date > new Date() // 如果日期大于当前日期，则禁用
@@ -351,7 +427,9 @@ const makeUp = () => {
         tableRef.value
             .getRef()
             .getCheckboxRecords()
-            .find((item: any) => item.level == '6') || []
+            .filter((item: any) => item.level == '6') || []
+
+    
 
     if (list.length == 0) {
         return ElMessage({
@@ -359,6 +437,16 @@ const makeUp = () => {
             type: 'warning'
         })
     }
+
+    // 检查是否有 comFlag 等于 0 的项
+    const hasOfflineDevice = list.some((item: any) => item.comFlag === 0)
+
+    if (hasOfflineDevice) {
+        return ElMessage({
+            message: '请选择在线监测点进行补招',
+            type: 'warning'
+        })
+    }
     timeData.value = []
     timePopUp.value = true
 }
@@ -385,7 +473,7 @@ const makeUpSubmit = () => {
     logPopUp.value = true
 }
 const socket = async (form: any) => {
-    const url = (localStorage.getItem('WebSocketUrl2') || 'ws://192.168.1.67:10405/api/recell/')
+    const url = (localStorage.getItem('WebSocketUrl2') || 'null')//'ws://192.168.1.67:10405/api/recell/')
     logList.value = []
     await dataSocket.socketServe.connect(`${url}${adminInfo.id}`)
     await dataSocket.socketServe.send(form)

src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue

@@ -83,6 +83,14 @@
                             />
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="关键字筛选">
+                        <el-input
+                            v-model.trim="tableStore.table.params.searchValue"
+                            clearable
+                            style="width: 200px"
+                            placeholder="请输入关键字筛选"
+                        />
+                    </el-form-item>
                 </template>
             </TableHeader>
         </div>
@@ -112,6 +120,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import charts from './components/charts.vue'
+import { filterTree } from '@/utils/tree'
 defineOptions({
     name: 'harmonic-boot/area/harmonicDistortionRate'
 })
@@ -200,7 +209,13 @@ const tableStore = new TableStore({
     ],
 
     loadCallback: () => {
-        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
+        tableStore.table.data = tree2List(
+            filterTree(tableStore.table.data, node => {
+                // 筛选条件：name 包含关键词
+                return node.name.includes(tableStore.table.params.searchValue)
+            }),
+            Math.random() * 1000
+        )
         tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
         setTimeout(() => {
@@ -215,6 +230,7 @@ tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
 tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 tableStore.table.params.serverName = 'harmonicBoot'
+tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 const tree2List = (list: any, id?: string) => {
     //存储结果的数组

src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue

@@ -102,6 +102,13 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="关键字筛选:">
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                            placeholder="请输入关键字"
+                        ></el-input>
+                    </el-form-item>
                 </template>
             </TableHeader>
         </div>
@@ -132,7 +139,6 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import charts from './components/charts.vue'
 
-
 defineOptions({
     name: 'device-boot/getOnlineRateData'
 })
@@ -153,7 +159,6 @@ const treeData = ref([])
 const idArr = ref([])
 const activeName = ref(0)
 const getTreeData = async () => {
-   
     await getAreaDept().then(res => {
         var data = res.data
         data.forEach(element => {
@@ -205,7 +210,8 @@ const tableStore = new TableStore({
         {
             title: '网络参数',
             field: 'ip',
-            align: 'center' ,width:'120px',
+            align: 'center',
+            width: '120px',
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -257,7 +263,7 @@ const tableStore = new TableStore({
             formatter: function (row) {
                 return row.cellValue == 3.14159 ? '暂无数据' : row.cellValue.toFixed(2)
             }
-        },
+        }
         // {
         //     title: '评估',
         //     field: 'valueOver',
@@ -299,7 +305,10 @@ const tableStore = new TableStore({
         // let treeData = []
         // treeData = tree2List(tableStore.table.data)
         // tableStore.table.data = JSON.parse(JSON.stringify(treeData))
-        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
+        tableStore.table.data = tree2List(
+            filterTreeByKeyword(tableStore.table.data, tableStore.table.params.searchValue),
+            Math.random() * 1000
+        )
 
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
         setTimeout(() => {
@@ -315,7 +324,7 @@ const tableStore = new TableStore({
         formData.value.loadType = interfereoption
     }
 })
-
+tableStore.table.params.searchValue = ''
 tableStore.table.params.deptIndex = ''
 tableStore.table.params.statisticalType = []
 tableStore.table.params.scale = []
@@ -342,7 +351,73 @@ const tree2List = (list: any, id?: string) => {
     })
     // 返回结果数组
     return arr
+}
+/**
+ * 树形结构按名称筛选：保留匹配节点+所有上级+所有下级，保持原树形层级
+ * @param {Array} treeData - 原始嵌套树形数据（根节点数组）
+ * @param {string} keyword - 筛选关键词（name包含该关键词即匹配）
+ * @returns {Array} 筛选后的嵌套树形数据，保持原层级
+ */
+function filterTreeByKeyword(treeData, keyword) {
+    // 关键词为空，直接返回原树（深拷贝，避免修改原数据）
+    if (!keyword || keyword.trim() === '') {
+        return JSON.parse(JSON.stringify(treeData))
+    }
+    const targetKey = keyword.trim()
+    // 存储需要保留的节点ID（匹配节点+所有上级+所有下级）
+    const keepIdSet = new Set()
 
+    // 第一步：递归遍历树形，标记所有需要保留的节点ID
+    const markKeepNodes = (node, parentNodes = []) => {
+        // 1. 若当前节点名称包含关键词，标记自身+所有上级+所有下级
+        const isMatch = node.name && node.name.includes(targetKey)
+        if (isMatch) {
+            // 标记自身
+            keepIdSet.add(node.id)
+            // 标记所有上级父节点
+            parentNodes.forEach(pNode => keepIdSet.add(pNode.id))
+            // 标记所有下级子节点（递归）
+            const markChildren = childNode => {
+                keepIdSet.add(childNode.id)
+                if (childNode.children && childNode.children.length) {
+                    childNode.children.forEach(markChildren)
+                }
+            }
+            if (node.children && node.children.length) {
+                node.children.forEach(markChildren)
+            }
+        }
+
+        // 2. 递归遍历子节点，传递当前节点的上级链（parentNodes + 当前节点）
+        if (node.children && node.children.length) {
+            node.children.forEach(child => markKeepNodes(child, [...parentNodes, node]))
+        }
+    }
+
+    // 遍历根节点，开始标记
+    treeData.forEach(rootNode => markKeepNodes(rootNode))
+
+    // 第二步：递归重构树形，只保留标记过的节点，保持层级
+    const rebuildTree = node => {
+        // 若当前节点无需保留，直接返回null
+        if (!keepIdSet.has(node.id)) {
+            return null
+        }
+        // 深拷贝当前节点，避免修改原数据
+        const newNode = { ...node }
+        // 递归处理子节点，过滤掉无需保留的，只保留有效子节点
+        if (newNode.children && newNode.children.length) {
+            const newChildren = newNode.children.map(child => rebuildTree(child)).filter(Boolean)
+            newNode.children = newChildren
+        } else {
+            newNode.children = []
+        }
+        return newNode
+    }
+
+    // 重构根节点，过滤掉null的根节点
+    const filteredTree = treeData.map(rootNode => rebuildTree(rootNode)).filter(Boolean)
+    return filteredTree
 }
 onMounted(() => {})
 

src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue

@@ -74,9 +74,22 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
-                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
-                    </el-select>
+                        <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                            <el-option
+                                v-for="item in sign"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.algoDescribe"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="关键字筛选">
+                        <el-input
+                            v-model.trim="tableStore.table.params.searchValue"
+                            clearable
+                            style="width: 200px"
+                            placeholder="请输入关键字筛选"
+                        />
                     </el-form-item>
                 </template>
             </TableHeader>
@@ -108,6 +121,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import charts from './components/charts.vue'
+import { filterTree } from '@/utils/tree'
 defineOptions({
     name: 'harmonic-boot/area/qualifiedRate'
 })
@@ -159,6 +173,8 @@ const tableStore = new TableStore({
             title: '电压等级',
             field: 'voltageLevel',
             align: 'center',
+            minWidth: 80,
+
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -167,6 +183,7 @@ const tableStore = new TableStore({
             title: '网络参数',
             field: 'networkParam',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -175,6 +192,7 @@ const tableStore = new TableStore({
             title: '监测点名称',
             field: 'lineName',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -183,6 +201,7 @@ const tableStore = new TableStore({
             title: '厂家',
             field: 'factoryName',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -191,6 +210,7 @@ const tableStore = new TableStore({
             title: '谐波电压(%)',
             field: 'harmonicVoltage',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -199,6 +219,7 @@ const tableStore = new TableStore({
             title: '电压偏差(%)',
             field: 'voltageOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -207,6 +228,7 @@ const tableStore = new TableStore({
             title: '三相电压不平衡度(%)',
             field: 'voltageUnbalance',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -215,6 +237,7 @@ const tableStore = new TableStore({
             title: '间谐波电压含有率(%)',
             field: 'interHarmonic',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -223,6 +246,7 @@ const tableStore = new TableStore({
             title: '谐波电流(%)',
             field: 'harmonicCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -231,6 +255,7 @@ const tableStore = new TableStore({
             title: '负序电流(%)',
             field: 'negativeCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -239,6 +264,7 @@ const tableStore = new TableStore({
             title: '频率偏差(%)',
             field: 'freqOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -247,6 +273,7 @@ const tableStore = new TableStore({
             title: '闪变(%)',
             field: 'flicker',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -254,7 +281,13 @@ const tableStore = new TableStore({
     ],
 
     loadCallback: () => {
-        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
+        tableStore.table.data = tree2List(
+            filterTree(tableStore.table.data, node => {
+                // 筛选条件：name 包含关键词
+                return node.name.includes(tableStore.table.params.searchValue)
+            }),
+            Math.random() * 1000
+        )
         tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
 
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
@@ -270,6 +303,7 @@ tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
 tableStore.table.params.serverName = 'harmonicBoot'
 tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
+tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 // const tree2List = (list: any, pid?: string) => {
 //     //存储结果的数组
@@ -312,7 +346,7 @@ const tree2List = (list: any, id?: string) => {
     })
     // 返回结果数组
     return arr
-  }
+}
 onMounted(() => {
     tableStore.index()
 })

src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue

@@ -37,6 +37,14 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="关键字筛选">
+                        <el-input
+                            v-model.trim="tableStore.table.params.searchValue"
+                            clearable
+                            style="width: 200px"
+                            placeholder="请输入关键字筛选"
+                        />
+                    </el-form-item>
                 </template>
             </TableHeader>
         </div>
@@ -88,7 +96,7 @@
                                 <span style="color: #ffcc33">检修状态</span>
                             </li>
                             <li>
-                                <p style="background: #A52a2a">
+                                <p style="background: #a52a2a">
                                     <svg
                                         t="1722910570852"
                                         class="icon"
@@ -106,7 +114,7 @@
                                         ></path>
                                     </svg>
                                 </p>
-                                <span style="color: #A52a2a">停运状态</span>
+                                <span style="color: #a52a2a">停运状态</span>
                             </li>
                         </ul>
                     </div>
@@ -133,6 +141,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import charts from './components/charts.vue'
+import { filterTree } from '@/utils/tree'
 defineOptions({
     name: 'harmonic-boot/area/terminalonlinerate'
 })
@@ -279,7 +288,12 @@ const tableStore = new TableStore({
     //     // tableStore.table.params.searchEndTime =  tableHeaderRef.value.datePickerRef.timeValue[1]
     // },
     loadCallback: () => {
-        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
+        tableStore.table.data = tree2List(
+            filterTree(tableStore.table.data, node => {
+                return node.name.includes(tableStore.table.params.searchValue)
+            }),
+            Math.random() * 1000
+        )
         tableStore.table.column[0].title = formData.value.statisticalType.name
 
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
@@ -294,7 +308,7 @@ tableStore.table.params.scale = voltageleveloption
 tableStore.table.params.manufacturer = terminaloption
 tableStore.table.params.loadType = interfereoption
 tableStore.table.params.serverName = 'harmonicBoot'
-
+tableStore.table.params.searchValue = ''
 
 provide('tableStore', tableStore)
 const tree2List = (list: any, id?: string) => {

src/views/pqs/harmonicMonitoring/detailed/division/components/aListOfLoadData.vue

@@ -8,7 +8,7 @@
         <TableHeader :showReset="false" ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="关键字">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" />
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
             <template #operation>
@@ -69,7 +69,7 @@ const tableStore = new TableStore({
         { title: '更新时间', field: 'updateTime' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue

@@ -613,7 +613,7 @@ onMounted(() => {
 .harmonicButton {
     height: 42px;
     display: flex;
-    justify-content: end;
+    justify-content: flex-end;
     align-items: center;
 }
 :deep(.el-tabs__content) {

src/views/pqs/harmonicMonitoring/detailed/division/components/detail.vue

@@ -158,7 +158,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .title {
     display: flex;
-    justify-content: end;
+    justify-content: flex-end;
     align-items: center;
     padding: 10px;
     font-size: 16px;

src/views/pqs/harmonicMonitoring/detailed/division/index.vue

@@ -49,7 +49,7 @@ const tableStore = new TableStore({
         { title: '计算时间', field: 'updateTime' },
         { title: '计算窗口', field: 'timeWindow' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue

@@ -32,7 +32,7 @@
                                     <el-card v-for="(item, index) in tableStore.table.data" :key="index">
                                         <template #header>
                                             <div style="cursor: pointer;" @click="queryline(item, false)">
-                                                <el-tag v-if="item.data < 60 && item.data >= 0"
+                                                <el-tag v-if="item.data < 60 && item.data >= 0 && item.data !== 3.14159"
                                                     style="color: #fff; background: #339966" size="small">
                                                     优
                                                 </el-tag>
@@ -56,7 +56,7 @@
                                             <div class="card-item" v-for="(item1, index1) in item.children"
                                                 :key="index1" @click="queryline(item1, true)">
 
-                                                <el-tag v-if="item1.data < 60 && item1.data >= 0"
+                                                <el-tag v-if="item1.data < 60 && item1.data >= 0 && item1.data !== 3.14159"
                                                     style="color: #fff; background: #339966" size="small">
                                                     优
                                                 </el-tag>

src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue

@@ -68,14 +68,14 @@ const tableStore = new TableStore({
         { field: 'lineScale', title: '电压等级', minWidth: "120px", },
         { field: 'lineName', title: '监测点名称', minWidth: "150px", },
         { field: 'loadType', title: '干扰源类型', minWidth: "150px", },
-        { field: 'lineObjectName', title: '监测点对象名称', minWidth: "150px", formatter: (row: any) => { return row.cellValue == null ? '/' : row.cellValue } },
+        { field: 'lineObjectName', title: '监测点对象名称', minWidth: "180px", formatter: (row: any) => { return row.cellValue == null ? '/' : row.cellValue } },
         { field: 'overDay', title: '超标天数', minWidth: "80px", },
-        { field: 'freqOverDay', title: '频率偏差超标天数', minWidth: "100px", },
-        { field: 'volDevOverDay', title: '电压偏差超标天数', minWidth: "100px", },
-        { field: 'volDisOverDay', title: '电压总畸变率超标天数', minWidth: "100px", },
-        { field: 'volContainOverDay', title: '谐波电压含有率超标天数', minWidth: "110px", },
-        { field: 'harmVolOverDay', title: '谐波电压超标天数', minWidth: "100px", },
-        { field: 'harmCurOverDay', title: '谐波电流超标天数', minWidth: "100px", },
+        { field: 'freqOverDay', title: '频率偏差', minWidth: "100px", },
+        { field: 'volDevOverDay', title: '电压偏差', minWidth: "100px", },
+        { field: 'volDisOverDay', title: '电压总畸变率', minWidth: "100px", },
+        { field: 'volContainOverDay', title: '谐波电压含有率', minWidth: "100px", },
+        { field: 'harmVolOverDay', title: '谐波电压', minWidth: "100px", },
+        { field: 'harmCurOverDay', title: '谐波电流', minWidth: "100px", },
         {
             title: '各次谐波电压含有率超标天数',
             children: [
@@ -104,10 +104,11 @@ const tableStore = new TableStore({
 
             ],
         },
-        { field: 'threeUnbalance', title: '三相电压不平衡度超标天数', minWidth: "110px", },
-        { field: 'negativeOverDay', title: '负序电流超标天数', minWidth: "100px", },
-        { field: 'flickerOverDay', title: '闪变超标天数', minWidth: "100px", },
-        { field: 'monitorNumber', title: '监测点编号', minWidth: "180px", formatter: (row: any) => { return row.cellValue == null ? '/' : row.cellValue }  },
+        { field: 'intHarmOverDay', title: '间谐波电压含有率', minWidth: "100px", },
+        { field: 'threeUnbalance', title: '三相电压不平衡度', minWidth: "100px", },
+        { field: 'negativeOverDay', title: '负序电流', minWidth: "100px", },
+        { field: 'flickerOverDay', title: '闪变', minWidth: "100px", },
+        { field: 'monitorNumber', title: '监测点编号', minWidth: "100px", formatter: (row: any) => { return row.cellValue == null ? '/' : row.cellValue }  },
 
 
 

src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue

@@ -107,9 +107,9 @@ const tableStore = new TableStore({
             minWidth: 150
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+          
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue

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

src/views/pqs/harmonicMonitoring/embed/dataOverview_JB/index.vue

@@ -11,7 +11,9 @@
                     ></DatePicker>
                 </el-form-item>
             </template>
-            <template v-slot:operation></template>
+            <template v-slot:operation>
+                <el-button type="primary" icon="el-icon-Download" @click="exportTemplate">导出</el-button>
+            </template>
         </TableHeader>
 
         <GridLayout
@@ -68,9 +70,12 @@ import { useRouter, useRoute } from 'vue-router'
 import { View } from '@element-plus/icons-vue'
 import { useTimeCacheStore } from '@/stores/timeCache'
 import { adminBaseRoutePath } from '@/router/static'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { dataVerifyExcel } from '@/api/device-boot/line'
 const { push } = useRouter()
 const datePickerRef = ref()
 const router = useRouter()
+const adminInfo = useAdminInfo()
 const route = useRoute()
 const timeCacheStore = useTimeCacheStore()
 
@@ -288,7 +293,29 @@ const fetchLayoutData = async () => {
         // 可以添加错误提示逻辑
     }
 }
+// 导出
+const exportTemplate = () => {
+    console.log(123)
 
+    dataVerifyExcel({
+        deptId: adminInfo.$state.deptId,
+        searchBeginTime: datePickerRef.value?.timeValue[0],
+        searchEndTime: datePickerRef.value?.timeValue[1]
+    }).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        // link.download = "电压暂降事件分析报告"; // 设置下载的文件名
+        link.download = '数据总览' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
 // 窗口大小变化处理 - 使用防抖
 const handleResize = useDebounceFn(() => {
     initRowHeight()

src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue

@@ -123,7 +123,8 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
         {
             field: 'ip',
-            title: '网络参数' ,width:'120px',
+            title: '网络参数',
+            width: '120px',
             formatter: ({ row }: any) => {
                 return row.ip || '/'
             }
@@ -249,7 +250,7 @@ const searchEvent = debounce(() => {
             (item: any) => searchProps.some(key => String(item[key]).toLowerCase().indexOf(filterVal) > -1),
             options
         )
-       // console.log('🚀 ~ searchEvent ~ rest:', rest)
+        // console.log('🚀 ~ searchEvent ~ rest:', rest)
 
         tableStore.table.data = rest
 
@@ -288,6 +289,10 @@ const exportEvent = () => {
     })
     exportModelJB(form)
         .then(async res => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
             })

src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue

@@ -123,7 +123,8 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
         {
             field: 'ip',
-            title: '网络参数' ,width:'120px',
+            title: '网络参数',
+            width: '120px',
             formatter: ({ row }: any) => {
                 return row.ip || '/'
             }
@@ -249,7 +250,7 @@ const searchEvent = debounce(() => {
             (item: any) => searchProps.some(key => String(item[key]).toLowerCase().indexOf(filterVal) > -1),
             options
         )
-       // console.log('🚀 ~ searchEvent ~ rest:', rest)
+        // console.log('🚀 ~ searchEvent ~ rest:', rest)
 
         tableStore.table.data = rest
 
@@ -288,6 +289,10 @@ const exportEvent = () => {
     })
     exportModelJB(form)
         .then(async res => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
             })

src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue

@@ -162,14 +162,15 @@
                         <vxe-column field="company" title="供电公司" minWidth="110px"></vxe-column>
                         <vxe-column field="subStation" title="变电站" minWidth="110px"></vxe-column>
                         <vxe-column field="manufacturer" title="终端厂家" minWidth="110px"></vxe-column>
-                        <vxe-column field="deviceName" title="终端名称" minWidth="110px"></vxe-column>
+                        <vxe-column field="deviceName" title="终端名称" minWidth="130px"></vxe-column>
                         <vxe-column field="ip" title="终端IP" :formatter="formatter" width="120px"></vxe-column>
                         <vxe-column
                             field="lineName"
                             title="监测点名称"
                             :formatter="formatter"
-                            minWidth="110px"
+                            minWidth="130px"
                         ></vxe-column>
+                        <vxe-column v-if="VITE_FLAG" field="objName" title="监测对象" minWidth="130px"></vxe-column>
                         <vxe-column field="runFlag" title="运行状态" width="90px">
                             <template #default="{ row }">
                                 <el-tag
@@ -222,6 +223,7 @@ defineOptions({
     name: 'harmonic-boot/harmonic/getIntegrityData'
 })
 import { useRoute } from 'vue-router'
+const VITE_FLAG = import.meta.env.VITE_NAME != 'jibei'
 const route = useRoute()
 const dictData = useDictData()
 //字典获取监督对象类型

src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue

@@ -160,8 +160,9 @@
                         <vxe-column field="company" title="供电公司" minWidth="110px"></vxe-column>
                         <vxe-column field="subStation" title="变电站" minWidth="110px"></vxe-column>
                         <vxe-column field="manufacturer" title="终端厂家" minWidth="110px"></vxe-column>
-                        <vxe-column field="deviceName" title="终端名称" minWidth="110px"></vxe-column>
+                        <vxe-column field="deviceName" title="终端名称" minWidth="130px"></vxe-column>
                         <vxe-column field="ip" title="终端IP" :formatter="formatter" width="120px"></vxe-column>
+                        
                         <vxe-column field="runFlag" title="运行状态" width="90px">
                             <template #default="{ row }">
                                 <el-tag
@@ -214,6 +215,7 @@ defineOptions({
     name: 'harmonic-boot/harmonic/getIntegrityData'
 })
 import { useRoute } from 'vue-router'
+const VITE_FLAG = import.meta.env.VITE_NAME != 'jibei'
 const route = useRoute()
 const dictData = useDictData()
 //字典获取监督对象类型

src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue

@@ -665,7 +665,7 @@ const initEcharts = (color: string, key: number, name: string) => {
                     startAngle: key == 0 ? 180 : 90,
                     endAngle: key == 0 ? 90 : 0,
                     min: 0,
-                    max: key == 0 ? 12 : 400,
+                    max: key == 0 ? 12 : 200,
                     radius: '180%',
                     center: key == 0 ? ['70%', '95%'] : ['30%', '95%'],
                     splitNumber: 2, //刻度数量
@@ -744,7 +744,19 @@ const initEcharts = (color: string, key: number, name: string) => {
 }
 //渲染echarts
 const init = () => {
-    const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.68:10407/api/pushMessage/'
+    if (!dataSocket.socketServe) {
+        console.error('WebSocket 客户端实例不存在')
+        return
+    }
+    if (monitoringPoint.state.comFlag == 0) {
+        loading.value = false
+        return ElMessage({
+            message: '所选监测点离线!',
+            type: 'warning'
+        })
+    }
+    loading.value = true
+    const url = localStorage.getItem('WebSocketUrl') || 'null' //'ws://192.168.1.68:10407/api/pushMessage/'
     echartsDataV1.value = initEcharts('#DAA520', 0, 'A相')
     echartsDataV2.value = initEcharts('#2E8B57', 0, 'B相')
     echartsDataV3.value = initEcharts('#A52a2a', 0, 'C相')
@@ -753,19 +765,12 @@ const init = () => {
     echartsDataA2.value = initEcharts('#2E8B57', 1, 'B相')
     echartsDataA3.value = initEcharts('#A52a2a', 1, 'C相')
 
-    if (!dataSocket.socketServe) {
-        console.error('WebSocket 客户端实例不存在')
-        return
-    }
-    if (monitoringPoint.state.comFlag == 0) {
-        return ElMessage({
-            message: '所选监测点离线!',
-            type: 'warning'
-        })
-    }
     let pids = monitoringPoint.state.pid.split(',')
     dataSocket.socketServe.connect(`${url}${adminInfo.id},${monitoringPoint.state.lineId},${pids[pids.length - 2]}`)
     dataSocket.socketServe.registerCallBack('message', (res: any) => {
+        if (res.Flag === false) {
+            return (loading.value = false)
+        }
         txtContent.value = res.value
         let data = JSON.parse(res.value)
         time.value = data.TIME - 0
@@ -777,12 +782,12 @@ const init = () => {
                 iRmsA: data.I.A?.IRMS, //A相电流
                 iRmsB: data.I.B?.IRMS, //B相电流
                 iRmsC: data.I.C?.IRMS, //C相电流
-                v1AngA: data.V.A?.VFUND_ANGLE, //A相基波电压相位
-                v1AngB: data.V.B?.VFUND_ANGLE, //B相基波电压相位
-                v1AngC: data.V.C?.VFUND_ANGLE, //C相基波电压相位
-                i1AngA: data.I.A?.I_ANGLE, //A相基波电流相位
-                i1AngB: data.I.B?.I_ANGLE, //B相基波电流相位
-                i1AngC: data.I.C?.I_ANGLE, //C相基波电流相位
+                v1AngA: steAngle(data.V.A?.VFUND_ANGLE), //A相基波电压相位
+                v1AngB: steAngle(data.V.B?.VFUND_ANGLE), //B相基波电压相位
+                v1AngC: steAngle(data.V.C?.VFUND_ANGLE), //C相基波电压相位
+                i1AngA: steAngle(data.I.A?.I_ANGLE), //A相基波电流相位
+                i1AngB: steAngle(data.I.B?.I_ANGLE), //B相基波电流相位
+                i1AngC: steAngle(data.I.C?.I_ANGLE), //C相基波电流相位
                 freq: data.V.T?.FREQ, //频率
                 freqDev: data.V.T?.DELTA_FREQ, //频率偏差
                 vUnbalance: data.V.T?.V_UNBAN, //电压不平衡度
@@ -826,7 +831,7 @@ const init = () => {
         ]
         spectrumRef.value?.init(data)
         trendRef.value?.init(data)
-
+        loading.value = false
         // console.log('🚀 ~ dataSocket.socketServe.registerCallBack ~ webMsgSend.value:', data)
         setRealData()
     })
@@ -866,6 +871,22 @@ const setRealData = () => {
     //     webMsgSend.value[0].vRmsB == 0 ? 1 : Math.ceil(webMsgSend.value[0].vRmsB)
     // echartsDataV3.value.options.series[0].max =
     //     webMsgSend.value[0].vRmsC == 0 ? 1 : Math.ceil(webMsgSend.value[0].vRmsC)
+    let vMax =
+        Math.ceil(
+            (Math.max(
+                ...[
+                    Math.floor(webMsgSend.value[0].vRmsA * 100) / 100 || 10,
+                    Math.floor(webMsgSend.value[0].vRmsB * 100) / 100 || 10,
+                    Math.floor(webMsgSend.value[0].vRmsC * 100) / 100 || 10
+                ]
+            ) *
+                1.2) /
+                10
+        ) * 10
+
+    echartsDataV1.value.options.series[0].max = vMax
+    echartsDataV2.value.options.series[0].max = vMax
+    echartsDataV3.value.options.series[0].max = vMax
     echartsDataV1.value.options.series[0].data = [
         {
             name: ptName.value == 'star' ? 'A相' : 'AB相', //A相
@@ -894,6 +915,22 @@ const setRealData = () => {
     //     webMsgSend.value[0].iRmsB == 0 ? 1 : Math.ceil(webMsgSend.value[0].iRmsB)
     // echartsDataA3.value.options.series[0].max =
     //     webMsgSend.value[0].iRmsC == 0 ? 1 : Math.ceil(webMsgSend.value[0].iRmsC)
+
+    let aMax =
+        Math.ceil(
+            (Math.max(
+                ...[
+                    Math.floor(webMsgSend.value[0].iRmsA * 100) / 100 || 10,
+                    Math.floor(webMsgSend.value[0].iRmsB * 100) / 100 || 10,
+                    Math.floor(webMsgSend.value[0].iRmsC * 100) / 100 || 10
+                ]
+            ) *
+                1.2) /
+                10
+        ) * 10
+    echartsDataA1.value.options.series[0].max = aMax
+    echartsDataA2.value.options.series[0].max = aMax
+    echartsDataA3.value.options.series[0].max = aMax
     echartsDataA1.value.options.series[0].data = [
         {
             name: 'A相',
@@ -916,9 +953,24 @@ const setRealData = () => {
     ]
     pieChart6.value.initChart()
 }
+const steAngle = (phase: any) => {
+    // 空值判断
+    if (phase === null || phase === undefined) {
+        return null
+    }
+    let normalizedPhase = phase % 360
+    if (normalizedPhase > 180) {
+        normalizedPhase -= 360
+    } else if (normalizedPhase < -180) {
+        normalizedPhase += 360
+    }
+
+    return normalizedPhase
+}
 defineExpose({ setRealData })
 onMounted(() => {
     init()
+
     initRadioCharts()
     getLineDetail({ id: monitoringPoint.state.lineId }).then(res => {
         ptName.value = connection.filter(item => item.value == res.data.ptType)[0].code || ''

src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/spectrum.vue

@@ -92,9 +92,10 @@ const tabsList: any = ref([
         thdDataTdVODatas: null,
         unit: '%',
         title: [
-            0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5,
-            19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5,
-            37.5, 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5
+            0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 
+            // 16.5, 17.5, 18.5,
+            // 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5,
+            // 37.5, 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5
         ],
         data: {},
         echartsData: {}

src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue

@@ -126,7 +126,6 @@ const changetype = (val: any) => {
     reportForm.value = val.reportForm
 }
 const selectChange = () => {
-
     if (tableStore.table.data.length != 0) {
         setTimeout(() => {
             luckysheet && luckysheet?.resize()
@@ -152,6 +151,10 @@ const exportReport = () => {
     })
     exportModelJB(form)
         .then(async res => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
             })

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue

@@ -153,7 +153,7 @@ const typeOptions = ref([
     { label: 'cp95值', value: 4 }
 ])
 onMounted(() => {
-    datePickerRef.value.setTheDate(5)
+    datePickerRef.value.setTheDate(4)
     init()
 })
 const height: any = ref(mainHeight(200, 1))

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue

@@ -181,9 +181,10 @@ const init = () => {
         ]
         if (searchType.value) {
             series.push({
-                name: formData.periodBeginTime + '至' + formData.periodEndTime,
+                name: formData.periodBeginTime + '~' + formData.periodEndTime,
                 type: 'bar',
                 barMaxWidth: 30,
+                
                 // label: {
                 //     show: true,
                 //     position: 'top',
@@ -234,10 +235,19 @@ const init = () => {
                     let msg = ''
                     msg += params[0].name 
                     for (let i in params) {
+                       
                         if (params[i].data == 3.14159) {
-                            msg += '（' + params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': 暂无数据<br/>'
+                             if (params[i].seriesName && params[i].seriesName.includes('~')) {
+                                msg += params[i].marker +  ': 暂无数据<br/>'
+                            } else {
+                                msg += '（' + params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': 暂无数据<br/>'
+                            }
                         } else {
-                            msg += '（' +  params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': ' + params[i].data + '<br/>'
+                            if (params[i].seriesName && params[i].seriesName.includes('~')) {
+                                msg += params[i].marker +  ': ' + params[i].data + '<br/>'
+                            } else {
+                                msg += '（' +  params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': ' + params[i].data + '<br/>'
+                            }
                         }
                     }
                     return msg

src/views/pqs/harmonicMonitoring/monitoringPoint/online/xiebopingpu/index.vue

@@ -103,7 +103,11 @@ const init = () => {
             )
         }
         options.value = {
+            title: {
+                text: formData.harmState == 0 ? '谐波电压频谱' : '谐波电流频谱'
+            }, 
             xAxis: {
+                
                 name: '次数',
                 type: 'category',
                 data: Array.from({ length: 49 }, (_, i) => `${i + 2}次`)

src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue

@@ -4,7 +4,13 @@
         <TableHeader datePicker area showExport>
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable   maxlength="32" show-word-limit placeholder="筛选数据" />
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        maxlength="32"
+                        show-word-limit
+                        placeholder="筛选数据"
+                    />
                 </el-form-item>
             </template>
             <template v-slot:operation>
@@ -29,8 +35,8 @@ defineOptions({
     name: 'harmonic-boot/reate/word'
 })
 const dictData = useDictData()
-//区域联级选择
-const industry = dictData.getBasicData('Interference_Source')
+//行业类型选择
+const industry = dictData.getBasicData('Business_Type')
 //用户信息弹出框
 const tableRef = ref()
 
@@ -50,6 +56,7 @@ const tableStore = new TableStore({
         {
             title: '行业类型',
             field: 'businessType',
+            minWidth: 80,
             formatter: (row: any) => {
                 return industry.find((item: any) => item.id == row.cellValue)?.name || '/'
             }
@@ -57,14 +64,16 @@ const tableStore = new TableStore({
         {
             title: '分类等级',
             field: 'calssificationGrade',
+            minWidth: 80,
             formatter: (row: any) => {
                 return row.cellValue || '/'
             }
         },
-        { title: '电压等级', field: 'voltageScale' },
+        { title: '电压等级', field: 'voltageScale', minWidth: 80 },
         {
             title: '上级变电站',
             field: 'superiorsSubstation',
+            minWidth: 90,
             formatter: (row: any) => {
                 return row.cellValue || '/'
             }
@@ -72,6 +81,7 @@ const tableStore = new TableStore({
         {
             title: '挂接线路',
             field: 'hangLine',
+            minWidth: 80,
             formatter: (row: any) => {
                 return row.cellValue || '/'
             }
@@ -79,6 +89,7 @@ const tableStore = new TableStore({
         {
             title: 'PT变比',
             field: 'pt',
+            minWidth: 80,
             formatter: (row: any) => {
                 return row.row.pt1 + '/' + row.row.pt2
             }
@@ -86,15 +97,16 @@ const tableStore = new TableStore({
         {
             title: 'CT变比',
             field: 'ct',
+            minWidth: 80,
             formatter: (row: any) => {
                 return row.row.ct1 + '/' + row.row.ct2
             }
         },
-        { title: '短路容量(MVA)', field: 'shortCapacity' },
-        { title: '终端容量(MVA)', field: 'deviceCapacity' },
-        { title: '协议容量(MVA)', field: 'dealCapacity' },
-        { title: '谐波情况', field: 'harmDes' },
-        { title: '电能质量情况', field: 'powerDes' }
+        { title: '短路容量(MVA)', field: 'shortCapacity', minWidth: 80 },
+        { title: '终端容量(MVA)', field: 'deviceCapacity', minWidth: 80 },
+        { title: '协议容量(MVA)', field: 'dealCapacity', minWidth: 80 },
+        { title: '谐波情况', field: 'harmDes', minWidth: 80 },
+        { title: '电能质量情况', field: 'powerDes', minWidth: 100 }
     ],
     beforeSearchFun: () => {
         tableStore.table.params.beginTime = tableStore.table.params.startTime

src/views/pqs/harmonicMonitoring/reportForms/region/index.vue

@@ -87,6 +87,10 @@ const exportEvent = () => {
         endTime: TableHeaderRef.value.datePickerRef.timeValue[1]
     })
         .then((res: any) => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
             })