微调

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

src/api/device-boot/Business.ts

@@ -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/event-boot/report.ts

@@ -1,4 +1,5 @@
 import createAxios from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 
 //事件报告
 export function getEventReport(data) {
@@ -15,8 +16,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 +70,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/harmonic.ts

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 export function getHistoryResult(data: any) {
     return request({
         url: '/harmonic-boot/harmonic/getHistoryResult',
@@ -14,5 +14,35 @@ export function exportModelJB(data: any) {
         method: 'post',
         responseType: 'blob',
         data: data
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}

src/api/process-boot/reportForms.ts

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

src/api/system-boot/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'])
@@ -70,6 +71,8 @@ const initChart = () => {
                     const value =
                         item.value === 3.14159 || item.value === 0.14159
                             ? '暂无数据'
+                            : item.value === 0.14158
+                            ? 0
                             : Math.round(item.value * 100) / 100 // 处理特殊值
                     tips += `<div style=" display: flex;justify-content: space-between;">
                            <span>${item.marker}
@@ -154,7 +157,6 @@ const initChart = () => {
         if (params.seriesName == '暂态触发点') {
             emit('triggerPoint', params.data)
         } else {
-
             emit('echartClick', params)
         }
     })

src/components/echarts/MyEchartMap.vue

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

src/components/echarts/analytics.vue

@@ -26,7 +26,7 @@
                         </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-column align="center" prop="number" label="暂降原因"></el-table-column>
                     </el-table>
                 </el-tab-pane>

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" />
+                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex"  @change-value="onAreaChange" />
                 </el-form-item>
                 <slot name="select"></slot>
             </el-form>
@@ -52,7 +52,7 @@
                 <el-button
                     @click="onExport"
                     v-if="showExport"
-                    :loading="tableStore.table.loading"
+                    :loading="tableStore.table.exportLoading"
                     type="primary"
                     icon="el-icon-Download"
                 >
@@ -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'])
+const emit = defineEmits(['selectChange','areaChange'])
 const tableStore = inject('tableStore') as TableStore
 const tableHeader = ref()
 const datePickerRef = ref()
@@ -132,11 +132,17 @@ const headerFormSecondStyleClose = {
     padding: '0'
 }
 
+const onAreaChange = (data) => {
+
+     emit('areaChange', {label: data.label})
+}
+
 watch(
     () => tableStore?.table.params.deptIndex,
     newVal => {
         setTimeout(() => {
             areaRef.value && areaRef.value.change()
+         
         }, 0)
     }
 )

src/components/tree/pqs/areaTree.vue

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

src/components/tree/pqs/bearingTree.vue

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

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>

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

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

src/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/mqtt.ts

@@ -52,11 +52,12 @@ class MQTT {
         }
 
         try {
-            const mqttUrl =
+            // const mqttUrl =
-                localStorage.getItem('MqttUrl') == 'null'
+            //     localStorage.getItem('MqttUrl') == 'null'
-                    ? 'ws://192.168.1.68:8083/mqtt'
+            //         ? 'ws://192.168.1.68:8083/mqtt'
-                    : localStorage.getItem('MqttUrl')
+            //         : localStorage.getItem('MqttUrl')
-
+            const mqttUrl = localStorage.getItem('MqttUrl')
+            if (mqttUrl == 'null' || mqttUrl == null) return
             this.client = mqtt.connect(mqttUrl, this.defaultOptions as IClientOptions)
             this.setupEventListeners()
 

src/utils/tableStore.ts

@@ -47,6 +47,7 @@ export default class TableStore {
         },
         filename: null,
         loading: true,
+        exportLoading: false,
         column: [],
         loadCallback: null,
         exportProcessingData: null,
@@ -84,13 +85,11 @@ export default class TableStore {
             this.initData = JSON.parse(JSON.stringify(this.table.params))
         }
         if (!this.timeAll) {
-            delete this.table.params.startTime;
+            delete this.table.params.startTime
-            delete this.table.params.endTime;
+            delete this.table.params.endTime
-            delete this.table.params.searchBeginTime;
+            delete this.table.params.searchBeginTime
-            delete this.table.params.searchEndTime;
+            delete this.table.params.searchEndTime
-            delete this.table.params.timeFlag;
+            delete this.table.params.timeFlag
-
-      
         }
         createAxios(
             Object.assign(
@@ -130,11 +129,11 @@ export default class TableStore {
      * @param data 携带数据
      */
     onTableAction = (event: string, data: anyObj) => {
-     
         const actionFun = new Map([
             [
                 'search',
                 () => {
+                  
                     this.table.params.pageNum = 1
                     this.index()
                 }
@@ -202,8 +201,9 @@ export default class TableStore {
             [
                 'export',
                 () => {
+                     this.table.exportLoading = true
                     // this.index()
-                    console.log('export')
+                    //console.log('export')
                     let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
                     createAxios(
                         Object.assign(
@@ -213,11 +213,16 @@ export default class TableStore {
                             },
                             requestPayload(this.method, params, this.paramsPOST)
                         )
-                    ).then(res => {
+                    )
+                        .then(res => {
                             this.table.allData = filtration(res.data.records || res.data)
-                        console.log('11111',this.table)
                             this.table.exportProcessingData && this.table.exportProcessingData()
                             this.table.allFlag = data.showAllFlag || true
+                            this.table.exportLoading = false
+                            
+                        })
+                        .catch(() => {
+                            this.table.exportLoading = false
                         })
                 }
             ]

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

@@ -301,7 +301,7 @@ const options1 = [
 const height = mainHeight(20)
 const heightB = mainHeight(448)
 const heightA = mainHeight(180)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})

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

@@ -321,7 +321,7 @@ const options1 = [
 ]
 const height = mainHeight(20)
 const heightB = mainHeight(445)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})

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) {
+    if (equipmentList.value.length == 0) {
-        return ElMessage.warning('请选择用户')
+        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

@@ -205,7 +205,7 @@ const props = defineProps(['rowList'])
 const harmonic = harmonicOptions.filter(item => item.value < 26)
 const currentLod = ref(false)
 const monitoringPoint = useMonitoringPoint()
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const datePickerRef = ref()
 const height = mainHeight(80).height
@@ -734,6 +734,7 @@ const choose = (e: any) => {
 
     uploadExcel(e.raw, form).then(res => {
         ElMessage.success('导入成功')
+         onSubmit()
     })
 }
 const tabChange = (e: any) => {

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: [

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

@@ -187,7 +187,7 @@ const tableStore: any = new TableStore({
         { field: 'createBy', title: '创建者' },
         { field: 'createTime', title: '创建日期' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
@@ -259,7 +259,7 @@ const tableStore: any = new TableStore({
     ],
 
     loadCallback: () => {
-        console.log(tableStore.table.data)
+       
     }
 })
 

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,7 @@
                 ></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 +83,7 @@
                                     v-else
                                     class="box-item"
                                     title="确定重启吗？"
-                                    placement="bottom"
+                                    placement="left"
                                     @confirm="restart(data)"
                                 >
                                     <template #actions="{ confirm, cancel }">
@@ -141,7 +141,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 +149,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 +209,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 +241,7 @@ const tableRef = ref()
 const processNo = ref('')
 const ruleFormRef = ref()
 const dataSource: any = ref([])
+const deviceInfoList: any = ref([])
 const defaultProps = {
     children: 'deviceInfoList',
     label: 'name'
@@ -288,7 +290,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '最大监测点数量',
+            title: '最大终端数量',
             field: 'nodeDevNum'
         },
         {
@@ -315,7 +317,7 @@ const tableStore = new TableStore({
         { title: '描述', field: 'remark' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -350,7 +352,7 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         askRestartProcess({
-                            deviceRebootType: null,
+                            deviceRebootType: 1,
                             nodeId: row.id,
                             processNo: 1
                         }).then(res => {
@@ -373,12 +375,42 @@ 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 +427,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 +447,27 @@ 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
         })
 
@@ -432,9 +478,9 @@ const currentChangeEvent = () => {
 const restart = (data: any) => {
    // console.log('🚀 ~ restart ~ data:', data)
     askRestartProcess({
-        deviceRebootType: data.processNo,
+        deviceRebootType: null,
         nodeId: nodeId.value,
-        processNo: 2
+        processNo: data.processNo
     }).then(res => {
         ElMessage.success('重启成功')
         currentChangeEvent()

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

@@ -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> -->
                 <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.filterName"
                         @keyup="searchEvent"
+                        maxlength="32"
+                        show-word-limit
                         placeholder="输入关键字筛选"
                     />
                 </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"
@@ -251,6 +253,7 @@ const tableStore = new TableStore({
     }
 })
 tableStore.table.params.teriminal = ''
+tableStore.table.params.teriminalstatus = ''
 tableStore.table.params.state = ''
 tableStore.table.params.program = ''
 tableStore.table.params.searchEvent = ''

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

@@ -1694,7 +1694,7 @@ import { useDictData } from '@/stores/dictData'
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getYwZtSubstation } from '@/api/device-boot/device'
-const size = ref(23)
+const size = ref(19)
 const TerminalRef = ref()
 const pageHeight = mainHeight(20)
 const Height = mainHeight(100)
@@ -2397,10 +2397,10 @@ const onsubmit = () => {
 /**
  * 提交数据
  */
-const submitData = () => {
+const submitData = async () => {
     const project = JSON.parse(JSON.stringify(AddProjectBO.value))
-
+    await mainForm.value.validate((valid: any) => {
-    // project: JSON.stringify(project)
+        if (valid) {
             addTerminal(project).then((res: any) => {
                 ElMessage({
                     type: 'success',
@@ -2412,11 +2412,17 @@ const submitData = () => {
                 treedata()
             })
         }
+    })
+    // project: JSON.stringify(project)
+    
+}
 /**
  * 修改数据
  */
-const updateDate = () => {
+const updateDate = async () => {
     // console.log("updateProject:", this.updateProject);
+    await mainForm.value.validate((valid: any) => {
+        if (valid){
              let data = updateProject.value
             updateTerminal(data).then((res: any) => {
                 ElMessage({
@@ -2426,6 +2432,10 @@ const updateDate = () => {
                 pageStatus.value = 1
                 treedata()
             })
+
+        }
+    })
+   
 }
 const updateProjectF = () => {
     updateProject.value = {

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(() => {
@@ -614,6 +616,7 @@ const checkLeft = (checkedNodes: any, checkedKeys: any) => {
 //下节点选择
 const checkRight = (checkedNodes: any, checkedKeys: any) => {
     maintenanceData.downNode = checkedNodes.id
+  
      if (maintenanceData.downNode === maintenanceData.upNode) {
          menuTreeLeft.value?.setCheckedKeys([])
          maintenanceData.upNode = ''
@@ -625,32 +628,49 @@ const checkRight = (checkedNodes: any, checkedKeys: any) => {
 
 //节点维护提交
 const maintenanceOnsubmit = () => {
-    for (let i = 0; i < bind.value.length; i++) {
+   
-        if (bind.value[i][0] == maintenanceData.upNode) {
+    if(maintenanceData.downNode == '' || maintenanceData.upNode == '') {
-            for (let j = 0; j < bind.value.length; j++) {
-                if (bind.value[j][1] == maintenanceData.downNode) {
         ElMessage({
             type: 'warning',
-                        message: '上下节点无法选择相同母线！！！'
+            message: '请确保上下节点各自选择一个母线！'
         })
          return
     }
-            }
-            return
-        }
-    }
 
-    if (bindLevel.value != 5) {
+
-        for (let i = 0; i < bind.value.length; i++) {
+    if (maintenanceData.upNode == maintenanceData.downNode) {
-            if (maintenanceData.upNode == bind.value[i][1] && maintenanceData.downNode == bind.value[i][0]) {
         ElMessage({
             type: 'warning',
-                    message: '上下节点无法选择相同母线！！！'
+            message: '上下节点无法选择相同母线！'
         })
-                return
-            }
-        }
     }
+    // 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,9 +53,9 @@
                 </el-col>
                 <el-col :span="14">
                     <div class="box">
-                        <el-form :model="form" label-width="100px" ref="ruleFormRef">
+                        <el-form :model="form" label-width="100px" ref="ruleFormRef" :rules="rules">
-                            <el-form-item label="名称:">
+                            <el-form-item label="名称:" prop="tpName">
-                                <el-input v-model="form.tpName" placeholder="请输入"></el-input>
+                                <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>
@@ -122,13 +122,8 @@ const menuTree = ref()
 const TableHeaderRef = ref()
 
 const rules = reactive({
-    name: [{ required: true, message: '名称不可为空', trigger: 'blur' }],
+    tpName: [{ 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' }]
 })
 
 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%">

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

@@ -115,7 +115,7 @@
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="装机容量（MW）">
-                {{ proviteData?.ratePower }}
+                {{ detailData?.ratePower }}
             </el-descriptions-item>
             <el-descriptions-item
                 label="PCC供电设备容量（MVA）"
@@ -332,6 +332,7 @@ const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
+
     try {
         if (props.update) {
             await getUserReportUpdateById(props.id || queryId).then(res => {
@@ -341,6 +342,7 @@ const getInfo = async () => {
         } else {
             await getUserReportById(props.id || queryId).then(res => {
                 detailData.value = res.data
+              
                 getProviteData()
             })
         }

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

@@ -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>
@@ -134,7 +134,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
 const heightTab = mainHeight(82)
-const size = ref(23)
+const size = ref(19)
 const addTreeRef = ref()
 const editorRef = ref()
 const dialogVisible = ref(false)

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

@@ -26,7 +26,7 @@ defineOptions({
 })
 const emits = defineEmits(['algorithm'])
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 
 const popupEditFlag = ref(false)
 

src/views/pqs/database/case/components/drawer.vue

@@ -15,16 +15,16 @@
                 <el-collapse-item title="国家电网有限公司企业标准" name="2">
                     <!-- <el-empty description="暂无数据" class="custom-empty iframe" /> -->
                     <div :style="`overflow: auto;`" class="iframe">
-                        <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
+                        <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
-                        <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url"
+                        <vue-office-excel v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')" :src="url"
                             :options="excelOptions" />
-                        <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url" /> -->
+                        <!-- <vue-office-pdf v-if="urlKey.includes('.pdf')" :src="url" /> -->
-                        <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
+                        <iframe v-if="urlKey.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
                         <img v-if="
-                            url.includes('.png') ||
+                            urlKey.includes('.png') ||
-                            url.includes('.jpg') ||
+                            urlKey.includes('.jpg') ||
-                            url.includes('.gif') ||
+                            urlKey.includes('.gif') ||
-                            url.includes('.bmp')
+                            urlKey.includes('.bmp')
                         " :src="url" />
                     </div>
                 </el-collapse-item>
@@ -45,6 +45,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
 import { ElMessage } from 'element-plus'
 import { uploadFile, getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
 import { addStandardCase, queryStandardCase } from '@/api/supervision-boot/database/index'
+import { previewFile } from '@/utils/fileDownLoad'
 const adminInfo = useAdminInfo()
 const drawer = ref(false)
 const activeName = ref('2')
@@ -53,17 +54,14 @@ const url = ref('')
 const excelOptions = ref({})
 const information = adminInfo.roleCode.includes('information_info')
 
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
-const open = (row: any) => {
-    // console.log('🚀 ~ open ~ row:', row)
-    // url.value = row
-    drawer.value = true
-    if(VITE_FLAG){
-        url.value = `/api-docx/excelreport` + row
-        excelOptions.value = { xls: row.split('.')[1] == 'xls' ? true : false }
-    }else{
 
-    }
+const urlKey=ref('')
+const open = async (row: any) => {
+    drawer.value = true
+    urlKey.value=row
+        const previewUrl = await previewFile(row);
+        url.value = previewUrl;
+        
     // getFileNameAndFilePath({ filePath: row }).then(res => {
     //     url.value = res.data.url
     // })

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

@@ -64,7 +64,7 @@ defineOptions({
 const excelOptions = ref({})
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const treeRef = ref()
 const addTreeRef = ref()
 const url = ref('')
@@ -88,6 +88,7 @@ const handleNodeClick = (data: any, node: any) => {
     if (data?.url != null && data?.url != '') {
         flag.value = true
         urlKey.value = data.url
+        console.log('urlKey.value',urlKey.value)
         setTimeout(async () => {
              if(VITE_FLAG){
                    url.value = `/api-docx/excelreport` + data.url

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/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
@@ -131,7 +131,7 @@ const tableStore = new TableStore({
         { field: 'scale', title: '电压等级', minWidth: '110' },
         // {
         //     field: 'advanceType',
-        //     title: '暂降类型',
+        //     title: '触发类型',
         //     minWidth: '90',
         //     formatter: (row: any) => {
         //         return row.cellValue || '其他'
@@ -147,7 +147,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'eventType',
-            title: '暂态统计类型',
+            title: '触发类型',
             minWidth: '120',
             formatter: (row: any) => {
                 return eventList.filter(item => item.id === row.cellValue)[0]?.name
@@ -179,7 +179,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/harmonicDistortionRate/index1.vue

@@ -0,0 +1,189 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker area showExport>
+            <template #select>
+                    <el-form-item label="统计类型:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.statisticalType"
+                            placeholder="请选择统计类型"
+                            value-key="id"
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in classificationData"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="电压等级:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.scale"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择电压等级"
+                            style="width: 100%"
+                            value-key="id"
+                        >
+                            <el-option
+                                v-for="item in voltageleveloption"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="终端厂家:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.manufacturer"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择终端厂家"
+                            style="width: 100%"
+                            value-key="id"
+                        >
+                            <el-option
+                                v-for="(item, index) in terminaloption"
+                                :key="index"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item> 
+                    
+                    <el-form-item label="干扰源类型:">
+                        <el-select
+                            v-model="tableStore.table.params.loadType"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择干扰源类型"
+                            style="width: 100%"
+                            value-key="id"
+                        >
+                            <el-option
+                                v-for="(item, index) in interfereoption"
+                                :key="index"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </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-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, watch } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+
+defineOptions({
+    name: 'harmonic-boot/area/harmonicDistortionRate'
+})
+
+const dictData = useDictData()
+//字典获取电压等级
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+//字典获取终端厂家
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+//字典获取统计类型
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+//字典获取干扰源类型
+const interfereoption = dictData.getBasicData('Interference_Source')
+const sign = dictData.getBasicData('power_flag')
+
+
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/tHDistortion/getTHDistortionTableData',
+    isWebPaging: true,
+    method: 'POST',
+     column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },  
+        {
+            field: 'subStation',
+            title: '变电站',
+             minWidth: 150
+        },
+         {
+            field: 'city',
+            title: '所在地市',
+            minWidth: 100
+        },
+        {
+            field: 'manufacturer',
+            title: '终端厂家',
+            minWidth: 80
+        },
+         {
+            field: 'deviceName',
+            title: '终端名称',
+            minWidth: 80
+        },
+      
+        {
+            title: '网络参数',
+            field: 'ip',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 120
+        },
+        {
+            title: '监测点名称',
+            field: 'lineName',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 100
+        },
+        {
+            title: '总谐波畸变率(%)',
+            field: 'distortion',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue == 3.14159 ? '暂无数据' : row.cellValue
+            },
+            minWidth: 120
+        }
+    ],
+
+  
+})
+
+tableStore.table.params.statisticalType = classificationData[0]
+tableStore.table.params.scale = []
+tableStore.table.params.manufacturer = []
+tableStore.table.params.loadType = []
+tableStore.table.params.serverName = 'harmonicBoot'
+tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
+provide('tableStore', tableStore)
+
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>

src/views/pqs/harmonicMonitoring/area/onlinerate/components/charts.vue

@@ -107,7 +107,7 @@ const tableStore = new TableStore({
                     var tips = ''
 
                     for (var i = 0; i < params.length; i++) {
-                        if (params[i].value == 1) {
+                        if (params[i].value == 3.14159) {
                             tips += params[i].name + '</br>'
                             tips += params[i].marker + '在线率:暂无数据'
                         } else {
@@ -143,7 +143,21 @@ const tableStore = new TableStore({
                             //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
                             // 定制显示（按顺序）
                             color: function (params: any) {
-                                if (params.value >= 90) {
+                                if (params.value == 3.14159) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                }else if (params.value >= 90) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -171,7 +185,7 @@ const tableStore = new TableStore({
                                         ],
                                         false
                                     )
-                                } else if (params.value <= 60 && params.value > 1) {
+                                } else if (params.value > 0 && params.value <= 60) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -180,12 +194,12 @@ const tableStore = new TableStore({
                                         [
                                             {
                                                 offset: 1,
-                                                color: '#A52a2a'
+                                                color: '#CC0100'
                                             }
                                         ],
                                         false
                                     )
-                                } else if (params.value > 0 && params.value <= 1) {
+                                } else if (params.value == 0) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,

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

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader datePicker ref="header">
+        <TableHeader area datePicker ref="header">
             <template v-slot:select>
                 <el-form-item label="电网标志">
                     <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
@@ -11,82 +11,119 @@
         </TableHeader>
         <div v-loading="tableStore.table.loading" class="pr10">
             <el-row>
-                <el-col :span="12" class="pd10">
+                <el-col :span="12" class="pd10" v-if="!VITE_FLAG">
-                    <el-tag style="background: #339966;" class="tag" size="small">5级</el-tag>
+                    <el-tag style="background: #339966" class="tag" size="small">5级</el-tag>
-                    <span style="color: #339966;" class="text">:优秀--(4.5,5]</span>
+                    <span style="color: #339966" class="text">:优秀--(4.5,5]</span>
-                    <el-tag style="background: #3399ff;" class="tag" size="small">4级</el-tag>
+                    <el-tag style="background: #3399ff" class="tag" size="small">4级</el-tag>
-                    <span style="color: #3399ff;" class="text">:良好--(4,4.5]</span>
+                    <span style="color: #3399ff" class="text">:良好--(4,4.5]</span>
-                    <el-tag style="background: #ffcc33;" class="tag" size="small">3级</el-tag>
+                    <el-tag style="background: #ffcc33" class="tag" size="small">3级</el-tag>
-                    <span style="color: #ffcc33;" class="text">:合格--(3,4]</span>
+                    <span style="color: #ffcc33" class="text">:合格--(3,4]</span>
-                    <el-tag style="background: #ff9900;" class="tag" size="small">2级</el-tag>
+                    <el-tag style="background: #ff9900" class="tag" size="small">2级</el-tag>
-                    <span style="color: #ff9900;" class="text">:较差--(2,3]</span>
+                    <span style="color: #ff9900" class="text">:较差--(2,3]</span>
-                    <el-tag style="background: #A52a2a;" class="tag" size="small">1级</el-tag>
+                    <el-tag style="background: #a52a2a" class="tag" size="small">1级</el-tag>
-                    <span style="color: #A52a2a;" class="text">:极差--[1,2]</span>
+                    <span style="color: #a52a2a" class="text">:极差--[1,2]</span>
                     <div :style="{ height: layout.height }" style="overflow-y: auto" class="mt10">
                         <div class="cardBox">
                             <el-card v-for="(item, index) in tableStore.table.data" :key="index">
                                 <template #header>
-                                    <div style="cursor: pointer;">
+                                    <div style="cursor: pointer">
-                                        <el-tag v-if="item.data == 3.14159 || item.data == 0"
+                                        <el-tag
-                                            style="background: #ccc; color: #fff" size="small">
+                                            v-if="item.data == 3.14159 || item.data == 0"
+                                            style="background: #ccc; color: #fff"
+                                            size="small"
+                                        >
                                             无
                                         </el-tag>
-                                        <el-tag v-if="4.5 < item.data && item.data <= 5 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #339966; color: #fff" size="small">
+                                            v-if="4.5 < item.data && item.data <= 5 && item.data !== 3.14159"
+                                            style="background: #339966; color: #fff"
+                                            size="small"
+                                        >
                                             5级
                                         </el-tag>
-                                        <el-tag v-if="4 < item.data && item.data <= 4.5 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #3399ff; color: #fff" size="small">
+                                            v-if="4 < item.data && item.data <= 4.5 && item.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="3 < item.data && item.data <= 4 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ffcc33; color: #fff" size="small">
+                                            v-if="3 < item.data && item.data <= 4 && item.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff"
+                                            size="small"
+                                        >
                                             3级
                                         </el-tag>
-                                        <el-tag v-if="2 < item.data && item.data <= 3 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ff9900; color: #fff" size="small">
+                                            v-if="2 < item.data && item.data <= 3 && item.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="1 <= item.data && item.data <= 2 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #A52a2a; color: #fff" size="small">
+                                            v-if="1 <= item.data && item.data <= 2 && item.data !== 3.14159"
+                                            style="background: #a52a2a; color: #fff"
+                                            size="small"
+                                        >
                                             1级
                                         </el-tag>
                                         <span>{{ item.name }}</span>
                                     </div>
-
-
-
                                 </template>
                                 <div class="card-content">
                                     <div class="card-item" v-for="(item1, index1) in item.children" :key="index1">
-                                        <el-tag v-if="item1.data == 3.14159 || item1.data == 0"
+                                        <el-tag
-                                            style="background: #ccc; color: #fff" size="small">
+                                            v-if="item1.data == 3.14159 || item1.data == 0"
+                                            style="background: #ccc; color: #fff"
+                                            size="small"
+                                        >
                                             无
                                         </el-tag>
-                                        <el-tag v-if="4.5 < item1.data && item1.data <= 5 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #339966; color: #fff" size="small">
+                                            v-if="4.5 < item1.data && item1.data <= 5 && item1.data !== 3.14159"
+                                            style="background: #339966; color: #fff"
+                                            size="small"
+                                        >
                                             5级
                                         </el-tag>
-                                        <el-tag v-if="4 < item1.data && item1.data <= 4.5 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #3399ff; color: #fff" size="small">
+                                            v-if="4 < item1.data && item1.data <= 4.5 && item1.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="3 < item1.data && item1.data <= 4 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ffcc33; color: #fff" size="small">
+                                            v-if="3 < item1.data && item1.data <= 4 && item1.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff"
+                                            size="small"
+                                        >
                                             3级
                                         </el-tag>
-                                        <el-tag v-if="2 < item1.data && item1.data <= 3 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ff9900; color: #fff" size="small">
+                                            v-if="2 < item1.data && item1.data <= 3 && item1.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff"
+                                            size="small"
+                                        >
                                             2级
                                         </el-tag>
-                                        <el-tag v-if="1 <= item1.data && item1.data <= 2 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #A52a2a; color: #fff" size="small">
+                                            v-if="1 <= item1.data && item1.data <= 2 && item1.data !== 3.14159"
+                                            style="background: #a52a2a; color: #fff"
+                                            size="small"
+                                        >
                                             1级
                                         </el-tag>
                                         <span class="xdf">
-                                            <el-tooltip :show-arrow="false" :offset="-0" :content="item1.name"
+                                            <el-tooltip
-                                                popper-class="atooltip" placement="bottom-start">
+                                                :show-arrow="false"
+                                                :offset="-0"
+                                                :content="item1.name"
+                                                placement="bottom-start"
                                              
+                                            >
                                                 <div class="tooltipText">
                                                     {{ item1.name }}
                                                 </div>
@@ -98,34 +135,26 @@
                         </div>
                     </div>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="VITE_FLAG ? 24 : 12">
                     <my-echart class="tall" :options="echartList" />
-                    <div class="tall">
+                    <div class="tall mb10">
                         <vxe-table height="auto" auto-resize :data="tableStore.table.data" v-bind="defaultAttribute">
-
                             <vxe-column field="name" title="名称"></vxe-column>
                             <vxe-column field="zc" title="综合评估值">
                                 <template #default="scope">
-                                    <span v-if="scope.row.data == 3.14159" style="color: #000;">
+                                    <span v-if="scope.row.data == 3.14159" style="color: #000">暂无数据</span>
-                                        暂无数据
+                                    <span v-if="scope.row.data !== 3.14159" style="color: #000">
-                                    </span>
-                                    <span v-if="scope.row.data !== 3.14159" style="color: #000;">
                                         {{ scope.row.data }}
                                     </span>
                                 </template>
                             </vxe-column>
                             <vxe-column field="monitors" title="监测点个数(个)"></vxe-column>
-                            <vxe-column field="level" title="评估等级">
+                            <vxe-column field="level" title="评估等级"></vxe-column>
-
-                            </vxe-column>
                         </vxe-table>
                     </div>
-
                 </el-col>
             </el-row>
         </div>
-
-
     </div>
 </template>
 <script setup lang="ts">
@@ -138,14 +167,22 @@ import TableStore from '@/utils/tableStore'
 import { ref, onMounted, provide } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import * as echarts from 'echarts/core'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
 defineOptions({
-    name: 'harmonic-boot/qydetailedAnalysis/pollutionqy'
+    name: 'harmonic-boot/area/powerAssessment'
 })
 const dictData = useDictData()
 const echartList = ref({})
 const sign = dictData.getBasicData('power_flag')
 const header = ref()
-const options = dictData.getBasicData('Pollution_Statis', ['I_Neg', 'V_Inharm', 'V_Dev', 'V_Unbalance', 'Plt', 'Freq_Dev'])
+const options = dictData.getBasicData('Pollution_Statis', [
+    'I_Neg',
+    'V_Inharm',
+    'V_Dev',
+    'V_Unbalance',
+    'Plt',
+    'Freq_Dev'
+])
 const tableStore = new TableStore({
     url: '/harmonic-boot/comAccess/getComAccessData',
     method: 'POST',
@@ -153,10 +190,6 @@ const tableStore = new TableStore({
     loadCallback: () => {
         histogram(tableStore.table.data)
         header.value.areaRef.change()
-        
-
-
-
     }
 })
 provide('tableStore', tableStore)
@@ -167,11 +200,8 @@ tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 
 tableStore.table.params.statisticalType = {}
 
-
 // 柱状图数据处理
 const histogram = (res: any) => {
- 
-
     echartList.value = {
         title: {
             text: '区域'
@@ -208,11 +238,10 @@ const histogram = (res: any) => {
                         texts.push('4级')
                     } else if (value == 5) {
                         texts.push('5级')
-
                     }
                     return texts
                 }
-            },
+            }
         },
 
         options: {
@@ -222,10 +251,10 @@ const histogram = (res: any) => {
                     name: '评估值',
                     type: 'bar',
                     data: res.map((item: any) => {
-                        return item.data == 3.14159 ? 0.14159 : item.data
+                        return item.data == 3.14159 ? 0.14159 : item.data == 0 ? 0.14158 : item.data
                     }),
                     barMaxWidth: 30,
-
+                    barMinHeight: 10,
                     itemStyle: {
                         normal: {
                             // 随机显示
@@ -234,44 +263,106 @@ const histogram = (res: any) => {
                             // 定制显示（按顺序）
                             color: function (params) {
                                 if (4.5 < params.value && params.value <= 5 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
-                                            color: '#339966',
+                                                color: '#339966'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (4 < params.value && params.value <= 4.5 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#3399FF'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (3 < params.value && params.value <= 4 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#FFCC33'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (2 < params.value && params.value <= 3 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#FF9900'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (params.value >= 1 && params.value <= 2 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#A52a2a'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (params.value == 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
-                                            color: "#999999"
+                                                color: '#ccc'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (params.value == 0.14158) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                }
                             }
                         }
-                        },
                     },
                     markLine: {
                         silent: false,
@@ -283,90 +374,81 @@ const histogram = (res: any) => {
                         emphasis: {
                             lineStyle: {
                                 width: 1
-                            },
+                            }
                         },
                         data: [
-
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 1,
                                 lineStyle: {
-                                    color: '#A52a2a',
+                                    color: '#A52a2a'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#A52a2a',
+                                        color: '#A52a2a'
-
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 2,
                                 lineStyle: {
-                                    color: '#FF9900',
+                                    color: '#FF9900'
-
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#FF9900',
+                                        color: '#FF9900'
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 3,
                                 lineStyle: {
-                                    color: '#FFCC33',
+                                    color: '#FFCC33'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#FFCC33',
+                                        color: '#FFCC33'
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 4,
                                 lineStyle: {
-                                    color: '#3399FF',
+                                    color: '#3399FF'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#3399FF',
+                                        color: '#3399FF'
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 5,
                                 lineStyle: {
-                                    color: '#339966',
+                                    color: '#339966'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#339966',
+                                        color: '#339966'
-
+                                    }
                                 }
                             }
-                            },
                         ]
-                    },
+                    }
-
                 }
             ]
         }
@@ -397,7 +479,6 @@ const layout1 = mainHeight(93) as any
 }
 
 :deep(.cardBox) {
-
     box-sizing: border-box;
     overflow: auto;
     display: grid;
@@ -410,8 +491,6 @@ const layout1 = mainHeight(93) as any
         background-image: linear-gradient(var(--el-color-primary), var(--el-color-primary-light-3));
         font-weight: bold;
 
-
-
         .el-card__header {
             padding: 10px !important;
             color: #fff;
@@ -420,7 +499,6 @@ const layout1 = mainHeight(93) as any
                 display: flex;
                 justify-content: space-between;
             }
-
         }
 
         .el-card__body {
@@ -440,7 +518,6 @@ const layout1 = mainHeight(93) as any
                 width: 50%;
                 display: flex;
                 cursor: pointer;
-
             }
 
             .xdf {
@@ -456,11 +533,8 @@ const layout1 = mainHeight(93) as any
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 margin-left: 5px;
-
-            }
-
             }
         }
-
+    }
 }
 </style>

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

@@ -75,7 +75,12 @@
                     </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-option
+                                v-for="item in sign"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.algoDescribe"
+                            />
                         </el-select>
                     </el-form-item>
                 </template>
@@ -98,6 +103,7 @@
         </div>
     </div>
 </template>
+
 <script lang="ts" setup>
 import { ref, onMounted, watch } from 'vue'
 import { useDictData } from '@/stores/dictData'
@@ -158,6 +164,8 @@ const tableStore = new TableStore({
             title: '电压等级',
             field: 'voltageLevel',
             align: 'center',
+            minWidth: 80,
+
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -166,6 +174,7 @@ const tableStore = new TableStore({
             title: '网络参数',
             field: 'networkParam',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -174,6 +183,7 @@ const tableStore = new TableStore({
             title: '监测点名称',
             field: 'lineName',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -182,6 +192,7 @@ const tableStore = new TableStore({
             title: '厂家',
             field: 'factoryName',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -190,6 +201,7 @@ const tableStore = new TableStore({
             title: '谐波电压(%)',
             field: 'harmonicVoltage',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -198,6 +210,7 @@ const tableStore = new TableStore({
             title: '电压偏差(%)',
             field: 'voltageOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -206,6 +219,7 @@ const tableStore = new TableStore({
             title: '三相电压不平衡度(%)',
             field: 'voltageUnbalance',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -214,6 +228,7 @@ const tableStore = new TableStore({
             title: '间谐波电压含有率(%)',
             field: 'interHarmonic',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -222,6 +237,7 @@ const tableStore = new TableStore({
             title: '谐波电流(%)',
             field: 'harmonicCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -230,6 +246,7 @@ const tableStore = new TableStore({
             title: '负序电流(%)',
             field: 'negativeCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -238,6 +255,7 @@ const tableStore = new TableStore({
             title: '频率偏差(%)',
             field: 'freqOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -246,6 +264,7 @@ const tableStore = new TableStore({
             title: '闪变(%)',
             field: 'flicker',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -316,6 +335,7 @@ onMounted(() => {
     tableStore.index()
 })
 </script>
+
 <style lang="scss" scoped>
 // .online {
 //     width: 100%;

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

@@ -0,0 +1,253 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker area showExport>
+            <template #select>
+                    <el-form-item label="统计类型:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.statisticalType"
+                            placeholder="请选择统计类型"
+                            value-key="id"
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in classificationData"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="电压等级:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.scale"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择电压等级"
+                            style="width: 100%"
+                            value-key="id"
+                        >
+                            <el-option
+                                v-for="item in voltageleveloption"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="终端厂家:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.manufacturer"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择终端厂家"
+                            style="width: 100%"
+                            value-key="id"
+                        >
+                            <el-option
+                                v-for="(item, index) in terminaloption"
+                                :key="index"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item> 
+                    
+                    <el-form-item label="干扰源类型:">
+                        <el-select
+                            v-model="tableStore.table.params.loadType"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择干扰源类型"
+                            style="width: 100%"
+                            value-key="id"
+                        >
+                            <el-option
+                                v-for="(item, index) in interfereoption"
+                                :key="index"
+                                :label="item.name"
+                                :value="item"
+                            ></el-option>
+                        </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-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, watch } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+
+defineOptions({
+    name: 'harmonic-boot/area/qualifiedRate'
+})
+
+const dictData = useDictData()
+//字典获取电压等级
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+//字典获取终端厂家
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+//字典获取统计类型
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+//字典获取干扰源类型
+const interfereoption = dictData.getBasicData('Interference_Source')
+const sign = dictData.getBasicData('power_flag')
+
+
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/steadyQualify/getSteadyQualifyTableData',
+    isWebPaging: true,
+    method: 'POST',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+       
+        {
+            field: 'subStation',
+            title: '变电站',
+             minWidth: 150
+        },
+         {
+            field: 'city',
+            title: '所在地市',
+            minWidth: 100
+        },   
+         {
+            field: 'manufacturer',
+            title: '终端厂家',
+            minWidth: 80
+        },
+         {
+            field: 'deviceName',
+            title: '终端名称',
+            minWidth: 80
+        },
+        {
+            title: '网络参数',
+            field: 'ip',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 120
+        },
+        {
+            title: '监测点名称',
+            field: 'lineName',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 100
+        },
+       
+        {
+            title: '谐波电压(%)',
+            field: 'harmonicVoltage',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '电压偏差(%)',
+            field: 'voltageOffset',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '三相电压不平衡度(%)',
+            field: 'voltageUnbalance',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '间谐波电压含有率(%)',
+            field: 'interHarmonic',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '谐波电流(%)',
+            field: 'harmonicCurrent',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '负序电流(%)',
+            field: 'negativeCurrent',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '频率偏差(%)',
+            field: 'freqOffset',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '闪变(%)',
+            field: 'flicker',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        }
+    ],
+
+
+})
+
+tableStore.table.params.statisticalType = classificationData[0]
+tableStore.table.params.scale = []
+tableStore.table.params.manufacturer = []
+tableStore.table.params.loadType = []
+tableStore.table.params.serverName = 'harmonicBoot'
+tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
+provide('tableStore', tableStore)
+
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>

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

@@ -194,7 +194,7 @@ const dotList: any = ref({})
 const height = mainHeight(20)
 const heightB = mainHeight(70)
 const harmonic = harmonicOptions.slice(1)
-const size = ref(23)
+const size = ref(19)
 const showTabs = ref(false)
 const loadDataOptions: any = ref([])
 const form: any = reactive({

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

@@ -136,7 +136,7 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'frequencyMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -144,7 +144,15 @@ const tableStore = new TableStore({
                 },
                 {
                     field: 'frequencyBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'frequencyDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -165,7 +173,7 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'voltageMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -173,7 +181,15 @@ const tableStore = new TableStore({
                 },
                 {
                     field: 'voltageBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'voltageDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -194,15 +210,24 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'harmonicVoltageMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
                     }
                 },
+
                 {
                     field: 'harmonicVoltageBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'harmonicVoltageDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -223,7 +248,7 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'harmonicCurrentMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -231,7 +256,15 @@ const tableStore = new TableStore({
                 },
                 {
                     field: 'harmonicCurrentBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'harmonicCurrentDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -252,7 +285,7 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'threePhaseVoltageMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -260,7 +293,15 @@ const tableStore = new TableStore({
                 },
                 {
                     field: 'threePhaseVoltageBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'threePhaseVoltageDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -281,7 +322,7 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'flickerMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -289,7 +330,15 @@ const tableStore = new TableStore({
                 },
                 {
                     field: 'flickerBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'flickerDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -310,7 +359,7 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'negativeMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -318,7 +367,15 @@ const tableStore = new TableStore({
                 },
                 {
                     field: 'negativeBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'negativeDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -339,7 +396,7 @@ const tableStore = new TableStore({
             children: [
                 {
                     field: 'interHarmonicMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                     minWidth: '140px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue
@@ -347,7 +404,15 @@ const tableStore = new TableStore({
                 },
                 {
                     field: 'interHarmonicBiLi',
-                    title: '超标占比(%)',
+                    title: '累计占比(%)',
+                    minWidth: '100px',
+                    formatter: (row: any) => {
+                        return row.cellValue == -1 ? '/' : row.cellValue
+                    }
+                },
+                {
+                    field: 'interHarmonicDayAvgBiLi',
+                    title: '日均占比(%)',
                     minWidth: '100px',
                     formatter: (row: any) => {
                         return row.cellValue == -1 ? '/' : row.cellValue

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 || '/'
             }
@@ -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 || '/'
             }
@@ -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/monitoringPoint/online/index.vue

@@ -15,7 +15,7 @@
                 ></PointTree>
             </pane>
             <pane>
-                <div style="position: relative; height: 100%">
+                <div style="position: relative; height: 100%; width: 100%">
                     <el-tabs
                         v-model="activeName"
                         type="border-card"
@@ -41,9 +41,9 @@
                         <el-tab-pane label="监测点运行状态" name="6" lazy v-if="!isReload">
                             <Yunxingzhuangtai v-if="activeName == '6'" />
                         </el-tab-pane>
-                        <!-- <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload && !VITE_FLAG">
+                        <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload && !VITE_FLAG && !VITE_FLAG1">
                             <Shishishuju v-if="activeName == '7'" />
-                        </el-tab-pane> -->
+                        </el-tab-pane>
                         <el-tab-pane label="统计报表" name="8" lazy v-if="!isReload && VITE_FLAG">
                             <StatisticalReport v-if="activeName == '8'" />
                         </el-tab-pane>
@@ -76,6 +76,7 @@ import Shishishuju from './shishishuju/index.vue'
 import { useRoute } from 'vue-router'
 import StatisticalReport from './statisticalReport/index.vue'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+const VITE_FLAG1 = import.meta.env.VITE_NAME == 'hainan'
 import router from '@/router'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { id } from 'element-plus/es/locale'
@@ -85,7 +86,7 @@ defineOptions({
 const route = useRoute()
 const monitoringPoint = useMonitoringPoint()
 const pointTree = ref()
-const size = ref(23)
+const size = ref(19)
 const isReload = ref(false)
 const height = mainHeight(40)
 const activeName = ref('2')

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

@@ -744,7 +744,8 @@ const initEcharts = (color: string, key: number, name: string) => {
 }
 //渲染echarts
 const init = () => {
-    const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.68:10407/api/pushMessage/'
+    loading.value = true
+    const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.67:10407/api/pushMessage/'
     echartsDataV1.value = initEcharts('#DAA520', 0, 'A相')
     echartsDataV2.value = initEcharts('#2E8B57', 0, 'B相')
     echartsDataV3.value = initEcharts('#A52a2a', 0, 'C相')
@@ -758,6 +759,7 @@ const init = () => {
         return
     }
     if (monitoringPoint.state.comFlag == 0) {
+        loading.value = false
         return ElMessage({
             message: '所选监测点离线!',
             type: 'warning'
@@ -826,7 +828,7 @@ const init = () => {
         ]
         spectrumRef.value?.init(data)
         trendRef.value?.init(data)
-
+        loading.value = false
         // console.log('🚀 ~ dataSocket.socketServe.registerCallBack ~ webMsgSend.value:', data)
         setRealData()
     })
@@ -918,11 +920,14 @@ const setRealData = () => {
 }
 defineExpose({ setRealData })
 onMounted(() => {
+ 
     init()
+   
     initRadioCharts()
     getLineDetail({ id: monitoringPoint.state.lineId }).then(res => {
         ptName.value = connection.filter(item => item.value == res.data.ptType)[0].code || ''
     })
+  
 })
 onBeforeUnmount(() => {
     dataSocket.socketServe?.closeWs()

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,
+            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, 
-            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,
+            // 16.5, 17.5, 18.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
+            // 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

@@ -61,7 +61,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -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,12 +235,21 @@ const init = () => {
                     let msg = ''
                     msg += params[0].name 
                     for (let i in params) {
+                       
                         if (params[i].data == 3.14159) {
+                             if (params[i].seriesName && params[i].seriesName.includes('~')) {
+                                msg += params[i].marker +  ': 暂无数据<br/>'
+                            } else {
                                 msg += '（' + params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': 暂无数据<br/>'
+                            }
+                        } else {
+                            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/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>
@@ -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: 'shortCapacity', minWidth: 80 },
-        { title: '终端容量(MVA)', field: 'deviceCapacity' },
+        { title: '终端容量(MVA)', field: 'deviceCapacity', minWidth: 80 },
-        { title: '协议容量(MVA)', field: 'dealCapacity' },
+        { title: '协议容量(MVA)', field: 'dealCapacity', minWidth: 80 },
-        { title: '谐波情况', field: 'harmDes' },
+        { title: '谐波情况', field: 'harmDes', minWidth: 80 },
-        { title: '电能质量情况', field: 'powerDes' }
+        { title: '电能质量情况', field: 'powerDes', minWidth: 100 }
     ],
     beforeSearchFun: () => {
         tableStore.table.params.beginTime = tableStore.table.params.startTime

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

@@ -0,0 +1,121 @@
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <PointTree
+                    :default-expand-all="false"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></PointTree>
+            </pane>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" datePicker :show-search="false">
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                            生成
+                        </el-button>
+                    </template>
+                </TableHeader>
+                <div class="box">
+                    <div id="luckysheet">
+                        <img
+                            width="100%"
+                            :style="`height: calc(${tableStore.table.height} + 40px)`"
+                            src="@/assets/img/region.png"
+                        />
+                    </div>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import TableStore from '@/utils/tableStore'
+import PointTree from '@/components/tree/pqs/areaTree.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import { areaHarmonicReport } from '@/api/process-boot/reportForms'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+import type { UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+
+defineOptions({
+    name: 'harmonic-boot/region/word'
+})
+const height = mainHeight(20)
+const size = ref(19)
+const loading = ref(false)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+
+const tableStore = new TableStore({
+    url: '',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
+})
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    }
+})
+
+const handleNodeClick = (data: any, node: any) => {
+    dotList.value = data
+}
+
+// 生成
+const exportEvent = () => {
+    loading.value = true
+    ElMessage('生成报告中...')
+    areaHarmonicReport({
+        deptId: dotList.value.id,
+        areaReportFlag: 1,
+        startTime: TableHeaderRef.value.datePickerRef.timeValue[0],
+        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'
+            })
+
+            // createObjectURL(blob); //创建下载的链接
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = dotList.value.name + '区域稳态报告' + dayjs().format('YYYYMMDD') // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.box {
+    padding: 10px;
+}
+</style>

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

@@ -41,7 +41,13 @@
                     </template>
                     <template #operation>
                         <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
-                        <el-button icon="el-icon-Download" :loading="loading" @click="exportReport" type="primary" v-if="VITE_FLAG">
+                        <el-button
+                            icon="el-icon-Download"
+                            :loading="loading"
+                            @click="exportReport"
+                            type="primary"
+                            v-if="VITE_FLAG"
+                        >
                             下载报告
                         </el-button>
                     </template>
@@ -72,7 +78,7 @@ defineOptions({
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -110,7 +116,7 @@ const tableStore = new TableStore({
                 item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
             })
         })
-        console.log(tableStore.table.data)
+      
         setTimeout(() => {
             luckysheet.create({
                 container: 'luckysheet',
@@ -123,6 +129,13 @@ const tableStore = new TableStore({
                 data: tableStore.table.data
             })
         }, 10)
+    },
+    resetCallback: () => {
+        // 重置模板策略为第一个选项
+        if (templatePolicy.value && templatePolicy.value.length > 0) {
+            Template.value = templatePolicy.value[0]
+            reportForm.value = templatePolicy.value[0]?.reportForm
+        }
     }
 })
 const loading = ref(false)
@@ -148,7 +161,7 @@ const changetype = (val: any) => {
     reportForm.value = val.reportForm
 }
 const selectChange = () => {
-    console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length)
+    //console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length)
     if (tableStore.table.data.length != 0) {
         setTimeout(() => {
             luckysheet && luckysheet?.resize()
@@ -159,6 +172,13 @@ const selectChange = () => {
 const handleNodeClick = (data: any, node: any) => {
     if (data.level == 6) {
         dotList.value = data
+
+        TableHeaderRef.value.setTheDate(3)
+        // 重置模板策略为第一个选项
+        if (templatePolicy.value && templatePolicy.value.length > 0) {
+            Template.value = templatePolicy.value[0]
+            reportForm.value = templatePolicy.value[0]?.reportForm
+        }
         tableStore.index()
     }
 }
@@ -189,6 +209,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/reportForms/word/index.vue

@@ -43,7 +43,9 @@
                                 <el-button icon="el-icon-Upload" type="primary" class="mr10 ml10">上传接线图</el-button>
                             </template>
                         </el-upload>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">生成</el-button>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                            生成
+                        </el-button>
                     </template>
                 </TableHeader>
                 <div class="box">
@@ -72,12 +74,13 @@ import { mainHeight } from '@/utils/layout'
 import { exportModel } from '@/api/process-boot/reportForms'
 import { genFileId, ElMessage, ElNotification } from 'element-plus'
 import type { UploadProps, UploadUserFile } from 'element-plus'
-
+import dayjs from 'dayjs'
 defineOptions({
     // name: 'harmonic-boot/report/word'
 })
+const loading = ref(false)
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -107,9 +110,10 @@ const handleNodeClick = (data: any, node: any) => {
 // 上传
 const choose = (files: any) => {
     const isJPG = files.raw.type === 'image/jpg'
+    const isJPEG = files.raw.type === 'image/jpeg'
     const isPNG = files.raw.type === 'image/png'
-    if (!isJPG && !isPNG) {
+    if (!isJPG && !isPNG && !isJPEG) {
-        ElMessage.warning('上传文件只能是 JPG/PNG 格式!')
+        ElMessage.warning('上传文件只能是 jpg/png 格式!')
         return false
     }
 
@@ -130,7 +134,7 @@ const exportEvent = () => {
     form.append('type', '0')
     form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
     form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
-    console.log('🚀 ~ exportEvent ~ uploadList.value:', uploadList.value?.raw)
+    //console.log('🚀 ~ exportEvent ~ uploadList.value:', uploadList.value?.raw)
     form.append('file', uploadList.value?.raw || '')
     // 特殊字符正则表达式
     const specialCharRegex = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/
@@ -143,8 +147,14 @@ const exportEvent = () => {
             message: '包含特殊字符，请注意修改!'
         })
     } else {
+        loading.value = true
         ElMessage('生成报告中...')
-        exportModel(form).then((res: any) => {
+        exportModel(form)
+            .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'
                 })
@@ -152,10 +162,14 @@ const exportEvent = () => {
                 const url = window.URL.createObjectURL(blob)
                 const link = document.createElement('a') // 创建a标签
                 link.href = url
-            link.download = dotList.value.name // 设置下载的文件名
+                link.download = dotList.value.name + dayjs().format('YYYYMMDD') // 设置下载的文件名
                 document.body.appendChild(link)
                 link.click() //执行下载
                 document.body.removeChild(link)
+                loading.value = false
+            })
+            .catch((err: any) => {
+                loading.value = false
             })
     }
 }

src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue

@@ -50,7 +50,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="评价筛选">
-                    <el-input v-model="tableStore.table.params.evaluate" clearable placeholder="输入关键字筛选" />
+                    <el-input v-model="tableStore.table.params.evaluate" clearable placeholder="输入关键字筛选" maxlength="32" show-word-limit />
                 </el-form-item>
             </template>
 
@@ -100,10 +100,10 @@ const tableStore = new TableStore({
             }
         },
         { field: 'areaName', title: '区域',minWidth: 100 },
-        { field: 'gdName', title: '地级区' ,minWidth: 100},
+        { field: 'gdName', title: '供电公司' ,minWidth: 100},
         {
             field: 'bdName',
-            title: '供电公司',
+            title: '场站',
              minWidth: 100
         },
         { field: 'objName', title: '对象名称' , minWidth: 240},

src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue

@@ -98,9 +98,9 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="评价筛选">
+                <!-- <el-form-item label="评价筛选">
                     <el-input v-model="tableStore.table.params.evaluate" clearable placeholder="输入关键字筛选" />
-                </el-form-item>
+                </el-form-item> -->
             </template>
         </TableHeader>
         <Table ref="tableRef" />
@@ -145,10 +145,10 @@ const tableStore = new TableStore({
             }
         },
         { field: 'areaName', title: '区域', minWidth: 100 },
-        { field: 'gdName', title: '地级区', minWidth: 100 },
+        { field: 'gdName', title: '供电公司', minWidth: 100 },
         {
             field: 'bdName',
-            title: '供电公司',
+            title: '场站',
             minWidth: 100
         },
         { field: 'manufacturer', title: '厂家', minWidth: 100 },
@@ -219,7 +219,7 @@ tableStore.table.params.statisticalType = classificationData[0]
 tableStore.table.params.serverName = 'harmonic-boot'
 tableStore.table.params.comFlag = []
 tableStore.table.params.runFlag = []
-tableStore.table.params.evaluate = ''
+// tableStore.table.params.evaluate = ''
 tableStore.table.params.powerFlag = 2
 tableStore.table.params.monitorFlag = 2
 tableStore.table.params.scale = []

src/views/pqs/process/definition/index.vue

@@ -69,7 +69,7 @@ const tableStore = new TableStore({
     
         { title: '部署时间', field: 'deploymentTime' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue

@@ -53,7 +53,7 @@
                     <div class="statistics-box">
                         <MyEChart style="height: 250px" :options="picEChart1" />
                         <el-table size="small" height="250px" :data="resembleData">
-                            <el-table-column prop="name" label="暂降类型" width="80px" align="center" />
+                            <el-table-column prop="name" label="触发类型" width="80px" align="center" />
                             <el-table-column prop="value" label="暂降次数" width="80px" align="center" />
                         </el-table>
                     </div>

src/views/pqs/runManage/alarmCleaning/components/alarm.vue

@@ -144,6 +144,8 @@
                         <el-input
                             placeholder="请输入监测点名称/终端名称"
                             v-model="tableStore.table.params.searchValue"
+                            maxlength="32"
+                            show-word-limit
                             clearable
                         ></el-input>
                     </el-form-item>

src/views/pqs/runManage/assessment/components/assess/index.vue

@@ -73,7 +73,6 @@ import Outcome from './outcome.vue'
 import { exportResult, downloadAssessTemplate, assessResult, userGetInfo } from '@/api/advance-boot/assess'
 import { Loading } from '@element-plus/icons-vue'
 import AssessTemplate from './assessTemplate.vue'
-import { fa, tr } from 'element-plus/es/locale'
 
 defineOptions({
     // name: 'harmonic-boot/report/word'
@@ -81,7 +80,7 @@ defineOptions({
 const collapseName = ref([1, 2])
 const height = mainHeight(80)
 const collapseHeight = mainHeight(125)
-const size = ref(23)
+const size = ref(19)
 const dotList: any = ref({})
 const infoLoading = ref(false)
 const outcomeLoading = ref(false)

src/views/pqs/runManage/assessment/components/dictionary/components/cable/index.vue

@@ -62,9 +62,9 @@ const tableStore = new TableStore({
         { title: '零序电抗X0(Ω/km)', field: 'zeroX0', minWidth: '80' },
         { title: '零序电纳Y0(S/km)', field: 'zeroY0', minWidth: '80' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+          
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/runManage/assessment/components/dictionary/components/harmonicWave/index.vue

@@ -96,9 +96,9 @@ const tableStore = new TableStore({
         { title: '谐波49次', field: 'i49', minWidth: '80' },
         { title: '谐波50次', field: 'i50', minWidth: '80' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/runManage/assessment/components/dictionary/components/load/index.vue

@@ -63,9 +63,9 @@ const tableStore = new TableStore({
         { title: '启动容量倍数', field: 'inpactloadMultiple', minWidth: '80' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
              width: '180',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/runManage/assessment/components/dictionary/components/transformer/index.vue

@@ -73,9 +73,9 @@ const tableStore = new TableStore({
         { title: '空载电流(A)', field: 'noloadCur', minWidth: '80' },
         { title: '短路阻抗(%)', field: 'shortCircuitImpedance', minWidth: '80' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/runManage/assessment/components/uese/index.vue

@@ -184,10 +184,10 @@ const tableStore: any = new TableStore({
         // { field: 'name13', title: '单相负荷', minWidth: 180 },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '220',
             render: 'buttons',
-            fixed: 'right',
+           
             buttons: [
                 {
                     name: 'edit',

src/views/pqs/runManage/cleaning/components/abnormal.vue

@@ -152,6 +152,8 @@
                             placeholder="请输入监测点名称/终端名称"
                             v-model="tableStore.table.params.searchValue"
                             clearable
+                            maxlength="32"
+                            show-word-limit
                         ></el-input>
                     </el-form-item>
                     <!-- <el-form-item label="异常持续天数"></el-form-item>

src/views/pqs/supervise/electricalEnergy/components/audit.vue

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

src/views/pqs/supervise/electricalEnergy/components/maintenance.vue

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

src/views/pqs/supervise/electricalEnergy/components1/complaints.vue

@@ -122,7 +122,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 120,
             align: 'center',
             render: 'buttons',

src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue

@@ -5,13 +5,13 @@
                 <el-col :span="12">
                     <el-form-item for="-" label="用户名称:" prop="userName">
                         <el-input v-model="form.userName" clearable style="width: 100%"
-                            placeholder="请输入用户名称"></el-input>
+                            placeholder="请输入用户名称" maxlength="32" show-word-limit></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
                     <el-form-item for="-" label="用户编号:" prop="userNumber">
                         <el-input v-model="form.userNumber" clearable style="width: 100%"
-                            placeholder="请输入用户编号"></el-input>
+                            placeholder="请输入用户编号" maxlength="32" show-word-limit></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>

src/views/pqs/supervise/electricalEnergy/components1/online.vue

@@ -187,11 +187,11 @@ const tableStore = new TableStore({
             title: '最新数据时间'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+           
             buttons: [
                 {
                     name: 'productSetting',

src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue

@@ -8,6 +8,8 @@
                     v-model="tableStore.table.params.searchValue"
                     clearable
                     placeholder="请输入计划名称"
+                    maxlength="32"
+                    show-word-limit
                 ></el-input>
             </el-form-item>
             <el-form-item label="是否解决">
@@ -104,11 +106,11 @@ const tableStore = new TableStore({
       }
     },
     {
-      title: '操作',
+       title: '操作',fixed: 'right',
       minWidth: '180',
       align: 'center',
       render: 'buttons',
-      fixed: 'right',
+   
       buttons: [
         {
           name: 'edit',

src/views/pqs/supervise/electricalEnergy/components1/testRun.vue

@@ -134,9 +134,9 @@ const tableStore = new TableStore({
       }
     },
     {
-      title: '操作',
+       title: '操作',fixed: 'right',
       minWidth: 230,
-      fixed: 'right',
+    
       render: 'buttons',
       buttons: [
         // {

src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue

@@ -13,7 +13,7 @@
                 <Area v-model="form.deptId" @change="changeArea" />
             </el-form-item>
             <el-form-item for="-" label="计划名称:" prop="planName">
-                <el-input v-model="form.planName" placeholder="请输入计划名称"></el-input>
+                <el-input v-model="form.planName" placeholder="请输入计划名称" clearable maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="监督类型:" prop="supvType">
                 <el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%" @change="++key">
@@ -26,7 +26,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="监督对象名称:" prop="supvObjectName">
-                <el-input v-model="form.supvObjectName" placeholder="请输入监督对象名称"></el-input>
+                <el-input v-model="form.supvObjectName" placeholder="请输入监督对象名称" clearable maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item for="-" label="计划开始时间:" prop="planStartTime">
                 <el-date-picker

src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue

@@ -33,7 +33,7 @@ const tableStore = new TableStore({
         { field: 'planEndTime', title: '结束时间' },
         { field: 'subCount', title: '普测变电站数量' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [

src/views/pqs/supervise/harmonicSurvey/components/planManage.vue

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