Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx

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

@@ -288,18 +288,21 @@ 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/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,7 +4,7 @@
         <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>
@@ -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>

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>
@@ -240,6 +240,7 @@ const tableRef = ref()
 const processNo = ref('')
 const ruleFormRef = ref()
 const dataSource: any = ref([])
+const deviceInfoList: any = ref([])
 const defaultProps = {
     children: 'deviceInfoList',
     label: 'name'
@@ -373,6 +374,11 @@ const tableStore = new TableStore({
                         title: '确定删除吗？'
                     },
                     click: row => {
+                        if (hasDevices.value) {
+                            ElMessage.warning('此前置机绑定了设备，无法删除！');
+                            return;
+                        }
+
                         delNode(row.id).then(res => {
                             ElMessage.success('删除成功')
                             tableStore.index()
@@ -395,12 +401,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 +421,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
         })
 

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"
@@ -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(() => {

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

@@ -55,10 +55,10 @@
                     <div class="box">
                         <el-form :model="form" label-width="100px" ref="ruleFormRef">
                             <el-form-item label="名称:">
-                                <el-input v-model="form.tpName" placeholder="请输入"></el-input>
+                                <el-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="请输入" maxlength="32" show-word-limit clearable></el-input>
                             </el-form-item>
                             <el-form-item class="mt20 ml20">
                                 <el-button @click="dialogFormVisible = false">取消</el-button>

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

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

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/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/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/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="是否解决">

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/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='请选择所在地市'>

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="请选择所在地市">

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>

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>

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

@@ -4,7 +4,7 @@
             <template #select>
                 <el-form-item label="项目名称">
                     <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
-                        clearable></el-input>
+                        clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="所在地市">
                     <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">

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

@@ -4,7 +4,7 @@
             <template #select>
                 <el-form-item label="项目名称">
                     <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
-                        clearable></el-input>
+                        clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="所在地市">
                     <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">

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

@@ -4,10 +4,12 @@
             <template #select>
                 <el-form-item label="数据筛选">
                     <el-input
-                        style="width: 200px"
+                        style="width: 230px"
                         placeholder="请输入变电站/监测点名称"
                         v-model="tableStore.table.params.searchValue"
                         clearable
+                        maxlength="32"
+                        show-word-limit
                     ></el-input>
                 </el-form-item>
             </template>

src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue

@@ -7,6 +7,8 @@
             v-model='tableStore.table.params.searchValue'
             placeholder='输入变电站.终端名称'
             clearable
+            maxlength="32"
+            show-word-limit 
         ></el-input>
       </el-form-item>
       <el-form-item label='流程状态'>

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue

@@ -4,7 +4,7 @@
         <template #select>
             <el-form-item label="搜索">
                 <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                    clearable style="width: 230px"></el-input>
+                    clearable style="width: 250px" maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue

@@ -65,7 +65,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="监测点名称：" prop="lineName">
-                <el-input v-model="form.lineName" autocomplete="off" placeholder="请输入监测点名称" />
+                <el-input v-model="form.lineName" autocomplete="off" placeholder="请输入监测点名称" clearable maxlength="32" show-word-limit/>
             </el-form-item>
             <!-- {{ voltageLevelList[2].value * 10 }}:{{ 1 }} -->
             <el-form-item for="-" label="监测点电压等级：" prop="voltageLevel">
@@ -152,7 +152,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="上送网公司编码：">
-                <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入上送网公司编码" />
+                <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入上送网公司编码"  clearable maxlength="32" show-word-limit/>
             </el-form-item>
             <el-form-item for="-" label="监测点性质：" prop="pointNature">
                 <el-select v-model="form.pointNature" placeholder="请选择监测点性质">
@@ -170,7 +170,7 @@
                 <el-input v-model="form.objName" autocomplete="off" placeholder="请输入监测点对象名称" />
             </el-form-item> -->
             <el-form-item for="-" label="电网侧变电站：" prop="powerSubstationName">
-                <el-input v-model="form.powerSubstationName" autocomplete="off" placeholder="请输入电网侧变电站" />
+                <el-input v-model="form.powerSubstationName" autocomplete="off" placeholder="请输入电网侧变电站"  clearable maxlength="32" show-word-limit/>
             </el-form-item>
             <el-form-item for="-" label="是否并网点：" prop="isGridConnectionPoint">
                 <el-radio-group v-model="form.isGridConnectionPoint">

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue

@@ -4,7 +4,7 @@
         <template #select>
             <el-form-item label="搜索">
                 <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                    clearable style="width: 230px"></el-input>
+                    clearable style="width: 280px" maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue

@@ -124,7 +124,7 @@
             </el-form-item>
 
             <el-form-item for="-" label="终端名称：" prop="monitoringTerminalName">
-                <el-input v-model="form.monitoringTerminalName" autocomplete="off" placeholder="请输入终端名称" />
+                <el-input v-model="form.monitoringTerminalName" autocomplete="off" placeholder="请输入终端名称" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item for="-" label="通讯类型：">
                 <el-select v-model="form.frontType" clearable style="width: 100%" placeholder="请选择通讯类型">
@@ -134,7 +134,7 @@
             </el-form-item>
             <el-form-item for="-" label="终端编码：" prop="monitoringTerminalCode">
                 <el-input v-model="form.monitoringTerminalCode" autocomplete="off" placeholder="请输入终端编码"
-                    @change="encode" />
+                    @change="encode" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item v-if="false" for="-" label="通讯状态：" prop="communicationStatus">
                 <el-select v-model="form.communicationStatus" clearable style="width: 100%" placeholder="请选择通讯状态"

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue

@@ -3,7 +3,7 @@
         <template #select>
             <el-form-item label="搜索">
                 <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端名称"
-                    clearable style="width: 180px"></el-input>
+                    clearable style="width: 220px" maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/pqs/voltageSags/Region/transientList/index.vue

@@ -15,6 +15,8 @@
                             clearable
                             placeholder="输入关键字筛选"
                             style="width: 200px"
+                            maxlength="32"
+                            show-word-limit
                         />
                     </el-form-item>
                     <el-form-item label="触发类型:">

src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue

@@ -127,7 +127,7 @@ const tableStore = new TableStore({
     ],
     beforeSearchFun: () => {
         tableStore.table.params.lineId = monitoringPoint.state.lineId
-        console.log('beforeSearchFun')
+       
     },
     loadCallback: () => {}
 })

src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue

@@ -42,7 +42,10 @@
                 <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.searchValue"
-                        placeholder="根据变电站,终端编号,型号或网络参数查询"
+                        placeholder="变电站,终端编号,型号或网络参数"
+                        maxlength="32"
+                        show-word-limit
+                        clearable
                     />
                 </el-form-item>
             </template>

src/views/pqs/voltageSags/operationsManagement/point/index.vue

@@ -46,7 +46,11 @@
                 <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.searchValue"
-                        placeholder="根据变电站,终端编号,型号或网络参数查询"
+                        placeholder="变电站,终端编号,型号或网络参数"
+                        maxlength="32"
+                        show-word-limit
+                        clearable
+                        style="width: 280px;"
                     />
                 </el-form-item>
             </template>

src/views/pqs/voltageSags/report/eventReports/index.vue

@@ -23,11 +23,27 @@
                         <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
                     </el-select>
                 </el-form-item>
-
+                <el-form-item label="网公司标志:">
+                    <el-select
+                        v-model="tableStore.table.params.monitorFlag"
+                        collapse-tags
+                        placeholder="请选择网公司标志"
+                    >
+                        <el-option
+                            v-for="item in monitorList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.searchValue"
-                        placeholder="根据供电公司,变电站或监测点查询"
+                        placeholder="供电公司,变电站或监测点"
+                        maxlength="32"
+                        show-word-limit
+                        clearable
                     />
                 </el-form-item>
             </template>
@@ -53,6 +69,14 @@ const dictData = useDictData()
 const triggerType = dictData.getBasicData('Event_Statis')
 const sign: any = dictData.getBasicData('power_flag')
 const tableRef = ref()
+
+
+const monitorList = [
+    { value: 0, label: '非网公司' },
+    { value: 1, label: '网公司' },
+    { value: 2, label: '全部数据' }
+]
+
 const tableStore = new TableStore({
     url: '/event-boot/report/getEventReport',
     method: 'POST',
@@ -123,6 +147,7 @@ tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 tableStore.table.params.serverName = 'event-boot'
 tableStore.table.params.waveType = ''
 tableStore.table.params.searchValue = ''
+tableStore.table.params.monitorFlag = monitorList[2].value
 tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', [
     'Report_Type',
     'Manufacturer',

src/views/pqs/voltageSags/sagGovern/businessUser/index.vue

@@ -8,6 +8,8 @@
                         v-model='tableStore.table.params.searchValue'
                         clearable
                         placeholder='输入用户名、行业'
+                         maxlength="32"
+                        show-word-limit
                     />
                 </el-form-item>
                 <el-form-item label='区域'>

src/views/pqs/voltageSags/sagGovern/businessUser/productLine/productPopup.vue

@@ -11,7 +11,7 @@
         <el-scrollbar>
             <el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
                 <el-form-item label='生产线名' prop='name'>
-                    <el-input v-model='form.name' placeholder='请输入生产线名' clearable @input='handleInput' />
+                    <el-input v-model='form.name' placeholder='请输入生产线名' clearable @input='handleInput' maxlength="32" show-word-limit/>
                 </el-form-item>
                 <el-form-item label='关联进线' prop='incomingLineId'>
                     <el-select v-model='form.incomingLineId'>

src/views/setting/dictionary/list/detail.vue

@@ -15,6 +15,9 @@
                         v-model="tableStore.table.params.searchValue"
                         clearable
                         placeholder="请输入名称或编码筛选"
+                        maxlength="32"
+                        show-word-limit
+
                     />
                 </el-form-item>
             </template>

src/views/setting/dictionary/list/index.vue

@@ -8,6 +8,8 @@
                         v-model="tableStore.table.params.searchValue"
                         clearable
                         placeholder="请输入名称或编码筛选"
+                        maxlength="32"
+                        show-word-limit
                     />
                 </el-form-item>
             </template>

src/views/setting/dictionary/list/popupDetailEdit.vue

@@ -3,16 +3,16 @@
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="名称:" class="top" prop="name" >
-                    <el-input v-model="form.name" ></el-input>
+                    <el-input v-model="form.name" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="计算值:" class="top">
-                    <el-input v-model="form.value"></el-input>
+                    <el-input v-model="form.value" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item class="top" label="对应算法:" prop="algoDescribe" v-if="form.openDescribe == 1">
-                    <el-input v-model="form.algoDescribe" placeholder="请输入数字"></el-input>
+                    <el-input v-model="form.algoDescribe" placeholder="请输入数字" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item class="top" label="编码:" prop="code">
-                    <el-input v-model="form.code"></el-input>
+                    <el-input v-model="form.code" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="排序:" prop="sort" class="top">
                     <el-input-number v-model="form.sort" :min="0" />

src/views/setting/dictionary/list/popupEdit.vue

@@ -3,10 +3,10 @@
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="名称" prop="name">
-                    <el-input v-model="form.name" maxlength="32" show-word-limit @input="handleInput"></el-input>
+                    <el-input v-model="form.name" maxlength="32" show-word-limit @input="handleInput" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="编码" class="top" prop="code">
-                    <el-input v-model="form.code"></el-input>
+                    <el-input v-model="form.code" maxlength="32" show-word-limit clearable></el-input>
                 </el-form-item>
 
                 <el-form-item label="排序" class="top" prop="sort">

src/views/setting/dictionary/tree/popupForm.vue

@@ -3,13 +3,13 @@
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="字典名称:" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入字典名称" maxlength="32" show-word-limit @input="handleInput"></el-input>
+                    <el-input v-model="form.name" placeholder="请输入字典名称" maxlength="32" clearable show-word-limit @input="handleInput"></el-input>
                 </el-form-item>
                 <el-form-item label="序号:" prop="sort" class="top">
-                    <el-input v-model="form.sort" placeholder="请输入序号"></el-input>
+                    <el-input-number v-model="form.sort" placeholder="请输入序号"></el-input-number>
                 </el-form-item>
                 <el-form-item label="编码:" prop="code" class="top">
-                    <el-input v-model="form.code" placeholder="请输入字典编码"></el-input>
+                    <el-input v-model="form.code" placeholder="请输入字典编码" maxlength="32" show-word-limit  clearable ></el-input>
                 </el-form-item>
                 <el-form-item label="描述:" class="top">
                     <el-input v-model="form.remark" placeholder="请输入字典描述"></el-input>

src/views/system/auth/department/index.vue

@@ -9,6 +9,8 @@
                 class="ml10"
                 clearable
                 @input="search"
+                maxlength="32"
+                show-word-limit
             />
         </div>
         <Table />

src/views/system/auth/department/popupForm.vue

@@ -3,7 +3,7 @@
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="部门编号:">
-                    <el-input v-model="form.code" placeholder="请输入部门编号"></el-input>
+                    <el-input v-model="form.code" placeholder="请输入部门编号" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item class="top" label="部门名称:" prop="name">
                     <el-input v-model="form.name" placeholder="请输入部门名称" maxlength="32" show-word-limit clearable @input="handleInput"/>

src/views/system/auth/userList/index.vue

@@ -121,7 +121,7 @@ const tableStore = new TableStore({
                         return row.state !== 1
                     },
                     click: row => {
-                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
+                        ElMessageBox.prompt('二次校验密码确认', '修改密码', {
                             confirmButtonText: '确认',
                             cancelButtonText: '取消',
                             inputType: 'password'

src/views/system/auth/userList/popupEdit.vue

@@ -4,8 +4,8 @@
             <el-form-item label="用户名" prop="name">
                 <el-input v-model="form.name" placeholder="请输入昵称" maxlength="16" show-word-limit @input="handleInput('name', $event)" :disabled="title !== '新增用户'"/>
             </el-form-item>
-            <el-form-item label="登录名" prop="loginName">
+            <el-form-item label="登录名" prop="loginName" >
-                <el-input v-model="form.loginName" placeholder="请输入登录名" maxlength="16" show-word-limit @input="handleInput('loginName', $event)"/>
+                <el-input v-model="form.loginName" placeholder="请输入登录名"  maxlength="16" show-word-limit @input="handleInput('loginName', $event)" :disabled="title !== '新增用户'"/>
             </el-form-item>
             <el-form-item label="默认密码" prop="password" v-if="title === '新增用户'">
                 <el-input v-model="form.password" placeholder="请输入密码" disabled />

src/views/system/bpm/category/categoryPopup.vue

@@ -4,10 +4,10 @@
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="分类名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入分类名" clearable />
+                    <el-input v-model="form.name" placeholder="请输入分类名" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
                 <el-form-item label="分类标识" prop="code">
-                    <el-input v-model="form.code" placeholder="请输入分类标识" clearable />
+                    <el-input v-model="form.code" placeholder="请输入分类标识" clearable maxlength="32" show-word-limit />
                 </el-form-item>
                 <el-form-item label="分类描述" prop="description">
                     <el-input

src/views/system/bpm/category/index.vue

@@ -1,12 +1,14 @@
 <!--流程分类页面-->
 <template>
   <div class='default-main'>
-    <TableHeader>
+    <TableHeader >
       <template v-slot:select>
         <el-form-item label='流程分类'>
           <el-input
               v-model='tableStore.table.params.searchValue'
               clearable
+              maxlength="10"
+              show-word-limit
               placeholder='请输入分类名称'
           />
         </el-form-item>
@@ -98,6 +100,9 @@ const tableStore = new TableStore({
       }
     }
 
+  },
+  resetCallback: () => {
+    tableStore.table.params.searchValue = ''
   }
 })
 
@@ -105,7 +110,8 @@ onMounted(() => {
   // 加载数据
   tableStore.index()
 })
-tableStore.table.params.name = ''
+
+tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
 const add = () => {

src/views/system/bpm/form/index.vue

@@ -7,6 +7,9 @@
                     <el-input
                         v-model='tableStore.table.params.name'
                         clearable
+                        maxlength="32"
+                        show-word-limit
+                        placeholder="请输入表单名称"
                     />
                 </el-form-item>
             </template>
@@ -139,6 +142,9 @@ const tableStore = new TableStore({
             }
         }
 
+    },
+    resetCallback: () => {
+      tableStore.table.params.name = ''
     }
 })
 /** 添加/修改操作表单 */

src/views/system/bpm/model/modelPopup.vue

@@ -17,6 +17,8 @@
                         :disabled='!!formData.id'
                         clearable
                         placeholder='请输入流程名称'
+                        maxlength="32"
+                        show-word-limit
                     />
                 </el-form-item>
 
@@ -53,7 +55,8 @@
                 </el-form-item>
 
                 <el-form-item label='流程标识' prop='key' v-else>
-                    <el-input v-model='formData.key' />
+                    <el-input v-model='formData.key'  maxlength="32"
+                        show-word-limit/>
                 </el-form-item>
 
                 <el-form-item label='流程表单' prop='formId' v-if='formData.formType == 10'>

src/views/system/bpm/sign/index.vue

@@ -4,10 +4,10 @@
         <TableHeader>
             <template v-slot:select>
                 <el-form-item label="标识名称">
-                    <el-input v-model="tableStore.table.params.name" clearable placeholder="请输入名称" />
+                    <el-input v-model="tableStore.table.params.name" clearable placeholder="请输入名称" maxlength="32" show-word-limit/>
                 </el-form-item>
                 <el-form-item label="标识key">
-                    <el-input v-model="tableStore.table.params.signKey" clearable placeholder="请输入key" />
+                    <el-input v-model="tableStore.table.params.signKey" clearable placeholder="请输入key" maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
             <template v-slot:operation>
@@ -96,6 +96,10 @@ const tableStore = new TableStore({
                 delete tableStore.table.params[key]
             }
         }
+    },
+    resetCallback: () => {
+        tableStore.table.params.name = ''
+        tableStore.table.params.signKey = ''
     }
 })
 

src/views/system/bpm/sign/signPopup.vue

@@ -4,10 +4,10 @@
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="标识名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入标识名" clearable />
+                    <el-input v-model="form.name" placeholder="请输入标识名" clearable maxlength="32"  show-word-limit/>
                 </el-form-item>
                 <el-form-item label="分类key" prop="signKey">
-                    <el-input v-model="form.signKey" placeholder="请输入标识key" clearable />
+                    <el-input v-model="form.signKey" placeholder="请输入标识key" clearable maxlength="32"  show-word-limit/>
                 </el-form-item>
                 <el-form-item label="查看表单路径" prop="viewPath">
                     <el-input v-model="form.viewPath" placeholder="请输入查看表单路径" clearable></el-input>