cxc/qiaoba-vue3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

system config

Browse Source
This commit is contained in:
ailanyin
2023-05-25 13:57:05 +08:00
parent e917582ea7
commit b028c3ae87
7 changed files with 685 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/api/system/config.js
View File

@ -1,60 +1,60 @@
import request from '@/utils/request' import request from "@/utils/request";
// 查询参数列表 // 查询参数列表
export function listConfig(query) { export function listConfig(query) {
return request({ return request({
url: '/system/config/list', url: "/system/config/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 查询参数详细 // 查询参数详细
export function getConfig(configId) { export function getConfig(configId) {
return request({ return request({
url: '/system/config/' + configId, url: "/system/config/" + configId,
method: 'get' method: "get",
}) });
} }
// 根据参数键名查询参数值 // 根据参数键名查询参数值
export function getConfigKey(configKey) { export function getConfigKey(configKey) {
return request({ return request({
url: '/system/config/configKey/' + configKey, url: "/system/config/configKey/" + configKey,
method: 'get' method: "get",
}) });
} }
// 新增参数配置 // 新增参数配置
export function addConfig(data) { export function addConfig(data) {
return request({ return request({
url: '/system/config', url: "/system/config",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 修改参数配置 // 修改参数配置
export function updateConfig(data) { export function updateConfig(data) {
return request({ return request({
url: '/system/config', url: "/system/config",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 删除参数配置 // 删除参数配置
export function delConfig(configId) { export function delConfig(configId) {
return request({ return request({
url: '/system/config/' + configId, url: "/system/config/" + configId,
method: 'delete' method: "delete",
}) });
} }
// 刷新参数缓存 // 刷新参数缓存
export function refreshCache() { export function refreshCache() {
return request({ return request({
url: '/system/config/refreshCache', url: "/system/config/refreshCache",
method: 'delete' method: "delete",
}) });
} }

8
src/constant/dict.js
View File

@ -14,15 +14,15 @@ export const sys_normal_disable = [
export const sys_user_gender = [ export const sys_user_gender = [
{ {
label: "男", label: "男",
value: "0" value: "0",
}, },
{ {
label: "女", label: "女",
value: "1" value: "1",
}, },
{ {
label: "未知", label: "未知",
value: "2" value: "2",
}, },
]; ];
@ -42,7 +42,7 @@ export const menu_show_hide = [
export const sys_yes_no = [ export const sys_yes_no = [
{ {
label: "否", label: "否",
value: "N" value: "N",
}, },
{ {
label: "是", label: "是",

2
src/store/modules/user.js
View File

@ -85,7 +85,7 @@ const useUserStore = defineStore("user", {
}); });
}, },
}, },
persist: [{ paths: ["tenant", /*"userInfoRes"*/], storage: localStorage }], persist: [{ paths: ["tenant" /*"userInfoRes"*/], storage: localStorage }],
}); });
export default useUserStore; export default useUserStore;

488
src/views/system/config/index.vue
View File

@ -1,162 +1,252 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form
<el-form-item label="参数名称" prop="configName"> v-show="showSearch"
<el-input ref="queryRef"
v-model="queryParams.configName" :inline="true"
placeholder="请输入参数名称" :model="queryParams"
clearable label-width="68px"
style="width: 240px" >
@keyup.enter="handleQuery" <el-form-item label="参数名称" prop="configName">
/> <el-input
</el-form-item> v-model="queryParams.configName"
<el-form-item label="参数键名" prop="configKey"> clearable
<el-input placeholder="请输入参数名称"
v-model="queryParams.configKey" style="width: 240px"
placeholder="请输入参数键名" @keyup.enter="handleQuery"
clearable />
style="width: 240px" </el-form-item>
@keyup.enter="handleQuery" <el-form-item label="参数键名" prop="configKey">
/> <el-input
</el-form-item> v-model="queryParams.configKey"
<el-form-item label="系统内置" prop="configType"> clearable
<el-select v-model="queryParams.configType" placeholder="系统内置" clearable> placeholder="请输入参数键名"
<el-option style="width: 240px"
v-for="dict in sys_yes_no" @keyup.enter="handleQuery"
:key="dict.value" />
:label="dict.label" </el-form-item>
:value="dict.value" <el-form-item label="系统内置" prop="configType">
/> <el-select
</el-select> v-model="queryParams.configType"
</el-form-item> clearable
<el-form-item> placeholder="系统内置"
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> >
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-option
</el-form-item> v-for="dict in sys_yes_no"
</el-form> :key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" v-hasPermi="['system:config:add']"
plain icon="Plus"
icon="Plus" plain
@click="handleAdd" type="primary"
v-hasPermi="['system:config:add']" @click="handleAdd"
>新增</el-button> >新增
</el-col> </el-button>
<el-col :span="1.5"> </el-col>
<el-button <el-col :span="1.5">
type="success" <el-button
plain v-hasPermi="['system:config:edit']"
icon="Edit" :disabled="single"
:disabled="single" icon="Edit"
@click="handleUpdate" plain
v-hasPermi="['system:config:edit']" type="success"
>修改</el-button> @click="handleUpdate"
</el-col> >修改
<el-col :span="1.5"> </el-button>
<el-button </el-col>
type="danger" <el-col :span="1.5">
plain <el-button
icon="Delete" v-hasPermi="['system:config:remove']"
:disabled="multiple" :disabled="
@click="handleDelete" multiple ||
v-hasPermi="['system:config:remove']" ids.some((id) =>
>删除</el-button> configList.find(
</el-col> (el) => el.configId === id && el.configType === 'Y'
<el-col :span="1.5"> )
<el-button )
type="warning" "
plain icon="Delete"
icon="Download" plain
@click="handleExport" type="danger"
v-hasPermi="['system:config:export']" @click="handleDelete"
>导出</el-button> >删除
</el-col> </el-button>
<el-col :span="1.5"> </el-col>
<el-button <el-col :span="1.5">
type="danger" <el-button
plain v-hasPermi="['system:config:export']"
icon="Refresh" icon="Download"
@click="handleRefreshCache" plain
v-hasPermi="['system:config:remove']" type="warning"
>刷新缓存</el-button> @click="handleExport"
</el-col> >导出
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> </el-button>
</el-row> </el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:config:remove']"
icon="Refresh"
plain
type="danger"
@click="handleRefreshCache"
>刷新缓存
</el-button>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="55" align="center" /> v-loading="loading"
<el-table-column label="参数主键" align="center" prop="configId" /> :data="configList"
<el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" /> @selection-change="handleSelectionChange"
<el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" /> >
<el-table-column label="参数键值" align="center" prop="configValue" :show-overflow-tooltip="true" /> <el-table-column align="center" type="selection" width="55" />
<el-table-column label="系统内置" align="center" prop="configType"> <el-table-column align="center" label="参数主键" prop="configId" />
<template #default="scope"> <el-table-column
<dict-tag :options="sys_yes_no" :value="scope.row.configType" /> :show-overflow-tooltip="true"
</template> align="center"
</el-table-column> label="参数名称"
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> prop="configName"
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']" >修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/> />
<el-table-column
:show-overflow-tooltip="true"
align="center"
label="参数键名"
prop="configKey"
/>
<el-table-column
:show-overflow-tooltip="true"
align="center"
label="参数键值"
prop="configValue"
/>
<el-table-column align="center" label="系统内置" prop="configType">
<template #default="scope">
<dict-tag :options="sys_yes_no" :value="scope.row.configType" />
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
align="center"
label="备注"
prop="remark"
/>
<el-table-column
align="center"
label="创建时间"
prop="createTime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
align="center"
class-name="small-padding fixed-width"
label="操作"
width="150"
>
<template #default="scope">
<el-button
v-hasPermi="['system:config:edit']"
icon="Edit"
link
type="primary"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:config:remove']"
:disabled="scope.row.configType === 'Y'"
icon="Delete"
link
type="primary"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改参数配置对话框 --> <pagination
<el-dialog :title="title" v-model="open" width="500px" append-to-body> v-show="total > 0"
<el-form ref="configRef" :model="form" :rules="rules" label-width="80px"> v-model:limit="queryParams.pageSize"
<el-form-item label="参数名称" prop="configName"> v-model:page="queryParams.pageNum"
<el-input v-model="form.configName" placeholder="请输入参数名称" /> :total="total"
</el-form-item> @pagination="getList"
<el-form-item label="参数键名" prop="configKey"> />
<el-input v-model="form.configKey" placeholder="请输入参数键名" />
</el-form-item> <!-- 添加或修改参数配置对话框 -->
<el-form-item label="参数键值" prop="configValue"> <el-dialog v-model="open" :title="title" append-to-body width="500px">
<el-input v-model="form.configValue" placeholder="请输入参数键值" /> <el-form ref="configRef" :model="form" :rules="rules" label-width="80px">
</el-form-item> <el-form-item label="参数名称" prop="configName">
<el-form-item label="系统内置" prop="configType"> <el-input v-model="form.configName" placeholder="请输入参数名称" />
<el-radio-group v-model="form.configType"> </el-form-item>
<el-radio <el-form-item label="参数键名" prop="configKey">
v-for="dict in sys_yes_no" <el-input v-model="form.configKey" placeholder="请输入参数键名" />
:key="dict.value" </el-form-item>
:label="dict.value" <el-form-item label="参数键值" prop="configValue">
>{{ dict.label }}</el-radio> <el-input v-model="form.configValue" placeholder="请输入参数键值" />
</el-radio-group> </el-form-item>
</el-form-item> <el-form-item label="系统内置" prop="configType">
<el-form-item label="备注" prop="remark"> <el-radio-group v-model="form.configType">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-radio
</el-form-item> v-for="dict in sys_yes_no"
</el-form> :key="dict.value"
<template #footer> :label="dict.value"
<div class="dialog-footer"> >{{ dict.label }}
<el-button type="primary" @click="submitForm">确 定</el-button> </el-radio>
<el-button @click="cancel">取 消</el-button> </el-radio-group>
</div> </el-form-item>
</template> <el-form-item label="备注" prop="remark">
</el-dialog> <el-input
</div> v-model="form.remark"
placeholder="请输入内容"
type="textarea"
/>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template> </template>
<script setup name="Config"> <script lang="jsx" name="Config" setup>
import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from "@/api/system/config"; import {
addConfig,
delConfig,
getConfig,
listConfig,
refreshCache,
updateConfig,
} from "@/api/system/config";
import { sys_yes_no } from "@/constant/dict"; import { sys_yes_no } from "@/constant/dict";
import { ElMessageBox } from "element-plus";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const configList = ref([]); const configList = ref([]);
@ -177,13 +267,19 @@ const data = reactive({
pageSize: 10, pageSize: 10,
configName: undefined, configName: undefined,
configKey: undefined, configKey: undefined,
configType: undefined configType: undefined,
}, },
rules: { rules: {
configName: [{ required: true, message: "参数名称不能为空", trigger: "blur" }], configName: [
configKey: [{ required: true, message: "参数键名不能为空", trigger: "blur" }], { required: true, message: "参数名称不能为空", trigger: "blur" },
configValue: [{ required: true, message: "参数键值不能为空", trigger: "blur" }] ],
} configKey: [
{ required: true, message: "参数键名不能为空", trigger: "blur" },
],
configValue: [
{ required: true, message: "参数键值不能为空", trigger: "blur" },
],
},
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
@ -191,17 +287,21 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询参数列表 */ /** 查询参数列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
listConfig(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => { listConfig(proxy.addDateRange(queryParams.value, dateRange.value)).then(
configList.value = response.rows; (response) => {
total.value = response.total; configList.value = response.rows;
loading.value = false; total.value = response.total;
}); loading.value = false;
}
);
} }
/** 取消按钮 */ /** 取消按钮 */
function cancel() { function cancel() {
open.value = false; open.value = false;
reset(); reset();
} }
/** 表单重置 */ /** 表单重置 */
function reset() { function reset() {
form.value = { form.value = {
@ -210,55 +310,61 @@ function reset() {
configKey: undefined, configKey: undefined,
configValue: undefined, configValue: undefined,
configType: "Y", configType: "Y",
remark: undefined remark: undefined,
}; };
proxy.resetForm("configRef"); proxy.resetForm("configRef");
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
getList(); getList();
} }
/** 重置按钮操作 */ /** 重置按钮操作 */
function resetQuery() { function resetQuery() {
dateRange.value = []; dateRange.value = [];
proxy.resetForm("queryRef"); proxy.resetForm("queryRef");
handleQuery(); handleQuery();
} }
/** 多选框选中数据 */ /** 多选框选中数据 */
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.configId); ids.value = selection.map((item) => item.configId);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
reset(); reset();
open.value = true; open.value = true;
title.value = "添加参数"; title.value = "添加参数";
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset();
const configId = row.configId || ids.value; const configId = row.configId || ids.value;
getConfig(configId).then(response => { getConfig(configId).then((response) => {
form.value = response.data; form.value = response.data;
open.value = true; open.value = true;
title.value = "修改参数"; title.value = "修改参数";
}); });
} }
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["configRef"].validate(valid => { proxy.$refs["configRef"].validate((valid) => {
if (valid) { if (valid) {
if (form.value.configId != undefined) { if (form.value.configId != undefined) {
updateConfig(form.value).then(response => { updateConfig(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");
open.value = false; open.value = false;
getList(); getList();
}); });
} else { } else {
addConfig(form.value).then(response => { addConfig(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess("新增成功");
open.value = false; open.value = false;
getList(); getList();
@ -267,22 +373,52 @@ function submitForm() {
} }
}); });
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const configIds = row.configId || ids.value; const configIds = row.configId || ids.value;
proxy.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？').then(function () { const configNames = row.configId
return delConfig(configIds); ? [row.configName]
}).then(() => { : configList.value
getList(); .filter((el) => configIds.includes(el.configId))
proxy.$modal.msgSuccess("删除成功"); .map((el) => el.configName);
}).catch(() => {}); const messageVnode = () => (
<>
{configNames.map((configName, idx) => (
<el-tag
key={idx}
style={{
marginLeft: idx >= 1 ? "4px" : 0,
}}
type="warning"
>
{configName}
</el-tag>
))}
</>
);
ElMessageBox.confirm(messageVnode, "确认删除")
.then(function () {
return delConfig(configIds);
})
.then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download("system/config/export", { proxy.download(
...queryParams.value "system/config/export",
}, `config_${new Date().getTime()}.xlsx`); {
...queryParams.value,
},
`config_${new Date().getTime()}.xlsx`
);
} }
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
function handleRefreshCache() { function handleRefreshCache() {
refreshCache().then(() => { refreshCache().then(() => {

21
src/views/system/role/index.vue
View File

@ -113,7 +113,12 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色编号" prop="roleId" width="180" align="center"/> <el-table-column
label="角色编号"
prop="roleId"
width="180"
align="center"
/>
<el-table-column <el-table-column
label="角色名称" label="角色名称"
prop="roleName" prop="roleName"
@ -128,12 +133,22 @@
width="150" width="150"
align="center" align="center"
/> />
<el-table-column align="center" label="权限范围" prop="dataScope" width="140"> <el-table-column
align="center"
label="权限范围"
prop="dataScope"
width="140"
>
<template #default="{ row }"> <template #default="{ row }">
{{ dataScopeOptions.find((el) => el.value === row.dataScope)?.label }} {{ dataScopeOptions.find((el) => el.value === row.dataScope)?.label }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="显示顺序" prop="roleSort" width="100" /> <el-table-column
align="center"
label="显示顺序"
prop="roleSort"
width="100"
/>
<el-table-column label="状态" align="center" width="100"> <el-table-column label="状态" align="center" width="100">
<template #default="scope"> <template #default="scope">
<el-switch <el-switch

645
src/views/system/user/index.vue
View File

@ -5,84 +5,83 @@
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<div class="head-container"> <div class="head-container">
<el-input <el-input
v-model="deptName" v-model="deptName"
clearable clearable
placeholder="请输入部门名称" placeholder="请输入部门名称"
prefix-icon="Search" prefix-icon="Search"
style="margin-bottom: 20px" style="margin-bottom: 20px"
/> />
</div> </div>
<div class="head-container"> <div class="head-container">
<el-tree <el-tree
ref="deptTreeRef" ref="deptTreeRef"
:data="deptOptions" :data="deptOptions"
:expand-on-click-node="false" :expand-on-click-node="false"
:filter-node-method="filterNode" :filter-node-method="filterNode"
:props="{ label: 'label', children: 'children' }" :props="{ label: 'label', children: 'children' }"
default-expand-all default-expand-all
highlight-current highlight-current
node-key="id" node-key="id"
@node-click="handleNodeClick" @node-click="handleNodeClick"
/> />
</div> </div>
</el-col> </el-col>
<!--用户数据--> <!--用户数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<el-form <el-form
v-show="showSearch" v-show="showSearch"
ref="queryRef" ref="queryRef"
:inline="true" :inline="true"
:model="queryParams" :model="queryParams"
label-width="68px" label-width="68px"
> >
<el-form-item label="姓名" prop="nickname"> <el-form-item label="姓名" prop="nickname">
<el-input <el-input
v-model="queryParams.nickname" v-model="queryParams.nickname"
clearable clearable
placeholder="请输入姓名" placeholder="请输入姓名"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
clearable clearable
placeholder="请输入手机号码" placeholder="请输入手机号码"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
clearable clearable
placeholder="用户状态" placeholder="用户状态"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
v-for="dict in sys_normal_disable" v-for="dict in sys_normal_disable"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" style="width: 308px"> <el-form-item label="创建时间" style="width: 308px">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
end-placeholder="结束日期" end-placeholder="结束日期"
range-separator="-" range-separator="-"
start-placeholder="开始日期" start-placeholder="开始日期"
type="daterange" type="daterange"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button icon="Search" type="primary" @click="handleQuery" <el-button icon="Search" type="primary" @click="handleQuery"
>搜索 >搜索
</el-button </el-button>
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -90,202 +89,202 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:user:add']" v-hasPermi="['system:user:add']"
icon="Plus" icon="Plus"
plain plain
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
>新增 >新增
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
:disabled="single" :disabled="single"
icon="Edit" icon="Edit"
plain plain
type="success" type="success"
@click="handleUpdate" @click="handleUpdate"
>修改 >修改
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
:disabled="multiple" :disabled="multiple"
icon="Delete" icon="Delete"
plain plain
type="danger" type="danger"
@click="handleDelete" @click="handleDelete"
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:user:import']" v-hasPermi="['system:user:import']"
icon="Upload" icon="Upload"
plain plain
type="info" type="info"
@click="handleImport" @click="handleImport"
>导入 >导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:user:export']" v-hasPermi="['system:user:export']"
icon="Download" icon="Download"
plain plain
type="warning" type="warning"
@click="handleExport" @click="handleExport"
>导出 >导出
</el-button> </el-button>
</el-col> </el-col>
<right-toolbar <right-toolbar
v-model:showSearch="showSearch" v-model:showSearch="showSearch"
:columns="columns" :columns="columns"
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="userList" :data="userList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column align="center" type="selection" width="50"/> <el-table-column align="center" type="selection" width="50" />
<el-table-column <el-table-column
v-if="columns[0].visible" v-if="columns[0].visible"
key="userId" key="userId"
align="center" align="center"
label="用户编号" label="用户编号"
prop="userId" prop="userId"
/> />
<el-table-column <el-table-column
v-if="columns[1].visible" v-if="columns[1].visible"
key="username" key="username"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
align="center" align="center"
label="登录账号" label="登录账号"
prop="username" prop="username"
/> />
<el-table-column <el-table-column
v-if="columns[2].visible" v-if="columns[2].visible"
key="nickname" key="nickname"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
align="center" align="center"
label="姓名" label="姓名"
prop="nickname" prop="nickname"
/> />
<el-table-column <el-table-column
v-if="columns[3].visible" v-if="columns[3].visible"
key="deptName" key="deptName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
align="center" align="center"
label="部门" label="部门"
prop="deptName" prop="deptName"
/> />
<el-table-column <el-table-column
v-if="columns[4].visible" v-if="columns[4].visible"
key="phone" key="phone"
align="center" align="center"
label="手机号码" label="手机号码"
prop="phone" prop="phone"
width="120" width="120"
/> />
<el-table-column <el-table-column
v-if="columns[5].visible" v-if="columns[5].visible"
key="status" key="status"
align="center" align="center"
label="状态" label="状态"
> >
<template #default="scope"> <template #default="scope">
<el-switch <el-switch
v-model="scope.row.status" v-model="scope.row.status"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
@change="handleStatusChange(scope.row)" @change="handleStatusChange(scope.row)"
></el-switch> ></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="columns[6].visible" v-if="columns[6].visible"
align="center" align="center"
label="创建时间" label="创建时间"
prop="createTime" prop="createTime"
width="160" width="160"
> >
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="操作" label="操作"
width="150" width="150"
> >
<template #default="scope"> <template #default="scope">
<el-tooltip <el-tooltip
v-if="scope.row.userId !== 1" v-if="scope.row.userId !== 1"
content="修改" content="修改"
placement="top" placement="top"
> >
<el-button <el-button
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
icon="Edit" icon="Edit"
link link
type="primary" type="primary"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="scope.row.userId !== 1" v-if="scope.row.userId !== 1"
content="删除" content="删除"
placement="top" placement="top"
> >
<el-button <el-button
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
icon="Delete" icon="Delete"
link link
type="primary" type="primary"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="scope.row.userId !== 1" v-if="scope.row.userId !== 1"
content="重置密码" content="重置密码"
placement="top" placement="top"
> >
<el-button <el-button
v-hasPermi="['system:user:resetPwd']" v-hasPermi="['system:user:resetPwd']"
icon="Key" icon="Key"
link link
type="primary" type="primary"
@click="handleResetPwd(scope.row)" @click="handleResetPwd(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="scope.row.userId !== 1" v-if="scope.row.userId !== 1"
content="分配角色" content="分配角色"
placement="top" placement="top"
> >
<el-button <el-button
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
icon="CircleCheck" icon="CircleCheck"
link link
type="primary" type="primary"
@click="handleAuthRole(scope.row)" @click="handleAuthRole(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
:total="total" :total="total"
@pagination="getList" @pagination="getList"
/> />
</el-col> </el-col>
</el-row> </el-row>
@ -297,9 +296,9 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="nickname"> <el-form-item label="姓名" prop="nickname">
<el-input <el-input
v-model="form.nickname" v-model="form.nickname"
maxlength="30" maxlength="30"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -307,10 +306,10 @@
<el-form-item label="性别"> <el-form-item label="性别">
<el-select v-model="form.gender" placeholder="请选择"> <el-select v-model="form.gender" placeholder="请选择">
<el-option <el-option
v-for="dict in sys_user_gender" v-for="dict in sys_user_gender"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -320,18 +319,18 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机" prop="phone"> <el-form-item label="手机" prop="phone">
<el-input <el-input
v-model="form.phone" v-model="form.phone"
maxlength="11" maxlength="11"
placeholder="请输入手机号码" placeholder="请输入手机号码"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input <el-input
v-model="form.email" v-model="form.email"
maxlength="50" maxlength="50"
placeholder="请输入邮箱" placeholder="请输入邮箱"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -340,12 +339,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部门" prop="deptId"> <el-form-item label="部门" prop="deptId">
<el-tree-select <el-tree-select
v-model="form.deptId" v-model="form.deptId"
:data="deptOptions" :data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }" :props="{ value: 'id', label: 'label', children: 'children' }"
check-strictly check-strictly
placeholder="请选择部门" placeholder="请选择部门"
value-key="id" value-key="id"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -353,10 +352,10 @@
<el-form-item label="岗位"> <el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择"> <el-select v-model="form.postIds" multiple placeholder="请选择">
<el-option <el-option
v-for="item in postOptions" v-for="item in postOptions"
:key="item.postId" :key="item.postId"
:label="item.postName" :label="item.postName"
:value="item.postId" :value="item.postId"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -367,10 +366,10 @@
<el-form-item label="角色"> <el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择"> <el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option <el-option
v-for="item in roleOptions" v-for="item in roleOptions"
:key="item.roleId" :key="item.roleId"
:label="item.roleName" :label="item.roleName"
:value="item.roleId" :value="item.roleId"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -379,10 +378,10 @@
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in sys_normal_disable" v-for="dict in sys_normal_disable"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{ dict.label }} >{{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -391,31 +390,31 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
v-if="form.userId == undefined" v-if="form.userId == undefined"
label="登录账号" label="登录账号"
prop="username" prop="username"
> >
<el-input <el-input
v-model="form.username" v-model="form.username"
autocomplete="off" autocomplete="off"
maxlength="30" maxlength="30"
placeholder="请输入登录账号" placeholder="请输入登录账号"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
v-if="form.userId == undefined" v-if="form.userId == undefined"
label="登录密码" label="登录密码"
prop="password" prop="password"
> >
<el-input <el-input
v-model="form.password" v-model="form.password"
autocomplete="off" autocomplete="off"
maxlength="20" maxlength="20"
placeholder="请输入登录密码" placeholder="请输入登录密码"
show-password show-password
type="password" type="password"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -424,9 +423,9 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input
v-model="form.remark" v-model="form.remark"
placeholder="请输入内容" placeholder="请输入内容"
type="textarea" type="textarea"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -442,46 +441,48 @@
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog <el-dialog
v-model="upload.open" v-model="upload.open"
:title="upload.title" :title="upload.title"
append-to-body append-to-body
width="400px" width="400px"
> >
<el-upload <el-upload
ref="uploadRef" ref="uploadRef"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :action="upload.url + '?updateSupport=' + upload.updateSupport"
:auto-upload="false" :auto-upload="false"
:disabled="upload.isUploading" :disabled="upload.isUploading"
:headers="upload.headers" :headers="upload.headers"
:limit="1" :limit="1"
:on-progress="handleFileUploadProgress" :on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess" :on-success="handleFileSuccess"
accept=".xlsx, .xls" accept=".xlsx, .xls"
drag drag
> >
<el-icon class="el-icon--upload"> <el-icon class="el-icon--upload">
<upload-filled/> <upload-filled />
</el-icon> </el-icon>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<template #tip> <template #tip>
<div class="el-upload__tip text-center"> <div class="el-upload__tip text-center">
<ol style="text-align: start;margin-left: 20px;"> <ol style="text-align: start; margin-left: 20px">
<li>(*)为必填项</li> <li>(*)为必填项</li>
<li>部门,角色,岗位请填数字编号</li> <li>部门,角色,岗位请填数字编号</li>
<li>角色,岗位若存在多个,请以英文逗号隔开</li> <li>角色,岗位若存在多个,请以英文逗号隔开</li>
<li>禁止任何的换行或空格</li> <li>禁止任何的换行或空格</li>
<li style="color:#F00;font-size:13px;">请手动更改单元格格式为文本格式</li> <li style="color: #f00; font-size: 13px">
<li><span>仅允许导入xls、xlsx格式文件。</span> 请手动更改单元格格式为文本格式
</li>
<li>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link <el-link
:underline="false" :underline="false"
style="font-size: 12px; vertical-align: baseline" style="font-size: 12px; vertical-align: baseline"
type="primary" type="primary"
@click="importTemplate" @click="importTemplate"
>下载模板 >下载模板
</el-link> </el-link>
</li> </li>
</ol> </ol>
</div> </div>
</template> </template>
</el-upload> </el-upload>
@ -496,7 +497,7 @@
</template> </template>
<script lang="jsx" name="User" setup> <script lang="jsx" name="User" setup>
import {getToken} from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { import {
addUser, addUser,
changeUserStatus, changeUserStatus,
@ -507,11 +508,11 @@ import {
resetUserPwd, resetUserPwd,
updateUser, updateUser,
} from "@/api/system/user"; } from "@/api/system/user";
import {sys_normal_disable, sys_user_gender} from "@/constant/dict"; import { sys_normal_disable, sys_user_gender } from "@/constant/dict";
import {ElMessageBox} from "element-plus"; import { ElMessageBox } from "element-plus";
const router = useRouter(); const router = useRouter();
const {proxy} = getCurrentInstance(); const { proxy } = getCurrentInstance();
const userList = ref([]); const userList = ref([]);
const open = ref(false); const open = ref(false);
@ -539,19 +540,19 @@ const upload = reactive({
// 是否更新已经存在的用户数据 // 是否更新已经存在的用户数据
updateSupport: 0, updateSupport: 0,
// 设置上传的请求头部 // 设置上传的请求头部
headers: {Authorization: "Bearer " + getToken()}, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData", url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData",
}); });
// 列显隐信息 // 列显隐信息
const columns = ref([ const columns = ref([
{key: 0, label: `用户编号`, visible: true}, { key: 0, label: `用户编号`, visible: true },
{key: 1, label: `登录账号`, visible: true}, { key: 1, label: `登录账号`, visible: true },
{key: 2, label: `姓名`, visible: true}, { key: 2, label: `姓名`, visible: true },
{key: 3, label: `部门`, visible: true}, { key: 3, label: `部门`, visible: true },
{key: 4, label: `手机号码`, visible: true}, { key: 4, label: `手机号码`, visible: true },
{key: 5, label: `状态`, visible: true}, { key: 5, label: `状态`, visible: true },
{key: 6, label: `创建时间`, visible: true}, { key: 6, label: `创建时间`, visible: true },
]); ]);
const data = reactive({ const data = reactive({
@ -566,7 +567,7 @@ const data = reactive({
}, },
rules: { rules: {
userName: [ userName: [
{required: true, message: "登录账号不能为空", trigger: "blur"}, { required: true, message: "登录账号不能为空", trigger: "blur" },
{ {
min: 2, min: 2,
max: 20, max: 20,
@ -574,9 +575,9 @@ const data = reactive({
trigger: "blur", trigger: "blur",
}, },
], ],
nickName: [{required: true, message: "姓名不能为空", trigger: "blur"}], nickName: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
password: [ password: [
{required: true, message: "登录密码不能为空", trigger: "blur"}, { required: true, message: "登录密码不能为空", trigger: "blur" },
{ {
min: 5, min: 5,
max: 20, max: 20,
@ -601,7 +602,7 @@ const data = reactive({
}, },
}); });
const {queryParams, form, rules} = toRefs(data); const { queryParams, form, rules } = toRefs(data);
/** 通过条件过滤节点 */ /** 通过条件过滤节点 */
const filterNode = (value, data) => { const filterNode = (value, data) => {
@ -624,11 +625,11 @@ function getDeptTree() {
function getList() { function getList() {
loading.value = true; loading.value = true;
listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then( listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(res) => { (res) => {
loading.value = false; loading.value = false;
userList.value = res.rows; userList.value = res.rows;
total.value = res.total; total.value = res.total;
} }
); );
} }
@ -658,48 +659,47 @@ function resetQuery() {
function handleDelete(row) { function handleDelete(row) {
const userIds = row.userId || ids.value; const userIds = row.userId || ids.value;
const userNames = row.userId const userNames = row.userId
? [row.username] ? [row.username]
: userList.value : userList.value
.filter((el) => userIds.includes(el.userId)) .filter((el) => userIds.includes(el.userId))
.map((el) => el.username); .map((el) => el.username);
const messageVnode = () => ( const messageVnode = () => (
<> <>
{userNames.map((username, idx) => ( {userNames.map((username, idx) => (
<el-tag <el-tag
key={idx} key={idx}
style={{ style={{
marginLeft: idx >= 1 ? "4px" : 0, marginLeft: idx >= 1 ? "4px" : 0,
}} }}
type="warning" type="warning"
> >
{username} {username}
</el-tag> </el-tag>
))} ))}
</> </>
); );
ElMessageBox.confirm(messageVnode, "确认删除", { ElMessageBox.confirm(messageVnode, "确认删除", {
type: "danger", type: "danger",
"confirm-button-class": "confirm-delete-button", "confirm-button-class": "confirm-delete-button",
}) })
.then(function () { .then(function () {
return delUser(userIds); return delUser(userIds);
}) })
.then(() => { .then(() => {
getList(); getList();
proxy.$modal.msgSuccess("删除成功"); proxy.$modal.msgSuccess("删除成功");
}) })
.catch(() => { .catch(() => {});
});
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download( proxy.download(
"system/user/export", "system/user/export",
{ {
...queryParams.value, ...queryParams.value,
}, },
`user_${new Date().getTime()}.xlsx` `user_${new Date().getTime()}.xlsx`
); );
} }
@ -707,16 +707,16 @@ function handleExport() {
function handleStatusChange(row) { function handleStatusChange(row) {
let text = row.status === "1" ? "启用" : "停用"; let text = row.status === "1" ? "启用" : "停用";
proxy.$modal proxy.$modal
.confirm("确认要" + text + '"' + row.nickname + '"用户吗?') .confirm("确认要" + text + '"' + row.nickname + '"用户吗?')
.then(function () { .then(function () {
return changeUserStatus(row.userId, row.status); return changeUserStatus(row.userId, row.status);
}) })
.then(() => { .then(() => {
proxy.$modal.msgSuccess(text + "成功"); proxy.$modal.msgSuccess(text + "成功");
}) })
.catch(function () { .catch(function () {
row.status = row.status === "0" ? "1" : "0"; row.status = row.status === "0" ? "1" : "0";
}); });
} }
/** 更多操作 */ /** 更多操作 */
@ -742,20 +742,19 @@ function handleAuthRole(row) {
/** 重置密码按钮操作 */ /** 重置密码按钮操作 */
function handleResetPwd(row) { function handleResetPwd(row) {
proxy proxy
.$prompt('请输入"' + row.nickname + '"的新密码', "提示", { .$prompt('请输入"' + row.nickname + '"的新密码', "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
closeOnClickModal: false, closeOnClickModal: false,
inputPattern: /^.{5,20}$/, inputPattern: /^.{5,20}$/,
inputErrorMessage: "登录密码长度必须介于 5 和 20 之间", inputErrorMessage: "登录密码长度必须介于 5 和 20 之间",
}) })
.then(({value}) => { .then(({ value }) => {
resetUserPwd(row.userId, value).then((response) => { resetUserPwd(row.userId, value).then((response) => {
proxy.$modal.msgSuccess("修改成功，新密码是：" + value); proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
});
})
.catch(() => {
}); });
})
.catch(() => {});
} }
/** 选择条数 */ /** 选择条数 */
@ -774,9 +773,9 @@ function handleImport() {
/** 下载模板操作 */ /** 下载模板操作 */
function importTemplate() { function importTemplate() {
proxy.download( proxy.download(
"system/user/importTemplate", "system/user/importTemplate",
{}, {},
`user_template_${new Date().getTime()}.xlsx` `user_template_${new Date().getTime()}.xlsx`
); );
} }
@ -790,11 +789,11 @@ const handleFileSuccess = (response, file, fileList) => {
upload.isUploading = false; upload.isUploading = false;
proxy.$refs["uploadRef"].handleRemove(file); proxy.$refs["uploadRef"].handleRemove(file);
proxy.$alert( proxy.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg + response.msg +
"</div>", "</div>",
"导入结果", "导入结果",
{dangerouslyUseHTMLString: true} { dangerouslyUseHTMLString: true }
); );
getList(); getList();
}; };

4
src/views/system/user/profile/index.vue
View File

@ -27,8 +27,8 @@
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="tree" />所在岗位 <svg-icon icon-class="tree" />所在岗位
<div class="pull-right" > <div class="pull-right">
{{ state.postGroup }} {{ state.postGroup }}
</div> </div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">