diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue
index 6186638e..92c65a53 100644
--- a/ruoyi-ui/src/components/RightToolbar/index.vue
+++ b/ruoyi-ui/src/components/RightToolbar/index.vue
@@ -7,31 +7,74 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/layout/components/global.js b/ruoyi-ui/src/layout/components/global.js
deleted file mode 100644
index 5d2b5b3e..00000000
--- a/ruoyi-ui/src/layout/components/global.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Vue from 'vue'
-const global = new Vue()
-export default global
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 18cabfe4..5f3eaa08 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -135,17 +135,17 @@
v-hasPermi="['system:user:export']"
>导出
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
{{ parseTime(scope.row.createTime) }}
@@ -418,6 +418,16 @@ export default {
status: undefined,
deptId: undefined
},
+ // 列信息
+ columns: [
+ { key: 0, label: `用户编号`, visible: true },
+ { key: 1, label: `用户名称`, visible: true },
+ { key: 2, label: `用户昵称`, visible: true },
+ { key: 3, label: `部门`, visible: true },
+ { key: 4, label: `手机号码`, visible: true },
+ { key: 5, label: `状态`, visible: true },
+ { key: 6, label: `创建时间`, visible: true }
+ ],
// 表单校验
rules: {
userName: [