diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index 543a460..861edfb 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -4,7 +4,7 @@ import ElementPlus from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import axios from 'axios'
 import moment from 'moment'
-import { UserFilled } from '@element-plus/icons-vue'
+import {InfoFilled, UserFilled} from '@element-plus/icons-vue'
 import _ from 'lodash'
 import request from '@/util/http'
 import API from '@/util/http'
@@ -500,7 +500,6 @@ const permissionEdit = async function () {
         postiton: permissionEditObj.value.postiton,//职位
         roleId: permissionEditObj.value.roleId,//角色id
         machineId: permissionEditObj.value.machineIds[0],//机器码
-        machineId: permissionEditObj.value.machineIds[0],//机器码
         machineIds: permissionEditObj.value.machineIds[1],//机器码
         password: permissionEditObj.value.password,//
         remark: permissionEditObj.value.remark//备注
@@ -634,6 +633,17 @@ const editStatus = async function (row) {
   }
 }
 
+// 重置密码弹窗状态
+const resetConfirmVisible = ref(false)
+// 当前选中的行数据
+const currentRow = ref(null)
+// 重置密码
+const resetPassword = function (row) {
+  // 显示确认弹窗
+  currentRow.value = row
+  resetConfirmVisible.value = true
+}
+
 
 const handlePageSizeChange = function (val) {
   getObj.value.pageSize = val
@@ -724,32 +734,38 @@ const showMenuTree = (treeData, roleName) => {
   currentRoleName.value = roleName || '权限详情';
   menuTreeVisible.value = true;
 };
-//用户密码重置
-const resetPassword = async function (row) {
+// 确认重置密码
+const confirmResetPassword = async function () {
+  const params = {
+    account: currentRow.value.account,
+  }
+  console.log(params)
+  // 发送请求
   try {
-
-    await ElMessageBox.confirm(
-      `确认重置该账号密码？`,
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: "warning",
-        lockScroll: false
-      }
-    );
-    const res = await API({
+    const result = await request({
       url: '/admin/reset',
-      data: { account: row.account }
+      method: 'post',
+      data: params // 直接传递params对象
     })
-    if (res.code == 200) {
-      ElMessage.success(res.data)
+    if (result.code === 200) { // 使用严格相等运算符
+      ElMessage.success('重置密码成功')
+      resetConfirmVisible.value = false // 关闭弹窗
+    } else {
+      ElMessage.error(result.message || '重置密码失败')
     }
   } catch (error) {
-    ElMessage.error('请求失败', error)
+    ElMessage.error('重置密码失败')
+    console.error('请求错误:', error)
   }
 }
 
+// 取消重置密码
+const cancelResetPassword = function () {
+  resetConfirmVisible.value = false
+}
+
+
+
 
 // 挂载
 onMounted(async function () {
@@ -1123,6 +1139,30 @@ const Rolerules = reactive({
       </div>
     </template>
   </el-dialog>
+  <!-- 重置密码确认弹窗 -->
+  <el-dialog
+      v-model="resetConfirmVisible" width="500px" :close-on-click-modal="false" :before-close="cancelResetPassword"
+  >
+    <el-row>
+      <el-col :span="4" style="margin-top: 20px">
+        <el-icon class="dialog-icon" color="#10AEFF" size="50">
+          <InfoFilled/>
+        </el-icon>
+      </el-col>
+      <el-col :span="20">
+        <h3>提示</h3>
+        <p class="dialog-title">确认重置该账号密码？</p>
+        <p class="dialog-desc">重置后密码为: 123456，请通知用户及时修改</p>
+      </el-col>
+    </el-row>
+    <template #footer>
+      <div style="align-content: center ; gap: 30px">
+        <el-button @click="cancelResetPassword">取消</el-button>
+        <el-button type="primary" @click="confirmResetPassword">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+
 </template>
 
 <style scoped>