diff --git a/src/api/system/lockUser.js b/src/api/system/lockUser.js new file mode 100644 index 00000000..521e2a62 --- /dev/null +++ b/src/api/system/lockUser.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 查询【请填写功能名称】列表 +export function list() { + return request({ + url: '/system/user/getLockUser', + method: 'get' + }) +} + +// 查询【请填写功能名称】详细 +export function delLockUser(data) { + return request({ + url: '/system/user/delLockUser', + method: 'post', + data:data + }) +} diff --git a/src/components/bonus/passwordVerifiers/index.vue b/src/components/bonus/passwordVerifiers/index.vue new file mode 100644 index 00000000..762e8b79 --- /dev/null +++ b/src/components/bonus/passwordVerifiers/index.vue @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/views/system/ipWhitelist/index.vue b/src/views/system/ipWhitelist/index.vue index cb876cd3..991f4a00 100644 --- a/src/views/system/ipWhitelist/index.vue +++ b/src/views/system/ipWhitelist/index.vue @@ -75,17 +75,17 @@ - + {{scope.row.ipAddress?scope.row.ipAddress:scope.row.ipRangeStart+" - " + scope.row.ipRangeEnd}} - + - {{!scope.row.accessStartTime?"不限时间":parseTime(scope.row.accessStartTime,'{h}:{i}:{s}')+" - " + parseTime(scope.row.accessEndTime,'{h}:{i}:{s}')}} + {{!scope.row.accessStartTime?"不限时间":parseTime(scope.row.accessStartTime)+" - " + parseTime(scope.row.accessEndTime)}} - + - - + start-placeholder="开始日期" + end-placeholder="结束日期"> + @@ -472,7 +469,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids - this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项?').then(function() { + this.$modal.confirm('是否确认删除这些数据项?').then(function() { return delWhitelist(ids) }).then(() => { this.getList() diff --git a/src/views/system/lockUser/index.vue b/src/views/system/lockUser/index.vue index 762e8b79..7d8d23bc 100644 --- a/src/views/system/lockUser/index.vue +++ b/src/views/system/lockUser/index.vue @@ -1,11 +1,83 @@ - - + + + + 解除锁定 + + + + + + + + + + - + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 17a0e260..d1bd9de8 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -108,7 +108,7 @@ - {{scope.row.isPermanent==0?"长期账号":"临时账号" }} + {{scope.row.isPermanent==1?"长期账号":"临时账号" }}