From 828794effab065d75b3868fe4edb6d07cd91b2a2 Mon Sep 17 00:00:00 2001
From: jiang <jiang@bonus>
Date: Thu, 7 Nov 2024 15:02:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/lockUser.js                    | 18 ++++
 .../bonus/passwordVerifiers/index.vue         | 11 +++
 src/views/system/ipWhitelist/index.vue        | 23 +++--
 src/views/system/lockUser/index.vue           | 86 +++++++++++++++++--
 src/views/system/user/index.vue               |  2 +-
 5 files changed, 119 insertions(+), 21 deletions(-)
 create mode 100644 src/api/system/lockUser.js
 create mode 100644 src/components/bonus/passwordVerifiers/index.vue

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 @@
+<script setup>
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
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 @@
     <el-table v-loading="loading" :data="whitelistList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50"/>
-      <el-table-column label="IP地址" align="center" prop="ipAddress">
+      <el-table-column label="IP地址" align="center" prop="ipAddress" min-width="120px">
         <template slot-scope="scope">
           <span> {{scope.row.ipAddress?scope.row.ipAddress:scope.row.ipRangeStart+" - " + scope.row.ipRangeEnd}} </span>
         </template>
       </el-table-column>
-      <el-table-column label="开放时间" align="center" prop="ipRangeStart">
+      <el-table-column label="开放时间" align="center" prop="ipRangeStart" min-width="120px">
         <template slot-scope="scope">
-          <span> {{!scope.row.accessStartTime?"不限时间":parseTime(scope.row.accessStartTime,'{h}:{i}:{s}')+" - " + parseTime(scope.row.accessEndTime,'{h}:{i}:{s}')}} </span>
+          <span> {{!scope.row.accessStartTime?"不限时间":parseTime(scope.row.accessStartTime)+" - " + parseTime(scope.row.accessEndTime)}} </span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" key="status">
+      <el-table-column label="状态" align="center" key="status" min-width="20px">
         <template slot-scope="scope">
           <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
                      @change="handleStatusChange(scope.row)"
@@ -170,17 +170,14 @@
           </el-radio-group>
           <el-row v-if="timeLimit === 'limited'" :gutter="24">
             <el-col :span="10">
-              <el-time-picker
-                is-range
-                :editable=false
+              <el-date-picker
                 v-model="form.accessStartTime"
+                type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="选择时间范围"
-              >
-              </el-time-picker>
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
             </el-col>
           </el-row>
 
@@ -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 @@
-<script setup>
-
-</script>
-
 <template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          size="mini"
+          @click="handleUpdate"
+          :disabled="multiple"
+        >解除锁定
+        </el-button>
+      </el-col>
+    </el-row>
 
+    <el-table  ref="multipleTable" v-loading="loading" @row-click="handleRowClick" :data="list" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50"/>
+      <el-table-column label="用户名" align="center" prop="userName"/>
+      <el-table-column label="锁定时长(分钟)" align="center" prop="time"/>
+    </el-table>
+  </div>
 </template>
 
-<style scoped lang="scss">
-
-</style>
+<script>
+import { list,delLockUser} from '@/api/system/lockUser'
+import { delWhitelist } from '@/api/system/ipWhitelist'
+export default {
+  name: 'LockUser',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      list:[],
+      // 非多个禁用
+      multiple: true,
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      list().then(response => {
+        this.list = response.data;
+        this.loading = false
+      })
+    },
+    handleRowClick(row, column, event) {
+      const table = this.$refs.multipleTable;
+      const selectedRows = table.selection;
+      // Check if the row is already selected
+      const isRowSelected = selectedRows.includes(row);
+      if (isRowSelected) {
+        // If the row is selected, unselect it
+        table.toggleRowSelection(row, false);
+      } else {
+        // If the row is not selected, select it
+        table.toggleRowSelection(row, true);
+      }
+    },
+    handleUpdate(){
+      const ids = this.ids
+      this.$modal.confirm('是否确认解锁这些数据项？').then(function() {
+        return delLockUser(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('解锁成功')
+      }).catch(() => {
+      })
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userName)
+      this.multiple = !selection.length
+    },
+  }
+}
+</script>
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 @@
 
           <el-table-column label="账号时效" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.isPermanent==0?"长期账号":"临时账号" }}</span>
+              <span>{{scope.row.isPermanent==1?"长期账号":"临时账号" }}</span>
             </template>
           </el-table-column>