-

src/api/tenantManage/adminConfig.js

@@ -57,4 +57,14 @@ export function outagePlanListExport(params) {
         method: 'GET',
         params,
     })
+}
+
+// 管理员配置-重置密码
+// 个人中心，密码修改
+export async function updatePwd(params) {
+    return request({
+        url: '/userconfig/updatePwd',
+        method: 'put',
+        params,
+    })
 }

src/views/tenantManage/adminConfig/component/adminDialog.vue

@@ -42,7 +42,11 @@
             clearable
           />
         </el-form-item>
-        <el-form-item label="管理员密码:" prop="password" v-if="dialogTitle != '修改'">
+        <el-form-item
+          label="管理员密码:"
+          prop="password"
+          v-if="dialogTitle != '修改'"
+        >
           <el-input
             v-model="form.password"
             placeholder="请输入管理员密码"
@@ -136,7 +140,6 @@ export default defineComponent({
       form.value = props.itemInfo
       console.log('form.value')
       console.log(form.value)
-
     }
 
     // close(): Dialog弹窗关闭之后做的事

src/views/tenantManage/adminConfig/component/resetPass.vue

@@ -7,7 +7,14 @@
     @open="open(0)"
   >
     <div class="dialogOne">
-      重置密码
+      <el-form :model="form" :rules="rules" ref="formInfo"  label-width="120px">
+        <el-form-item label="密码" prop="newPassword" type="password">
+          <el-input v-model="form.newPassword" show-password />
+        </el-form-item>
+        <el-form-item label="再次输入" prop="passAgain" type="password">
+          <el-input v-model="form.passAgain" show-password />
+        </el-form-item>
+      </el-form>
     </div>
     <template #footer>
       <span class="dialog-footer">
@@ -23,7 +30,6 @@ import { useStore } from 'vuex'
 import { defineComponent, ref, watchEffect } from 'vue'
 import * as api from '@/api/tenantManage/adminConfig.js'
 import { ElMessage } from 'element-plus'
-import { validatorPhone, isEmail } from '@/utils'
 
 export default defineComponent({
   name: 'powerEquip',
@@ -45,15 +51,46 @@ export default defineComponent({
     store
 
     const form = ref({})
+    const formInfo = ref(null)
 
     const cloneDialog = ref(false) //重置密码弹窗控制
     const ruleForm = ref(null)
 
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'))
+      } else if (
+        !/^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,20}$/.test(value)
+      ) {
+        callback(new Error('请输入6-18位特殊字符、字母、数字组合的密码'))
+      } else {
+        if (this.ruleForm.confirmPwd !== '') {
+          this.$refs.ruleForm.validateField('confirmPwd')
+        }
+        callback()
+      }
+    }
+    const validatePass2 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'))
+      } else if (value !== form.value.newPassword) {
+        callback(new Error('两次输入密码不一致!'))
+      } else {
+        callback()
+      }
+    }
+
     const submit = () => {
-      ruleForm.value.validate((valid) => {
+      alert('提交')
+
+
+      formInfo.value.validate((valid) => {
+
+           alert('验证')
         if (valid) {
-          if (props.dialogTitle === '修改') {
-            api.updateserData(form.value).then((requset) => {
+            alert('验证通过')
+
+            api.updatePwd(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '修改成功',
@@ -64,43 +101,66 @@ export default defineComponent({
                 ElMessage.error(requset.msg)
               }
             })
-          } else {
-            api.addUserData(form.value).then((requset) => {
-              if (requset.status === 'SUCCESS') {
-                ElMessage.success({
-                  message: '配置成功',
-                  type: 'success',
-                })
-                close()
-              } else {
-                ElMessage.error(requset.msg)
-              }
-            })
-          }
+        //   if (props.dialogTitle === '修改') {
+            
+        //   } else {
+        //     api.updatePwd(form.value).then((requset) => {
+        //       if (requset.status === 'SUCCESS') {
+        //         ElMessage.success({
+        //           message: '配置成功',
+        //           type: 'success',
+        //         })
+        //         close()
+        //       } else {
+        //         ElMessage.error(requset.msg)
+        //       }
+        //     })
+        //   }
         } else {
           console.log('error submit!!')
           return false
         }
       })
+
+
+    //   formInfo.value.validate((valid) => {
+    //     alert('验证')
+    //     if (valid) {
+    //       alert('验证通过')
+    //       api.updatePwd(form.value).then((requset) => {
+    //         if (requset.status === 'SUCCESS') {
+    //           ElMessage.success({
+    //             message: '修改密码成功',
+    //             type: 'success',
+    //           })
+    //           close()
+    //         } else {
+    //           ElMessage.error(requset.msg)
+    //         }
+    //       })
+    //     } else {
+    //       console.log('error submit!!')
+    //       return false
+    //     }
+    //   })
     }
 
     const open = () => {
       form.value = props.itemInfo
       console.log('form.value')
       console.log(form.value)
-
     }
 
     // close(): Dialog弹窗关闭之后做的事
     const close = () => {
-        // alert('关闭了')
-    //   resetForm()
+      // alert('关闭了')
+      //   resetForm()
 
       context.emit('closeNo3', false)
       cloneDialog.value = false
     }
     function resetForm() {
-      ruleForm.value.resetFields()
+      formInfo.value.resetFields()
     }
 
     watchEffect((fn, options) => {
@@ -118,58 +178,18 @@ export default defineComponent({
 
       ruleForm,
       resetForm,
+      formInfo,
+
+      validatePass,
+      validatePass2,
       rules: {
-        nickName: [
-          {
-            required: true,
-            message: '管理员姓名不能为空',
-            trigger: 'blur',
-          },
-        ],
-        userName: [
-          {
-            required: true,
-            message: '管理员账号不能为空',
-            trigger: 'blur',
-          },
-        ],
-        email: [
-          {
-            required: true,
-            message: '管理员邮箱不能为空',
-            trigger: 'blur',
-          },
-          {
-            validator: isEmail,
-            message: '输入的邮箱地址不正确',
-            trigger: 'blur',
-          },
-        ],
-        phonenumber: [
-          {
-            required: true,
-            message: '管理员手机号不能为空',
-            trigger: 'blur',
-          },
-          {
-            validator: validatorPhone,
-            message: '输入的电话号码不正确',
-            trigger: 'blur',
-          },
-        ],
-        password: [
-          {
-            required: true,
-            message: '密码不能为空',
-            trigger: 'blur',
-          },
+        newPassword: [
+          { required: true, message: '请输入密码', trigger: 'blur' },
+          { validator: validatePass, trigger: 'blur' },
         ],
-        status: [
-          {
-            required: true,
-            message: '转态不能为空',
-            trigger: 'blur',
-          },
+        passAgain: [
+          { required: true, message: '请再次输入密码', trigger: 'blur' },
+          { validator: validatePass2, trigger: 'blur', required: true },
         ],
       },
     }