From 8cac136e250b27cd8e5a08ee5ccd2bff7fdd3458 Mon Sep 17 00:00:00 2001
From: Ironsp <1522278303@qq.com>
Date: Wed, 13 May 2026 11:53:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/systemList/role/role.vue | 43 +++++++++++-------------------
 src/views/systemList/user/user.vue | 41 +++++++++++-----------------
 2 files changed, 31 insertions(+), 53 deletions(-)

diff --git a/src/views/systemList/role/role.vue b/src/views/systemList/role/role.vue
index c788968..2fcea0f 100644
--- a/src/views/systemList/role/role.vue
+++ b/src/views/systemList/role/role.vue
@@ -4,17 +4,8 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="设备名称" prop="value">
-              <el-input v-model="queryParams.value" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="监控区域" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="设备状态" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备状态" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="角色名称" prop="equipmentNo">
+              <el-input v-model="queryParams.testKey" placeholder="请输入" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -29,9 +20,9 @@
       <template #header>
         <el-row :gutter="10" class="flex justify-end mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">添加设备</el-button>
+            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">添加</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
               >批量唤醒</el-button
             >
@@ -40,7 +31,7 @@
             <el-button v-hasPermi="['demo:demo:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
               >批量删除</el-button
             >
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="1.5">
             <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col> -->
@@ -50,20 +41,18 @@
 
       <el-table v-loading="loading" border :data="demoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="true" label="主键" align="center" prop="id" />
-        <el-table-column label="部门id" align="center" prop="deptId" />
-        <el-table-column label="用户id" align="center" prop="userId" />
-        <el-table-column label="排序号" align="center" prop="orderNum" />
-        <el-table-column label="key键" align="center" prop="testKey" />
-        <el-table-column label="值" align="center" prop="value" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column v-if="true" label="角色名称" align="center" prop="id" />
+        <el-table-column label="角色描述" align="center" prop="deptId" />
+        <el-table-column label="操作人" align="center" prop="userId" />
+        <el-table-column label="添加时间" align="center" prop="orderNum" />
+        <el-table-column label="排序" align="center" prop="testKey" />
+        <el-table-column label="状态" align="center" prop="value" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['demo:demo:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['demo:demo:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
+            <el-button v-hasPermi="['demo:demo:edit']" type="primary" @click="handleUpdate(scope.row)">权限配置</el-button>
+            <el-button v-hasPermi="['demo:demo:edit']" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+
+            <el-button v-hasPermi="['demo:demo:remove']" type="primary" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/systemList/user/user.vue b/src/views/systemList/user/user.vue
index c788968..cb96277 100644
--- a/src/views/systemList/user/user.vue
+++ b/src/views/systemList/user/user.vue
@@ -4,17 +4,8 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="设备名称" prop="value">
-              <el-input v-model="queryParams.value" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="监控区域" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="设备状态" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备状态" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="用户名" prop="equipmentNo">
+              <el-input v-model="queryParams.testKey" placeholder="请输入" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -29,9 +20,9 @@
       <template #header>
         <el-row :gutter="10" class="flex justify-end mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">添加设备</el-button>
+            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">添加</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
               >批量唤醒</el-button
             >
@@ -40,7 +31,7 @@
             <el-button v-hasPermi="['demo:demo:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
               >批量删除</el-button
             >
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="1.5">
             <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col> -->
@@ -50,20 +41,18 @@
 
       <el-table v-loading="loading" border :data="demoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="true" label="主键" align="center" prop="id" />
-        <el-table-column label="部门id" align="center" prop="deptId" />
-        <el-table-column label="用户id" align="center" prop="userId" />
+        <el-table-column v-if="true" label="用户名" align="center" prop="id" />
+        <el-table-column label="用户账号" align="center" prop="deptId" />
+        <el-table-column label="角色名称" align="center" prop="userId" />
         <el-table-column label="排序号" align="center" prop="orderNum" />
-        <el-table-column label="key键" align="center" prop="testKey" />
-        <el-table-column label="值" align="center" prop="value" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作人" align="center" prop="testKey" />
+        <el-table-column label="添加时间" align="center" prop="value" />
+        <el-table-column label="排序" align="center" prop="value" />
+        <el-table-column label="状态" align="center" prop="value" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['demo:demo:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['demo:demo:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
+            <el-button v-hasPermi="['demo:demo:edit']" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+            <el-button v-hasPermi="['demo:demo:remove']" type="primary" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>