|
|
@@ -17,18 +17,18 @@
|
|
|
<pane size="100">
|
|
|
<el-col>
|
|
|
<el-form :model="searchcontainer" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="用户名称" prop="username">
|
|
|
+ <!-- <el-form-item label="用户名称" prop="username">
|
|
|
<el-input v-model="searchcontainer.username" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="用户昵称" prop="nickname">
|
|
|
- <el-input v-model="searchcontainer.nickname" placeholder="请输入用户昵称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
|
|
+ <el-input v-model="searchcontainer.nickname" placeholder="请输入用户昵称" clearable style="width: 240px" @keyup.enter.native="handleQuery" spellcheck="false"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="手机号码" prop="mobileNo">
|
|
|
+ <!-- <el-form-item label="手机号码" prop="mobileNo">
|
|
|
<el-input v-model="searchcontainer.mobileNo" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="邮箱" prop="email">
|
|
|
<el-input v-model="searchcontainer.email" placeholder="请输入邮箱" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
@@ -37,20 +37,14 @@
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
|
|
|
+ <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
|
|
|
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
|
|
|
- </el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button type="primary" plain size="mini" @click="handleOnline" >在线用户</el-button>
|
|
|
</el-col>
|
|
|
@@ -63,7 +57,9 @@
|
|
|
<el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" />
|
|
|
<el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" />
|
|
|
<el-table-column label="手机号码" align="center" key="mobileNo" prop="mobileNo" v-if="columns[3].visible" width="120" />
|
|
|
- <el-table-column label="创建时间" align="center" prop="regTime" v-if="columns[4].visible" width="160">
|
|
|
+ <el-table-column label="邮箱" align="center" key="email" prop="email" v-if="columns[4].visible" width="120" />
|
|
|
+ <el-table-column label="公司" align="center" key="company" prop="company" v-if="columns[5].visible" width="120" />
|
|
|
+ <el-table-column label="创建时间" align="center" prop="regTime" v-if="columns[6].visible" width="160">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.regTime) }}</span>
|
|
|
</template>
|
|
|
@@ -76,7 +72,7 @@
|
|
|
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
|
|
|
- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
|
|
+ <!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item> -->
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
</template>
|
|
|
@@ -191,6 +187,8 @@ export default {
|
|
|
total: 0,
|
|
|
// 用户表格数据
|
|
|
userList: null,
|
|
|
+ // 在线用户列表
|
|
|
+ onlineUserList: [],
|
|
|
// 弹出层标题
|
|
|
title: "",
|
|
|
// 所有部门树选项
|
|
|
@@ -248,7 +246,9 @@ export default {
|
|
|
{ key: 1, label: `用户名称`, visible: true },
|
|
|
{ key: 2, label: `用户昵称`, visible: true },
|
|
|
{ key: 3, label: `手机号码`, visible: true },
|
|
|
- { key: 4, label: `创建时间`, visible: true }
|
|
|
+ { key: 4, label: `邮箱`, visible: true },
|
|
|
+ { key: 5, label: `公司`, visible: true },
|
|
|
+ { key: 6, label: `创建时间`, visible: true }
|
|
|
],
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
@@ -298,7 +298,7 @@ export default {
|
|
|
/** 查询用户列表 */
|
|
|
getList() {
|
|
|
this.loading = true
|
|
|
- this.queryParams.searchtag = this.searchcontainer.username || this.searchcontainer.nickname || this.searchcontainer.mobileNo || this.searchcontainer.email || ""
|
|
|
+ this.queryParams.searchtag = this.searchcontainer.nickname || ""
|
|
|
listUser(this.queryParams).then(response => {
|
|
|
this.userList = response.data.rows
|
|
|
this.total = response.data.total
|
|
|
@@ -472,6 +472,7 @@ export default {
|
|
|
handleOnline() {
|
|
|
getUserOnline().then(response => {
|
|
|
this.$modal.msgSuccess("在线用户：" + response.data.count)
|
|
|
+ this.userList = this.userList.filter(user => response.data.uids.includes(user.uid))
|
|
|
})
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
tangjunhao