微调

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

src/api/system-boot/file.ts

@@ -31,7 +31,7 @@ export const uploadFile = (file: any, path: string) => {
         data: form
     }).then(res => {
         if (res.code == `A0000`) {
-            ElMessage.success('上传成功!')
+            ElMessage.success('文件上传成功!')
             return res
         }
     })

src/components/echarts/MyEchart.vue

@@ -17,6 +17,7 @@ const config = useConfig()
 // import { nextTick } from 'process'
 const emit = defineEmits(['triggerPoint', 'group', 'echartClick'])
 color[0] = config.layout.elementUiPrimary[0]
+
 const chartRef = ref<HTMLDivElement>()
 
 const props = defineProps(['options', 'isInterVal', 'pieInterVal'])

src/components/echarts/MyEchartMap.vue

@@ -34,7 +34,6 @@ const fetchConfig = async (name: string) => {
 // fetchConfig()
 
 const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
-onMounted(() => {})
 
 const GetEchar = async (name: string) => {
     let chartDom = document.getElementById('chartMap')
@@ -44,6 +43,7 @@ const GetEchar = async (name: string) => {
     name == dictData.state.area?.[0].name ? (showCircle.value = false) : (showCircle.value = true)
 
     echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图
+
     let option = {
         title: {
             left: 'center',
@@ -99,6 +99,7 @@ const GetEchar = async (name: string) => {
             // top: 10,
             //    bottom: 0,
             roam: true,
+             
             label: {
                 normal: {
                     show: true,
@@ -178,6 +179,7 @@ const GetEchar = async (name: string) => {
     }, 0)
     window.addEventListener('resize', resizeHandler)
     const flag1 = ref(true)
+
     // 点击事件
     myCharts.value.off('click')
     myCharts.value.on('click', (e: any) => {

src/components/echarts/analytics.vue

@@ -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/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>
@@ -79,7 +79,7 @@ const init = async () => {
         // 设置消息接收回调
         mqttClient.onMessage((topic, message) => {
             const msg = JSON.parse(message.toString())
-           // console.log('🚀 ~ init ~ msg:', msg)
+        //    console.log('🚀 ~ init ~ msg:', msg)
             if (msg.deptList.includes(adminInfo.$state.deptId)) {
                 drawer.value = true
                 isLoading.value = true

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

@@ -28,7 +28,9 @@ import { ElMessage } from 'element-plus'
 import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
 import { validatePwd } from '@/utils/common'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import router from '@/router'
+import { useNavTabs } from '@/stores/navTabs'
+const navTabs = useNavTabs()
 const adminInfo = useAdminInfo()
 const dialogVisible = ref(false)
 const title = ref('修改密码')
@@ -97,8 +99,14 @@ const submit = () => {
                     id: adminInfo.$state.userIndex,
                     newPassword: form.newPwd
                 }).then((res: any) => {
-                    ElMessage.success('密码修改成功')
+                    ElMessage.success('密码修改成功,请重新登录!')
                     dialogVisible.value = false
+                     setTimeout(() => {
+                    navTabs.closeTabs()
+                    window.localStorage.clear()
+                    adminInfo.reset()
+                    router.push({ name: 'login' })
+                }, 0)
                 })
             })
         }

src/router/index.ts

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

src/stores/config.ts

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

src/stores/monitoringPoint.ts

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

src/template/table.vue

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

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

@@ -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 }">
@@ -139,9 +139,9 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="最大终端数:" prop="nodeDevNum" class="top">
+                <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

@@ -2397,35 +2397,45 @@ 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) => {
+            addTerminal(project).then((res: any) => {
-        ElMessage({
+                ElMessage({
-            type: 'success',
+                    type: 'success',
-            message: res.message
+                    message: res.message
-        })
+                })
-        reaseStatus()
+                reaseStatus()
-        initAddProjectBo()
+                initAddProjectBo()
-        initAddProjectBoId()
+                initAddProjectBoId()
-        treedata()
+                treedata()
+            })
+        }
     })
+    // project: JSON.stringify(project)
+    
 }
 /**
  * 修改数据
  */
-const updateDate = () => {
+const updateDate = async () => {
     // console.log("updateProject:", this.updateProject);
-    let data = updateProject.value
+    await mainForm.value.validate((valid: any) => {
-    updateTerminal(data).then((res: any) => {
+        if (valid){
-        ElMessage({
+             let data = updateProject.value
-            type: 'success',
+            updateTerminal(data).then((res: any) => {
-            message: res.message
+                ElMessage({
-        })
+                    type: 'success',
-        pageStatus.value = 1
+                    message: res.message
-        treedata()
+                })
+                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(() => {
@@ -602,55 +604,73 @@ const maintenanceData = reactive({
 //上节点选择
 const checkLeft = (checkedNodes: any, checkedKeys: any) => {
     maintenanceData.upNode = checkedNodes.id
-    if (maintenanceData.upNode === maintenanceData.downNode) {
+     if (maintenanceData.upNode === maintenanceData.downNode) {
-        menuTreeRight.value?.setCheckedKeys([])
+         menuTreeRight.value?.setCheckedKeys([])
-        maintenanceData.downNode = ''
+         maintenanceData.downNode = ''
-    }
+     }
-    if (checkedKeys.checkedKeys.length > 1) {
+     if (checkedKeys.checkedKeys.length > 1) {
-        menuTreeLeft.value?.setCheckedKeys([checkedNodes.id])
+         menuTreeLeft.value?.setCheckedKeys([checkedNodes.id])
-    }
+     }
 }
 
 //下节点选择
 const checkRight = (checkedNodes: any, checkedKeys: any) => {
     maintenanceData.downNode = checkedNodes.id
-    if (maintenanceData.downNode === maintenanceData.upNode) {
+  
-        menuTreeLeft.value?.setCheckedKeys([])
+     if (maintenanceData.downNode === maintenanceData.upNode) {
-        maintenanceData.upNode = ''
+         menuTreeLeft.value?.setCheckedKeys([])
-    }
+         maintenanceData.upNode = ''
-    if (checkedKeys.checkedKeys.length > 1) {
+     }
-        menuTreeRight.value?.setCheckedKeys([checkedNodes.id])
+     if (checkedKeys.checkedKeys.length > 1) {
-    }
+         menuTreeRight.value?.setCheckedKeys([checkedNodes.id])
+     }
 }
 
 //节点维护提交
 const maintenanceOnsubmit = () => {
-    for (let i = 0; i < bind.value.length; i++) {
+   
-        if (bind.value[i][0] == maintenanceData.upNode) {
+    if(maintenanceData.downNode == '' || maintenanceData.upNode == '') {
-            for (let j = 0; j < bind.value.length; j++) {
+        ElMessage({
-                if (bind.value[j][1] == maintenanceData.downNode) {
+            type: 'warning',
-                    ElMessage({
+            message: '请确保上下节点各自选择一个母线！'
-                        type: 'warning',
+        })
-                        message: '上下节点无法选择相同母线！！！'
+         return
-                    })
-                    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({
-                ElMessage({
+            type: 'warning',
-                    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,12 +53,12 @@
                 </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>
+                                <el-input v-model="form.tfDescribe" placeholder="请输入" ></el-input>
                             </el-form-item>
                             <el-form-item class="mt20 ml20">
                                 <el-button @click="dialogFormVisible = false">取消</el-button>
@@ -122,13 +122,8 @@ const menuTree = ref()
 const TableHeaderRef = ref()
 
 const rules = reactive({
-    name: [{ required: true, message: '名称不可为空', trigger: 'blur' }],
+    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>

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

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

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

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

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

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

src/views/pqs/harmonicMonitoring/area/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/qualifiedRate/index.vue

@@ -74,9 +74,14 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                        <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
-                    </el-select>
+                                v-for="item in sign"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.algoDescribe"
+                            />
+                        </el-select>
                     </el-form-item>
                 </template>
             </TableHeader>
@@ -159,6 +164,8 @@ const tableStore = new TableStore({
             title: '电压等级',
             field: 'voltageLevel',
             align: 'center',
+            minWidth: 80,
+
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -167,6 +174,7 @@ const tableStore = new TableStore({
             title: '网络参数',
             field: 'networkParam',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -175,6 +183,7 @@ const tableStore = new TableStore({
             title: '监测点名称',
             field: 'lineName',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -183,6 +192,7 @@ const tableStore = new TableStore({
             title: '厂家',
             field: 'factoryName',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -191,6 +201,7 @@ const tableStore = new TableStore({
             title: '谐波电压(%)',
             field: 'harmonicVoltage',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -199,6 +210,7 @@ const tableStore = new TableStore({
             title: '电压偏差(%)',
             field: 'voltageOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -207,6 +219,7 @@ const tableStore = new TableStore({
             title: '三相电压不平衡度(%)',
             field: 'voltageUnbalance',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -215,6 +228,7 @@ const tableStore = new TableStore({
             title: '间谐波电压含有率(%)',
             field: 'interHarmonic',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -223,6 +237,7 @@ const tableStore = new TableStore({
             title: '谐波电流(%)',
             field: 'harmonicCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -231,6 +246,7 @@ const tableStore = new TableStore({
             title: '负序电流(%)',
             field: 'negativeCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -239,6 +255,7 @@ const tableStore = new TableStore({
             title: '频率偏差(%)',
             field: 'freqOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -247,6 +264,7 @@ const tableStore = new TableStore({
             title: '闪变(%)',
             field: 'flicker',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -312,7 +330,7 @@ const tree2List = (list: any, id?: string) => {
     })
     // 返回结果数组
     return arr
-  }
+}
 onMounted(() => {
     tableStore.index()
 })

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/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/embed/lntegruty/components/table.vue

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

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

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

src/views/pqs/harmonicMonitoring/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

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

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

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

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

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

src/views/pqs/harmonicMonitoring/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

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

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>
@@ -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" :loading="loading">生成</el-button>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                            生成
+                        </el-button>
                     </template>
                 </TableHeader>
                 <div class="box">
@@ -108,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
     }
 
@@ -131,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 = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/
@@ -146,22 +149,28 @@ const exportEvent = () => {
     } else {
         loading.value = true
         ElMessage('生成报告中...')
-        exportModel(form).then((res: any) => {
+        exportModel(form)
-            let blob = new Blob([res], {
+            .then((res: any) => {
-                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+                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((err: any) => {
+                loading.value = false
             })
-            // 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((err: any) => {
-            loading.value =false
-        })
     }
 }
 </script>

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

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

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

src/views/pqs/supervise/interfere/components/network/index.vue

@@ -61,7 +61,7 @@ const tableStore = new TableStore({
         { field: 'recordTime', title: '建档时间' },
         { field: 'iuploadTime', title: '报告提交评估时间' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [

src/views/pqs/supervise/interfere/components/normal.vue

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

src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue

@@ -3,7 +3,7 @@
     <TableHeader datePicker nextFlag theCurrentTime showTimeAll showExport ref='TableHeaderRef'>
       <template #select>
         <el-form-item label='项目名称'>
-          <el-input v-model='tableStore.table.params.projectName' placeholder='请输入项目名称'></el-input>
+          <el-input v-model='tableStore.table.params.projectName' placeholder='请输入项目名称' maxlength="32" show-word-limit clearable></el-input>
         </el-form-item>
         <el-form-item label='所在地市'>
           <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
@@ -188,9 +188,9 @@ const tableStore = new TableStore({
     },
     // visible:!jb_pl.value && !jb_dky.value?true:false,
     {
-      title: '操作',
+       title: '操作',fixed: 'right',
       minWidth: 300,
-      fixed: 'right',
+     
       render: 'buttons',
 
       buttons: [

src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue

@@ -161,9 +161,9 @@ const tableStore = new TableStore({
         },
         { field: 'createTime', title: '创建时间', minWidth: 100 },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 180,
-            fixed: 'right',
+         
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/supervise/interfere/components/undocumented/addForm.vue

@@ -33,10 +33,10 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="归口管理部门：" prop="responsibleDepartment">
-                <el-input v-model="form.responsibleDepartment" autocomplete="off" placeholder="请输入归口管理部门" />
+                <el-input v-model="form.responsibleDepartment" autocomplete="off" placeholder="请输入归口管理部门" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item for="-" label="项目名称：" prop="projectName">
-                <el-input v-model="form.projectName" autocomplete="off" placeholder="请输入项目名称" />
+                <el-input v-model="form.projectName" autocomplete="off" placeholder="请输入项目名称" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item for="-" label="用户状态：" prop="userStatus">
                 <el-select v-model="form.userStatus" placeholder="请选择用户状态">
@@ -45,7 +45,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="厂站名称：" prop="substation">
-                <el-input v-model="form.substation" autocomplete="off" placeholder="请输入厂站名称" />
+                <el-input v-model="form.substation" autocomplete="off" placeholder="请输入厂站名称" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item for="-" v-if="form.userType == '0' || form.userType == '1'" label="用户协议容量："
                 prop="agreementCapacity">
@@ -193,7 +193,7 @@
             </el-form-item>
             <el-form-item for="-" v-if="form.userType != '0' && form.userType != '1'" label="预测评估评审单位："
                 prop="evaluationChekDept">
-                <el-input v-model="form.evaluationChekDept" autocomplete="off" placeholder="请输入预测评估评审单位" />
+                <el-input v-model="form.evaluationChekDept" autocomplete="off" placeholder="请输入预测评估评审单位" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item for="-" label="预测评估结论：" prop="evaluationConclusion" style="width: 100%">
                 <el-input type="textarea" v-model="form.evaluationConclusion" autocomplete="off"

src/views/pqs/supervise/interfere/components/undocumented/index.vue

@@ -2,7 +2,7 @@
     <TableHeader datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
         <template #select>
             <el-form-item label="项目名称">
-                <el-input v-model="tableStore.table.params.projectName" placeholder="请输入项目名称"></el-input>
+                <el-input v-model="tableStore.table.params.projectName" placeholder="请输入项目名称" maxlength="32" show-word-limit clearable></el-input>
             </el-form-item>
             <el-form-item label="所在地市">
                 <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
@@ -167,9 +167,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 150,
-            fixed: 'right',
+         
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/supervise/plan/components/detail.vue

@@ -160,7 +160,7 @@ import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
 import { Link, View } from '@element-plus/icons-vue'
 import { useAdminInfo } from '@/stores/adminInfo'
-import {download} from '@/utils/fileDownload'
+import {download} from '@/utils/fileDownLoad'
 defineOptions({ name: 'BpmUserReportDetail' })
 const { query } = useRoute() // 查询参数
 const props = defineProps({

src/views/pqs/supervise/plan/components/effectProblem/index.vue

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

src/views/pqs/supervise/plan/index.vue

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

src/views/pqs/supervise/retire/monitor.vue

@@ -18,6 +18,8 @@
                         v-model="tableStore.table.params.searchValue"
                         placeholder="输入变电站、监测点"
                         clearable
+                        maxlength="32"
+                        show-word-limit
                     ></el-input>
                 </el-form-item>
             </template>
@@ -156,10 +158,10 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             minWidth: '150',
-            fixed: 'right',
+            
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/supervise/retire/terminal.vue

@@ -18,6 +18,9 @@
                         v-model="tableStore.table.params.searchValue"
                         placeholder="输入变电站、终端"
                         clearable
+                        maxlength="32"
+                        show-word-limit 
+                        
                     ></el-input>
                 </el-form-item>
             </template>
@@ -153,10 +156,10 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             minWidth: '150',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/supervise/technology/components/alarm.vue

@@ -221,11 +221,11 @@ const tableStore = new TableStore({
         // },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: '220',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+           
             buttons: [
                 {
                     name: 'productSetting',

src/views/pqs/supervise/technology/components/earlyWarn.vue

@@ -138,11 +138,11 @@ const tableStore = new TableStore({
         //     ]
         // },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: '220',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+          
             buttons: [
                 {
                     name: 'productSetting',

src/views/pqs/supervise/technology/components/overview.vue

@@ -56,7 +56,7 @@ const tableStore = new TableStore({
         { field: 'alertType', title: '预警类型' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

src/views/pqs/supervise/technology/components/technology.vue

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

src/views/pqs/supervise/terminal/components/cycleTab.vue

@@ -158,10 +158,10 @@ const tableStore = new TableStore({
         },
         { field: 'nextInspectionTime', title: '下次检测时间' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '250',
             render: 'buttons',
-            fixed: 'right',
+           
             buttons: [
                 {
                     name: 'edit',