diff --git a/src/api/pwdLog.js b/src/api/pwdLog.js new file mode 100644 index 0000000..f7279f9 --- /dev/null +++ b/src/api/pwdLog.js @@ -0,0 +1,12 @@ +/** + * 密码接口 + */ +import request from '@/utils/request' +// 角色查询 +export function getPwdLogList(params) { + return request({ + url: 'door/pwdLog', + method: 'get', + params + }) +} diff --git a/src/api/pwdLog.js b/src/api/pwdLog.js new file mode 100644 index 0000000..f7279f9 --- /dev/null +++ b/src/api/pwdLog.js @@ -0,0 +1,12 @@ +/** + * 密码接口 + */ +import request from '@/utils/request' +// 角色查询 +export function getPwdLogList(params) { + return request({ + url: 'door/pwdLog', + method: 'get', + params + }) +} diff --git a/src/icons/svg/pwdLog.svg b/src/icons/svg/pwdLog.svg new file mode 100644 index 0000000..74380ac --- /dev/null +++ b/src/icons/svg/pwdLog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/pwdLog.js b/src/api/pwdLog.js new file mode 100644 index 0000000..f7279f9 --- /dev/null +++ b/src/api/pwdLog.js @@ -0,0 +1,12 @@ +/** + * 密码接口 + */ +import request from '@/utils/request' +// 角色查询 +export function getPwdLogList(params) { + return request({ + url: 'door/pwdLog', + method: 'get', + params + }) +} diff --git a/src/icons/svg/pwdLog.svg b/src/icons/svg/pwdLog.svg new file mode 100644 index 0000000..74380ac --- /dev/null +++ b/src/icons/svg/pwdLog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/modules/system.js b/src/router/modules/system.js index e93d6ba..24346da 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -66,6 +66,12 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } + }, + { + path: '/pwdLog', + component: () => import('@/views/system/pwdLog/list'), // Parent router-view + name: 'PwdLog', + meta: { title: '密码日志', permission: ['/pwdLog'] } } ] } diff --git a/src/api/pwdLog.js b/src/api/pwdLog.js new file mode 100644 index 0000000..f7279f9 --- /dev/null +++ b/src/api/pwdLog.js @@ -0,0 +1,12 @@ +/** + * 密码接口 + */ +import request from '@/utils/request' +// 角色查询 +export function getPwdLogList(params) { + return request({ + url: 'door/pwdLog', + method: 'get', + params + }) +} diff --git a/src/icons/svg/pwdLog.svg b/src/icons/svg/pwdLog.svg new file mode 100644 index 0000000..74380ac --- /dev/null +++ b/src/icons/svg/pwdLog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/modules/system.js b/src/router/modules/system.js index e93d6ba..24346da 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -66,6 +66,12 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } + }, + { + path: '/pwdLog', + component: () => import('@/views/system/pwdLog/list'), // Parent router-view + name: 'PwdLog', + meta: { title: '密码日志', permission: ['/pwdLog'] } } ] } diff --git a/src/views/doorManage/setPassword.vue b/src/views/doorManage/setPassword.vue index dd2b740..bfe2be4 100644 --- a/src/views/doorManage/setPassword.vue +++ b/src/views/doorManage/setPassword.vue @@ -49,12 +49,20 @@ if (testValue === '') { callback(new Error('密码不能为空')) } else { - var reg = /^0+$/g - if (reg.test(testValue)) { + var reg0 = /^0+$/g + // var reg1 = /^[^\u4e00-\u9fa5]{0,}$/ + if (reg0.test(testValue)) { callback(new Error('密码不能全为0')) } - if(value.length !== 6) { - callback(new Error('密码长度为6位')) + // if (!reg1.test(testValue)) { + // callback(new Error('密码不能含有中文字符')) + // } + // if(value.length !== 6) { + // callback(new Error('密码长度为6位')) + // } + var reg = /^\d{6}$/g + if (!reg.test(testValue)) { + callback(new Error('密码为6位的数字')) } callback() } @@ -101,6 +109,9 @@ if(multipleSelection.length === 1 && multipleSelection[0].needPwd === 1) { // 对单个门禁进行修改--初始化 this.form.needPwd = multipleSelection[0].needPwd | 0 //是否启用密码 this.form.pwdMode = multipleSelection[0].pwdMode | '' //密码模式 + if(multipleSelection[0].pwd) { + this.form.pwd = atob(multipleSelection[0].pwd) + } } }, // 确定 diff --git a/src/api/pwdLog.js b/src/api/pwdLog.js new file mode 100644 index 0000000..f7279f9 --- /dev/null +++ b/src/api/pwdLog.js @@ -0,0 +1,12 @@ +/** + * 密码接口 + */ +import request from '@/utils/request' +// 角色查询 +export function getPwdLogList(params) { + return request({ + url: 'door/pwdLog', + method: 'get', + params + }) +} diff --git a/src/icons/svg/pwdLog.svg b/src/icons/svg/pwdLog.svg new file mode 100644 index 0000000..74380ac --- /dev/null +++ b/src/icons/svg/pwdLog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/modules/system.js b/src/router/modules/system.js index e93d6ba..24346da 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -66,6 +66,12 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } + }, + { + path: '/pwdLog', + component: () => import('@/views/system/pwdLog/list'), // Parent router-view + name: 'PwdLog', + meta: { title: '密码日志', permission: ['/pwdLog'] } } ] } diff --git a/src/views/doorManage/setPassword.vue b/src/views/doorManage/setPassword.vue index dd2b740..bfe2be4 100644 --- a/src/views/doorManage/setPassword.vue +++ b/src/views/doorManage/setPassword.vue @@ -49,12 +49,20 @@ if (testValue === '') { callback(new Error('密码不能为空')) } else { - var reg = /^0+$/g - if (reg.test(testValue)) { + var reg0 = /^0+$/g + // var reg1 = /^[^\u4e00-\u9fa5]{0,}$/ + if (reg0.test(testValue)) { callback(new Error('密码不能全为0')) } - if(value.length !== 6) { - callback(new Error('密码长度为6位')) + // if (!reg1.test(testValue)) { + // callback(new Error('密码不能含有中文字符')) + // } + // if(value.length !== 6) { + // callback(new Error('密码长度为6位')) + // } + var reg = /^\d{6}$/g + if (!reg.test(testValue)) { + callback(new Error('密码为6位的数字')) } callback() } @@ -101,6 +109,9 @@ if(multipleSelection.length === 1 && multipleSelection[0].needPwd === 1) { // 对单个门禁进行修改--初始化 this.form.needPwd = multipleSelection[0].needPwd | 0 //是否启用密码 this.form.pwdMode = multipleSelection[0].pwdMode | '' //密码模式 + if(multipleSelection[0].pwd) { + this.form.pwd = atob(multipleSelection[0].pwd) + } } }, // 确定 diff --git a/src/views/system/pwdLog/list.vue b/src/views/system/pwdLog/list.vue new file mode 100644 index 0000000..7c0f8c3 --- /dev/null +++ b/src/views/system/pwdLog/list.vue @@ -0,0 +1,198 @@ + + + + + +