用户组

src/api/safetyManagement/groupConfig.js

@@ -14,3 +14,55 @@ export function queryAll(query) {
     params: query
   })
 }
+
+
+export function query(data) {
+  return request({
+    url: '/console/usergroup/query',
+    method: 'post',
+    data: data
+  })
+}
+
+
+export function initEdit(data) {
+  return request({
+    url: '/console/usergroup/initEdit',
+    method: 'post',
+    data: data
+  })
+}
+
+
+  export function add(data) {
+    return request({
+      url: '/console/usergroup/add',
+      method: 'post',
+      data: data
+    })
+  }
+
+  export function modify(data) {
+    return request({
+      url: '/console/usergroup/modify',
+      method: 'post',
+      data: data
+    })
+  }
+  
+  export function del(data) {
+    return request({
+      url: '/console/usergroup/del',
+      method: 'post',
+      data: data
+    })
+  }
+
+  export function checkNameExit(query) {
+    return request({
+      url: '/console/usergroup/checkNameExit',
+      method: 'get',
+      params: query
+    })
+  }
+

src/views/safetyManagement/groupConfig/index.vue

@@ -11,10 +11,10 @@
       <el-form :inline="true" :model="searchForm" class="search-form">
         <div class="left-area">
           <el-form-item label="用户组名:">
-            <el-input v-model="searchForm.groupname" placeholder="请输入用户组名"></el-input>
+            <el-input v-model="searchForm.groupname" clearable placeholder="请输入用户组名"></el-input>
           </el-form-item>
           <el-form-item label="备注:">
-            <el-input v-model="searchForm.remark" placeholder="请输入备注"></el-input>
+            <el-input v-model="searchForm.remark" clearable placeholder="请输入备注"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleSearch">搜索</el-button>
@@ -29,24 +29,36 @@
     <!-- 用户列表 -->
     <div class="user-list">
       <div class="user-grid">
-        <div v-for="(user, index) in userList" :key="index" class="user-card">
+        <div v-for="(user, index) in groupList" :key="index" class="user-card">
+          <div class="card-left-bar"></div>
           <div class="user-info">
-            <div class="avatar">
-              <el-avatar :size="50" icon="User"></el-avatar>
-            </div>
             <div class="info">
               <div class="name">{{ user.groupname }}</div>
-              <div class="remark">备注: {{ user.remark }}</div>
+              <div class="remark">
+                <el-icon><Edit /></el-icon>
+                备注 {{ user.remark }}
+              </div>
+            </div>
+            <div class="avatar">
+              <el-avatar :size="80" icon="UserFilled" style="background: #f6f8fa; color: #d3d8e0;" />
+            </div>
+          </div>
+          <div class="card-divider"></div>
+          <div class="card-bottom">
+            <div>
+              <el-icon><Clock /></el-icon>
+              {{ user.createtime || '' }}
+            </div>
+            <el-icon class="lock"><Lock /></el-icon>
           </div>
-            <!-- 遮罩层和操作按钮 -->
           <div class="hover-mask">
             <div class="operation-buttons">
               <div class="operation-btn" @click="handleDelete(user)">
-                  <i class="el-icon-delete"></i>
+                <el-icon><Delete /></el-icon>
                 <span>删除</span>
               </div>
               <div class="operation-btn" @click="handleEdit(user)">
-                  <i class="el-icon-edit"></i>
+                <el-icon><FolderOpened /></el-icon>
                 <span>编辑</span>
               </div>
             </div>
@@ -54,11 +66,12 @@
         </div>
       </div>
     </div>
-    </div>
 
     <!-- 分页 -->
     <div class="pagination">
-      <div class="pagination-info">共有记录 1条，每页显示 8条，共 1页</div>
+      <div class="pagination-info">
+        共有记录 {{ total }} 条，每页显示 {{ pageSize }} 条，共 {{ Math.ceil(total / pageSize) || 1 }} 页
+      </div>
       <el-pagination
         background
         layout="prev, pager, next, jumper"
@@ -78,72 +91,85 @@
   </div>
 </template>
 
-<script>
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessageBox } from 'element-plus'
 import GroupEdit from './edit.vue'
+import { query, del } from '@/api/safetyManagement/groupConfig.js'
 
-export default {
-  name: 'GroupConfig',
-  components: {
-    GroupEdit
-  },
-  data() {
-    return {
-      searchForm: {
+const searchForm = reactive({
   name: '',
   groupname: '',
   remark: ''
-      },
-      userList: [
+})
+const groupList = ref([
   {
-          realname: 'admin',
-          groupname: 'admin',
-          remark: ''
+    // realname: 'admin',
+    // groupname: 'admin',
+    // remark: ''
+  }
+])
+const total = ref(1)
+const currentPage = ref(1)
+const pageSize = ref(8)
+const editVisible = ref(false)
+const editData = ref(null)
+
+const getList = async () => {
+  try {
+    const res = await query({
+      groupname: searchForm.groupname,
+      remark: searchForm.remark,
+      page: currentPage.value,
+      rows: pageSize.value
+    })
+    if (res.code === 'POP_00014') {
+      groupList.value = res.data.list || []
+      total.value = res.data.total || 0
+    }
+  } catch (error) {
+    console.error('获取用户组列表失败', error)
   }
-      ],
-      total: 1,
-      currentPage: 1,
-      pageSize: 8,
-      editVisible: false,
-      editData: null
-    }
-  },
-  methods: {
-    handleSearch() {
-      // 实现搜索逻辑
-    },
-    handleAdd() {
-      // 打开新增用户弹窗
-      this.editData = null
-      this.editVisible = true
-    },
-    handlePageChange(page) {
-      // 实现分页逻辑
-    },
-    handleDelete(row) {
-      // 实现删除用户逻辑
-      this.$confirm('确认删除该用户组吗？', '提示', {
+}
+
+const handleSearch = () => {
+  currentPage.value = 1
+  getList()
+}
+const handleAdd = () => {
+  editData.value = null
+  editVisible.value = true
+}
+const handlePageChange = (page) => {
+  currentPage.value = page
+  getList()
+}
+const handleDelete = async (row) => {
+  ElMessageBox.confirm('确认删除该用户组吗？', '提示', {
     type: 'warning'
-      }).then(() => {
+  }).then(async () => {
     // 调用删除接口
-        console.log('删除用户组', row)
-      }).catch(() => {})
-    },
-    handleEdit(row) {
-      // 打开编辑用户弹窗
-      this.editData = { ...row }
-      this.editVisible = true
-    },
-    handleEditSuccess() {
-      // 编辑成功后的回调
-      this.editVisible = false
-      // 刷新列表数据
-      this.getList()
-    },
-    getList() {
-      // 获取用户列表数据
+    try {
+      const res = await del({ groupid: row.id })
+      if (res.code === 'POP_00014') {
+        getList()
       }
+    } catch (error) {
+      console.error('删除用户组失败', error)
     }
+  }).catch(() => {})
+}
+const handleEdit = (row) => {
+  editData.value = { ...row }
+  editVisible.value = true
+}
+const handleEditSuccess = () => {
+  editVisible.value = false
+  getList()
 }
+onMounted(() => {
+  getList()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -202,37 +228,105 @@ export default {
 
     .user-card {
       background: #fff;
-      border-radius: 8px;
-      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+      border-radius: 12px;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.04);
       overflow: hidden;
+      position: relative;
+      padding: 0;
+      border: none;
+      transition: box-shadow 0.2s;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      &:hover {
+        box-shadow: 0 4px 24px rgba(0, 0, 0, 0.08);
+      }
+
+      &:hover .hover-mask {
+        display: flex !important;
+      }
+    }
+
+    .card-left-bar {
+      position: absolute;
+      left: 0;
+      top: 24px;
+      bottom: 24px;
+      width: 8px;
+      background: #409EFF;
+      border-radius: 4px;
     }
 
     .user-info {
       display: flex;
-      align-items: center;
-      padding: 20px;
+      align-items: flex-start;
+      padding: 24px 24px 0 24px;
       position: relative;
+      height: auto;
       cursor: pointer;
-      height: 100%;
 
       .avatar {
-        margin-right: 15px;
+        margin-left: auto;
+        margin-right: 0;
+        width: 80px;
+        height: 80px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
 
       .info {
         flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: flex-start;
 
         .name {
-          font-size: 16px;
-          font-weight: bold;
-          margin-bottom: 8px;
-          color: #333;
+          font-size: 15px;
+          font-weight: 600;
+          color: #409EFF;
+          margin-bottom: 12px;
         }
 
-        .groupname, .remark {
+        .remark {
+          font-size: 12px;
           color: #666;
-          font-size: 14px;
-          margin-bottom: 5px;
+          margin-bottom: 8px;
+          display: flex;
+          align-items: center;
+          gap: 6px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          max-width: 300px;
+        }
+      }
+    }
+
+    .card-divider {
+      height: 2px;
+      background: #f2f6fa;
+      margin: 12px 24px 0 24px;
+      border-radius: 1px;
+    }
+
+    .card-bottom {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 8px 24px 12px 24px;
+      color: #909399;
+      font-size: 15px;
+
+      .el-icon {
+        margin-right: 6px;
+      }
+
+      .lock {
+        font-size: 18px;
+        color: #bdbdbd;
+        margin-left: 8px;
       }
     }
 
@@ -243,13 +337,16 @@ export default {
       width: 100%;
       height: 100%;
       background-color: rgba(0, 0, 0, 0.6);
-        display: none;
+      display: none !important;
       justify-content: center;
       align-items: center;
+      z-index: 2;
 
       .operation-buttons {
         display: flex;
-          gap: 30px;
+        gap: 80px;
+        justify-content: center;
+        align-items: center;
 
         .operation-btn {
           display: flex;
@@ -257,14 +354,18 @@ export default {
           align-items: center;
           color: white;
           cursor: pointer;
+          background: none;
+          border-radius: 0;
+          padding: 0;
+          box-shadow: none;
+          transition: color 0.2s;
 
           i {
-              font-size: 24px;
             margin-bottom: 8px;
           }
 
           span {
-              font-size: 14px;
+            font-weight: 500;
           }
 
           &:hover {
@@ -274,13 +375,6 @@ export default {
       }
     }
 
-      &:hover {
-        .hover-mask {
-          display: flex;
-        }
-      }
-    }
-
     .operation-time {
       color: #666;
       i {