From 8898ce6c80ce671185b6506315370a2424d08619 Mon Sep 17 00:00:00 2001
From: 13703816893 <l_cheny@foxmail.com>
Date: Sat, 20 May 2023 18:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/components/addUser.vue |  6 +++---
 src/views/system/userManagement.vue     | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/views/system/components/addUser.vue b/src/views/system/components/addUser.vue
index a352966..b6b0d61 100644
--- a/src/views/system/components/addUser.vue
+++ b/src/views/system/components/addUser.vue
@@ -14,8 +14,8 @@
       :rules="rules"
       :model="formdata"
     >
-      <el-form-item label="用户名：" prop="username">
-        <el-input placeholder="请输入用户名" v-model="formdata.username" autocomplete="off"></el-input>
+      <el-form-item label="用户名：" prop="userName">
+        <el-input placeholder="请输入用户名" v-model="formdata.userName" autocomplete="off"></el-input>
       </el-form-item>
       <el-form-item label="角色：" prop="role" >
         <el-select v-model="formdata.role" placeholder="请选择">
@@ -50,7 +50,7 @@ export default {
         }],
       formdata: {},
       rules: {
-        username: [{ required: true, message: "请输入用户名", trigger: "blur" }],
+        userName: [{ required: true, message: "请输入用户名", trigger: "blur" }],
         role: [{ required: true, message: "请选择角色", trigger: "blur" }],
         password: [{ required: true, message: "请输入密码", trigger: "blur" }]
       },
diff --git a/src/views/system/userManagement.vue b/src/views/system/userManagement.vue
index 0f5119b..dc8e358 100644
--- a/src/views/system/userManagement.vue
+++ b/src/views/system/userManagement.vue
@@ -25,26 +25,24 @@
           <el-table-column
             label="用户名"
             show-overflow-tooltip
-            prop="channelname"
+            prop="userName"
           ></el-table-column>
           <el-table-column
             label="角色"
             show-overflow-tooltip
-            prop="maxResolutionHeight"
+            prop="role"
           ></el-table-column>
           <el-table-column
             label="创建时间"
             show-overflow-tooltip
-            prop="maxResolutionWidth"
+            prop="createTime"
           ></el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
                 @click.native.stop="handleResive(scope.row)"
                 type="text"
-                >修改</el-button
-              >
-
+                >修改</el-button>
               <el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)" >删除</el-button>
             </template>
           </el-table-column>