From 5db2b1428c99d129f6df9e021f9cc5d6de2ea071 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 5 Dec 2024 10:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E5=8D=97=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pqs/bearingCapacity/userManagement/equipment.vue      | 2 +-
 src/views/pqs/bearingCapacity/userManagement/index.vue    | 4 ++--
 .../pqs/harmonicMonitoring/reportForms/passing/index.vue  | 2 +-
 .../harmonicMonitoring/reportForms/statistics/index.vue   | 2 +-
 .../pqs/harmonicMonitoring/reportForms/word/index.vue     | 8 ++++----
 src/views/pqs/supervise/retire/monitor.vue                | 4 ++--
 src/views/pqs/supervise/retire/terminal.vue               | 4 ++--
 src/views/pqs/supervise/technology/components/alarm.vue   | 2 +-
 src/views/system/reportForms/form.vue                     | 8 ++++----
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/pqs/bearingCapacity/userManagement/equipment.vue b/src/views/pqs/bearingCapacity/userManagement/equipment.vue
index e589c7c3..e201dc79 100644
--- a/src/views/pqs/bearingCapacity/userManagement/equipment.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/equipment.vue
@@ -22,7 +22,7 @@
     <el-dialog draggable v-model="addShow" width="400px" :title="title" :before-close="handleClose">
         <el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
             <el-form-item label="终端名称" prop="devName">
-                <el-input v-model="form.devName" placeholder="请输入终端名称" />
+                <el-input v-model.trim="form.devName" placeholder="请输入终端名称" />
             </el-form-item>
             <el-form-item label="电压等级" prop="devScale">
                 <el-select v-model="form.devScale" clearable placeholder="请选择电压等级">
diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue
index 36a19c1c..0234a739 100644
--- a/src/views/pqs/bearingCapacity/userManagement/index.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/index.vue
@@ -4,7 +4,7 @@
             <TableHeader datePicker ref="TableHeaderRef">
                 <template #select>
                     <el-form-item label="用户类型">
-                        <el-select v-model="tableStore.table.params.userType" clearable placeholder="请选择用户类型">
+                        <el-select v-model.trim="tableStore.table.params.userType" clearable placeholder="请选择用户类型">
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
@@ -17,7 +17,7 @@
             <el-dialog draggable v-model="dialogVisible" :title="title" width="600" :before-close="handleClose">
                 <el-form ref="ruleFormRef" :model="form" label-width="180px" :disabled="disabled" :rules="rules">
                     <el-form-item label="用户名称：" prop="userName">
-                        <el-input v-model="form.userName" clearable placeholder="请输入用户名称" />
+                        <el-input v-model.trim="form.userName" clearable placeholder="请输入用户名称" />
                     </el-form-item>
                     <el-form-item label="用户类型：" prop="userType">
                         <el-select v-model="form.userType" clearable placeholder="请选择用户类型" @change="useChange">
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
index 0012ea8d..8d004ada 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
@@ -4,7 +4,7 @@
         <TableHeader datePicker area>
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="筛选数据" />
+                    <el-input v-model="tableStore.table.params.searchValue" clearable   maxlength="32" show-word-limit placeholder="筛选数据" />
                 </el-form-item>
             </template>
             <template v-slot:operation>
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index 12b3d356..e3648334 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -21,7 +21,7 @@
                                 ></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="报表类型:">
+                        <el-form-item label="报表类型">
                             <el-select
                                 :disabled="true"
                                 v-model="reportForm"
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
index 12cb671b..9f74afa2 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
@@ -8,11 +8,11 @@
             <pane style="background: #fff" :style="height">
                 <TableHeader ref="TableHeaderRef" datePicker :show-search="false">
                     <template v-slot:select>
-                        <el-form-item label="模板策略">
-                            <el-input v-model="tableStore.table.params.crmName" placeholder="请输入模板策略" />
+                        <el-form-item label="客户名称">
+                            <el-input v-model="tableStore.table.params.crmName"  maxlength="32" show-word-limit clearable placeholder="请输入客户名称" />
                         </el-form-item>
-                        <el-form-item label="报表类型:">
-                            <el-input v-model="tableStore.table.params.reportNumber" placeholder="请输入报表类型" />
+                        <el-form-item label="报表编号">
+                            <el-input v-model="tableStore.table.params.reportNumber" clearable placeholder="请输入报表编号" />
                         </el-form-item>
                     </template>
                     <template #operation>
diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue
index d9cce9f7..329b97bf 100644
--- a/src/views/pqs/supervise/retire/monitor.vue
+++ b/src/views/pqs/supervise/retire/monitor.vue
@@ -9,8 +9,8 @@
                             :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="搜索">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、监测点"
+                <el-form-item label="筛选">
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入关键字"
                         clearable></el-input>
                 </el-form-item>
             </template>
diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue
index 98902976..24069a25 100644
--- a/src/views/pqs/supervise/retire/terminal.vue
+++ b/src/views/pqs/supervise/retire/terminal.vue
@@ -9,8 +9,8 @@
                             :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="搜索">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端" clearable></el-input>
+                <el-form-item label="筛选">
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入关键字" clearable></el-input>
                 </el-form-item>
             </template>
             <template #operation>
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index 54e4f24c..80de2606 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -10,7 +10,7 @@
             <el-form-item label="是否解决">
                 <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
                     <el-option label="未解决" value="0"></el-option>
-                    <el-option label="已解决" value="1"></el-option>
+                    <el-option label="全部" value="1"></el-option>
                 </el-select>
             </el-form-item>
         </template>
diff --git a/src/views/system/reportForms/form.vue b/src/views/system/reportForms/form.vue
index 26c0c5af..67900d59 100644
--- a/src/views/system/reportForms/form.vue
+++ b/src/views/system/reportForms/form.vue
@@ -1,10 +1,10 @@
 <template>
     <el-dialog draggable :title="title" v-model="formVisible" width="30%" :before-close="closeDialog">
         <el-form :model="formdata" label-width="100px" :rules="rules" ref="ruleForm">
-            <el-form-item label="模板名称:" prop="name">
+            <el-form-item label="模板名称" prop="name">
                 <el-input placeholder="模板名称" v-model="formdata.name" style="width: 100%"></el-input>
             </el-form-item>
-            <el-form-item label="部门:" prop="deptId">
+            <el-form-item label="部门" prop="deptId">
                 <Area
                     v-model="formdata.deptId"
                     style="width: 100%"
@@ -13,7 +13,7 @@
                 />
             </el-form-item>
 
-            <el-form-item label="模板类型:" prop="reportType">
+            <el-form-item label="模板类型" prop="reportType">
                 <el-select style="width: 100%" v-model="formdata.reportType" placeholder="请选择模板类型">
                     <el-option
                         v-for="item in classificationData"
@@ -23,7 +23,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="报表类型:" prop="reportForm">
+            <el-form-item label="报表类型" prop="reportForm">
                 <el-select style="width: 100%" v-model="formdata.reportForm" placeholder="请选择报表类型">
                     <el-option
                         v-for="item in reportFormList"