diff --git a/src/App.vue b/src/App.vue index 6e9cfbf..bd840bd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,7 +15,7 @@ export default { name: 'App', components: { ThemePicker }, created() { - // get() + get() }, metaInfo() { return { diff --git a/src/api/system/user.js b/src/api/system/user.js index fa78c0e..e9efa8c 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -154,9 +154,10 @@ export function checkPasswordStatus(data) { }) } -export function confirmPassword(password) { +export function confirmPassword(password,userId) { const data = { - password + password, + userId } return request({ url: '/system/user/confirmPassword', @@ -165,5 +166,37 @@ export function confirmPassword(password) { }) } +// 工程下拉选 +export function getProsList(data) { + return request({ + url: '/bmw/pmProject/listAll', + method: 'get' + }) +} + +// 分公司下拉选 +export function getCompanyList(data) { + return request({ + url: '/bmw/subCompany/listAll', + method: 'get' + }) +} + +// 分包商下拉选 +export function getSubList(data) { + return request({ + url: '/bmw/pmSub/listAll', + method: 'get' + }) +} + +// 角色下拉选 +export function getRoleList(data) { + return request({ + url: '/system/user/getRoleList', + method: 'POST', + data:data + }) +} diff --git a/src/utils/validate.js b/src/utils/validate.js index 1dca102..7a6d0c1 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -122,18 +122,18 @@ export function validateNewPassword(rule, value, callback) { return } // 3. 检查是否包含弱密码 - for (const weakPwd of systemConfig.passwordConfig.weakPasswords) { + /* for (const weakPwd of systemConfig.passwordConfig.weakPasswords) { // 将密码和弱密码都转换为小写进行比较 if (value.toLowerCase().includes(weakPwd.toLowerCase())) { callback(new Error(`密码包含常见的弱密码片段: ${weakPwd}`)) return } - } + } */ // 4. 检查是否包含超过规定数量的连续字符 - if (systemConfig.passwordConfig.restrictConsecutiveChars && containsConsecutiveCharacters(value, systemConfig.passwordConfig.maxConsecutiveChars)) { + /* if (systemConfig.passwordConfig.restrictConsecutiveChars && containsConsecutiveCharacters(value, systemConfig.passwordConfig.maxConsecutiveChars)) { callback(new Error(`密码不能包含超过${systemConfig.passwordConfig.maxConsecutiveChars}位连续字符！`)) return - } + } */ callback() // 验证成功 } diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index eb299ab..d396391 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -2,49 +2,29 @@
- + - - + + + + + + 搜索 重置 @@ -53,125 +33,89 @@ - 新增 + 新增 - - 修改 + + + - - - - - - - -