From 130476cc3a94576d415fe301270b42d86e2381da Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 23 Aug 2024 10:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E7=9B=91=E7=9D=A3=20=E8=A1=A8=E6=A0=BC=E9=A1=BA=E5=BA=8F=20=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E7=A8=8B=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/components/popup/password.vue       | 12 ++--
 .../normalizationManager/addForm.vue          |  6 +-
 .../normalizationManager/detail.vue           |  2 +-
 .../interferenceUserTable.vue                 |  6 +-
 .../components/undocumented/addForm.vue       |  8 +--
 .../components/undocumented/detail.vue        |  2 +-
 .../components/undocumented/index.vue         |  6 +-
 .../components/interferenceUserTable.vue      | 11 ++--
 .../components/sensitiveUserTable.vue         | 58 ++++++++++---------
 src/views/system/auth/userList/popupPwd.vue   |  8 +--
 src/views/user/popupUpdatePwd.vue             |  8 +--
 11 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/src/layouts/admin/components/popup/password.vue b/src/layouts/admin/components/popup/password.vue
index 0d893103..369633df 100644
--- a/src/layouts/admin/components/popup/password.vue
+++ b/src/layouts/admin/components/popup/password.vue
@@ -44,8 +44,8 @@ const rules = {
         { required: true, message: '请输入校验密码', trigger: 'blur' },
         {
             min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
+            max: 12,
+            message: '长度在 6 到 12 个字符',
             trigger: 'blur'
         }
     ],
@@ -53,8 +53,8 @@ const rules = {
         { required: true, message: '请输入密码', trigger: 'blur' },
         {
             min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
+            max: 12,
+            message: '长度在 6 到 12 个字符',
             trigger: 'blur'
         },
         { validator: validatePwd, trigger: 'blur' }
@@ -63,8 +63,8 @@ const rules = {
         { required: true, message: '请确认密码', trigger: 'blur' },
         {
             min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
+            max: 12,
+            message: '长度在 6 到 12 个字符',
             trigger: 'blur'
         },
         {
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
index be9d0172..6709a461 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
@@ -46,11 +46,11 @@
                     :disabled="openType == 'detail'"
                 />
             </el-form-item>
-            <el-form-item label="用户名称：" prop="projectName">
+            <el-form-item label="项目名称：" prop="projectName">
                 <el-input
                     v-model="form.projectName"
                     autocomplete="off"
-                    placeholder="请输入用户名称"
+                    placeholder="请输入项目名称"
                     :disabled="openType == 'detail'"
                 />
             </el-form-item>
@@ -270,7 +270,7 @@ const resetForm = () => {
         userType: 0, //用户性质
         city: areaOptionList[0].name, //所在地市
         responsibleDepartment: '', //归口管理部门
-        projectName: '', //用户名称
+        projectName: '', //项目名称
         userStatus: userStateList[0].value, //用户状态
         substation: '', //变电站
         backgroundTestPerformed: 0, //是否开展背景测试
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
index f878f59f..dca37e32 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
@@ -28,7 +28,7 @@
             <el-descriptions-item label="变电站">
                 {{ detailData.substation }}
             </el-descriptions-item>
-            <el-descriptions-item label="工程名">
+            <el-descriptions-item label="项目名称">
                 {{ detailData.projectName }}
             </el-descriptions-item>
             <el-descriptions-item label="用户协议容量" v-if="detailData.userType == 0 || detailData.userType == 1">
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index 5dc431a0..520f2ab7 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -2,8 +2,8 @@
     <div>
         <TableHeader datePicker nextFlag theCurrentTime ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="用户名称">
-                    <el-input v-model="tableStore.table.params.projectName" placeholder="请输入用户名称"></el-input>
+                <el-form-item label="项目名称">
+                    <el-input v-model="tableStore.table.params.projectName" placeholder="请输入项目名称"></el-input>
                 </el-form-item>
                 <el-form-item label="所在地市">
                     <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
@@ -93,7 +93,7 @@ const tableStore = new TableStore({
     column: [
         { title: '序号', type: 'seq', width: 80 },
         { field: 'city', title: '所在地市', minWidth: 80 },
-        { field: 'projectName', title: '用户名称', minWidth: 170 },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
         {
             field: 'userType',
             title: '用户性质',
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 787fb6d7..81b925a1 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -71,8 +71,8 @@
             <el-form-item for="-" label="归口管理部门：" prop="responsibleDepartment">
                 <el-input v-model="form.responsibleDepartment" autocomplete="off" placeholder="请输入归口管理部门" />
             </el-form-item>
-            <el-form-item for="-" label="用户名称：" prop="projectName">
-                <el-input v-model="form.projectName" autocomplete="off" placeholder="请输入用户名称" />
+            <el-form-item for="-" label="项目名称：" prop="projectName">
+                <el-input v-model="form.projectName" autocomplete="off" placeholder="请输入项目名称" />
             </el-form-item>
             <el-form-item for="-" label="用户状态：" prop="userStatus">
                 <el-select v-model="form.userStatus" placeholder="请选择用户状态">
@@ -717,7 +717,7 @@ const resetForm = () => {
         city: areaOptionList[0].name, //所在地市 1
         responsibleDepartment: '', //归口管理部门 1
         userStatus: userStateList.value[0].value, //用户状态 1
-        projectName: '', //用户名称 1
+        projectName: '', //项目名称 1
         substation: '', //变电站 1
         voltageLevel: voltageLevelList[0].id, //电压等级 1
         evaluationDept: evaluationDeptList[0].name, //预测评估单位 1
@@ -894,7 +894,7 @@ const rules = ref({
     city: [{ required: true, message: '请选择所在地市', trigger: 'change' }],
     responsibleDepartment: [{ required: true, message: '请输入归口管理部门', trigger: 'blur' }],
     userStatus: [{ required: true, message: '请选择用户状态', trigger: 'change' }],
-    projectName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
+    projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
     substation: [{ required: true, message: '请输入变电站', trigger: 'blur' }],
     voltageLevel: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
     evaluationDept: [{ required: true, message: '请选择预测评估单位', trigger: 'change' }],
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
index 6caf07ad..560f6aa7 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
@@ -36,7 +36,7 @@
             <el-descriptions-item label="厂站名称">
                 {{ detailData.substation }}
             </el-descriptions-item>
-            <el-descriptions-item label="工程名">
+            <el-descriptions-item label="项目名称">
                 {{ detailData.projectName }}
             </el-descriptions-item>
             <el-descriptions-item label="电压等级">
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index 73db04c4..f584c97f 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -1,8 +1,8 @@
 <template>
     <TableHeader datePicker nextFlag theCurrentTime ref="TableHeaderRef">
         <template #select>
-            <el-form-item label="用户名称">
-                <el-input v-model="tableStore.table.params.projectName" placeholder="请输入用户名称"></el-input>
+            <el-form-item label="项目名称">
+                <el-input v-model="tableStore.table.params.projectName" placeholder="请输入项目名称"></el-input>
             </el-form-item>
             <el-form-item label="所在地市">
                 <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
@@ -95,7 +95,7 @@ const tableStore = new TableStore({
                 return row.cellValue
             }
         },
-        { field: 'projectName', title: '用户名称', minWidth: 170 },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
         {
             field: 'userType',
             title: '用户性质',
diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
index bd03eacd..ad01e5bc 100644
--- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
@@ -2,10 +2,10 @@
     <div>
         <TableHeader ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="用户名称">
+                <el-form-item label="项目名称">
                     <el-input
                         style="width: 200px"
-                        placeholder="请输入用户名称"
+                        placeholder="请输入项目名称"
                         v-model="tableStore.table.params.projectName"
                         clearable
                     ></el-input>
@@ -64,7 +64,9 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'projectName', title: '用户名称', minWidth: 170 },
+        { field: 'city', title: '所在地市', minWidth: 80 },
+        { field: 'substation', title: '厂站名称', minWidth: 100 },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
         {
             field: 'userType',
             title: '用户性质',
@@ -74,7 +76,7 @@ const tableStore = new TableStore({
                 return getUserTypeName(userType)
             }
         },
-        { field: 'city', title: '所在地市', minWidth: 80 },
+     
         { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',
@@ -94,7 +96,6 @@ const tableStore = new TableStore({
                 3: '退运'
             }
         },
-        { field: 'substation', title: '厂站名称', minWidth: 100 },
         {
             field: 'createBy',
             title: '填报人',
diff --git a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
index 03537e91..c6a0bd67 100644
--- a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
+++ b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
@@ -2,10 +2,10 @@
     <div>
         <TableHeader ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="用户名称">
+                <el-form-item label="项目名称">
                     <el-input
                         style="width: 200px"
-                        placeholder="请输入用户名称"
+                        placeholder="请输入项目名称"
                         v-model="tableStore.table.params.projectName"
                         clearable
                     ></el-input>
@@ -63,14 +63,40 @@ const tableStore = new TableStore({
     column: [
         {
             title: '序号',
-            width: 60,
+            width: 80,
             formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'projectName', title: '用户名称', minWidth: 170 },
         { field: 'city', title: '所在地市', minWidth: 80 },
+        {
+            field: 'substation',
+            title: '厂站名称',
+            minWidth: 100,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
+
         // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+
+        {
+            field: 'userReportSensitivePO.loadLevel',
+            title: '负荷级别',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'userReportSensitivePO.powerSupplyInfo',
+            title: '供电电源情况',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
         {
             field: 'userStatus',
             title: '用户状态',
@@ -89,30 +115,6 @@ const tableStore = new TableStore({
                 3: '退运'
             }
         },
-        {
-            field: 'substation',
-            title: '厂站名称',
-            minWidth: 100,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'userReportSensitivePO.loadLevel',
-            title: '负荷级别',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'userReportSensitivePO.powerSupplyInfo',
-            title: '供电电源情况',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
         {
             field: 'createBy',
             title: '填报人',
diff --git a/src/views/system/auth/userList/popupPwd.vue b/src/views/system/auth/userList/popupPwd.vue
index 65183aeb..09caba0b 100644
--- a/src/views/system/auth/userList/popupPwd.vue
+++ b/src/views/system/auth/userList/popupPwd.vue
@@ -41,8 +41,8 @@ const rules = {
         { required: true, message: '请输入密码', trigger: 'blur' },
         {
             min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
+            max: 12,
+            message: '长度在 6 到 12 个字符',
             trigger: 'blur'
         },
         { validator: validatePwd, trigger: 'blur' }
@@ -51,8 +51,8 @@ const rules = {
         { required: true, message: '请确认密码', trigger: 'blur' },
         {
             min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
+            max: 12,
+            message: '长度在 6 到 12 个字符',
             trigger: 'blur'
         },
         {
diff --git a/src/views/user/popupUpdatePwd.vue b/src/views/user/popupUpdatePwd.vue
index 4a4d8ae5..c3dd773d 100644
--- a/src/views/user/popupUpdatePwd.vue
+++ b/src/views/user/popupUpdatePwd.vue
@@ -41,8 +41,8 @@ const rules = {
         { required: true, message: '请输入密码', trigger: 'blur' },
         {
             min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
+            max: 12,
+            message: '长度在 6 到 12 个字符',
             trigger: 'blur'
         },
         { validator: validatePwd, trigger: 'blur' }
@@ -51,8 +51,8 @@ const rules = {
         { required: true, message: '请确认密码', trigger: 'blur' },
         {
             min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
+            max: 12,
+            message: '长度在 6 到 12 个字符',
             trigger: 'blur'
         },
         {