gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎调整租户管理页面

Browse Source
This commit is contained in:
zuohuaijun 2024-07-01 11:26:10 +08:00
parent d1b749fcae
commit c42e10e605
3 changed files with 188 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Web/src/views/system/tenant/component/editTenant.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="sys-tenant-container">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
<el-dialog v-model="state.isShowDialog" draggable overflow destroy-on-close width="700px">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@ -8,7 +8,7 @@
</div>
</template>
<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
<el-row :gutter="35">
<el-row :gutter="10">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="租户类型" :rules="[{ required: true, message: '租户类型不能为空', trigger: 'blur' }]">
<el-radio-group v-model="state.ruleForm.tenantType" :disabled="state.ruleForm.id != undefined">
@ -85,7 +85,14 @@
</el-col> -->
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="连接字符串">
<el-input v-model="state.ruleForm.connection" placeholder="连接字符串" clearable type="textarea" :disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined" />
<el-input
v-model="state.ruleForm.connection"
placeholder="连接字符串"
clearable
type="textarea"
:disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined"
:autosize="{ minRows: 4 }"
/>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@ -101,7 +108,7 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="备注">
<el-input v-model="state.ruleForm.remark" placeholder="请输入备注内容" clearable type="textarea" />
<el-input v-model="state.ruleForm.remark" placeholder="请输入备注内容" clearable type="textarea" :autosize="{ minRows: 4 }" />
</el-form-item>
</el-col>
</el-row>

5
Web/src/views/system/tenant/component/grantMenu.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="sys-grantMenu-container">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false">
<el-dialog v-model="state.isShowDialog" draggable overflow destroy-on-close>
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@ -8,7 +8,7 @@
</div>
</template>
<el-form :model="state.ruleForm" v-loading="state.loading">
<el-row :gutter="35">
<el-row :gutter="10">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl1="24">
<el-form-item prop="orgIdList" label="">
<el-tree
@ -54,6 +54,7 @@ const state = reactive({
menuData: [] as any, // 菜单数据
});
// 页面初始化
onMounted(async () => {
state.loading = true;
var res = await getAPI(SysMenuApi).apiSysMenuListGet();

315
Web/src/views/system/tenant/index.vue
View File

@ -1,117 +1,107 @@
<template>
<div class="sys-tenant-container">
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="state.queryParams" ref="queryForm" :inline="true">
<el-form-item label="租户名称">
<el-input v-model="state.queryParams.name" placeholder="租户名称" clearable />
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="state.queryParams.phone" placeholder="联系电话" clearable />
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysTenant:page'"> 查询 </el-button>
<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
</el-button-group>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="ele-Plus" @click="openAddTenant" v-auth="'sysTenant:add'"> 新增 </el-button>
</el-form-item>
<el-form-item>
<el-button type="danger" icon="ele-Refresh" @click="syncTenantDb" plain> 同步所有租户数据库 </el-button>
</el-form-item>
<div class="sys-tenant-container" v-loading="options.loading">
<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" :label-width="'60px'" style="flex: 1 1 0%">
<el-row :gutter="10">
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item label="租户名称" prop="name">
<el-input v-model="state.queryParams.name" placeholder="租户名称" clearable @keyup.enter.native="handleQuery(true)" />
</el-form-item>
</el-col>
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item label="联系电话" prop="code">
<el-input v-model="state.queryParams.phone" placeholder="联系电话" clearable @keyup.enter.native="handleQuery(true)" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider style="height: calc(100% - 5px); margin: 0 10px" direction="vertical" />
<el-row>
<el-col>
<el-button-group>
<el-button type="primary" icon="ele-Search" @click="handleQuery(true)" v-auth="'sysTenant:page'" :loading="options.loading"> 查询 </el-button>
<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
</el-button-group>
</el-col>
</el-row>
</el-card>
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
<el-table :data="state.tenantData" style="width: 100%" v-loading="state.loading" border>
<el-table-column type="index" label="序号" width="55" align="center" fixed />
<el-table-column prop="name" label="租户名称" width="160" align="center" show-overflow-tooltip />
<el-table-column prop="adminAccount" label="租管账号" align="center" width="120" show-overflow-tooltip />
<el-table-column prop="phone" label="电话" width="120" align="center" show-overflow-tooltip />
<!-- <el-table-column prop="host" label="主机" show-overflow-tooltip /> -->
<!-- <el-table-column prop="email" label="邮箱" show-overflow-tooltip /> -->
<el-table-column prop="tenantType" label="租户类型" width="100" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag v-if="scope.row.tenantType === 0"> ID隔离 </el-tag>
<el-tag type="danger" v-else> 库隔离 </el-tag>
</template>
</el-table-column>
<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
<template #default="scope">
<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2" size="small" @change="changeStatus(scope.row)" :disabled="scope.row.id == 123456780000000" />
</template>
</el-table-column>
<el-table-column prop="dbType" label="数据库类型" width="120" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag v-if="scope.row.dbType === 0"> MySql </el-tag>
<el-tag v-else-if="scope.row.dbType === 1"> SqlServer </el-tag>
<el-tag v-if="scope.row.dbType === 2"> Sqlite </el-tag>
<el-tag v-else-if="scope.row.dbType === 3"> Oracle </el-tag>
<el-tag v-if="scope.row.dbType === 4"> PostgreSQL </el-tag>
<el-tag v-else-if="scope.row.dbType === 5"> Dm </el-tag>
<el-tag v-if="scope.row.dbType === 6"> Kdbndp </el-tag>
<el-tag v-else-if="scope.row.dbType === 7"> Oscar </el-tag>
<el-tag v-if="scope.row.dbType === 8"> MySqlConnector </el-tag>
<el-tag v-else-if="scope.row.dbType === 9"> Access </el-tag>
<el-tag v-if="scope.row.dbType === 10"> OpenGauss </el-tag>
<el-tag v-else-if="scope.row.dbType === 11"> QuestDB </el-tag>
<el-tag v-else-if="scope.row.dbType === 12"> HG </el-tag>
<el-tag v-else-if="scope.row.dbType === 13"> ClickHouse </el-tag>
<el-tag v-else-if="scope.row.dbType === 14"> GBase </el-tag>
<el-tag v-else-if="scope.row.dbType === 15"> Odbc </el-tag>
<el-tag v-else-if="scope.row.dbType === 16"> OceanBaseForOracle </el-tag>
<el-tag v-else-if="scope.row.dbType === 17"> TDengine </el-tag>
<el-tag v-else-if="scope.row.dbType === 18"> GaussDB </el-tag>
<el-tag v-else-if="scope.row.dbType === 19"> OceanBase </el-tag>
<el-tag v-else-if="scope.row.dbType === 20"> Tidb </el-tag>
<el-tag v-else-if="scope.row.dbType === 21"> Vastbase </el-tag>
<el-tag v-else-if="scope.row.dbType === 22"> PolarDB </el-tag>
<el-tag v-else-if="scope.row.dbType === 23"> Doris </el-tag>
<el-tag v-else-if="scope.row.dbType === 900"> Custom </el-tag>
</template>
</el-table-column>
<!-- <el-table-column prop="configId" label="数据库标识" show-overflow-tooltip /> -->
<el-table-column prop="connection" label="数据库连接" min-width="300" header-align="center" show-overflow-tooltip />
<el-table-column prop="slaveConnections" label="从库连接" min-width="300" header-align="center" show-overflow-tooltip />
<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
<el-table-column label="修改记录" width="100" align="center" show-overflow-tooltip>
<template #default="scope">
<ModifyRecord :data="scope.row" />
</template>
</el-table-column>
<el-table-column label="操作" width="350" fixed="right" align="center" show-overflow-tooltip>
<template #default="scope">
<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTenant(scope.row)" v-auth="'sysTenant:update'"> 编辑 </el-button>
<el-button icon="ele-Coin" size="small" text type="danger" @click="createTenant(scope.row)" v-auth="'sysTenant:createDb'" :disabled="scope.row.tenantType == 0"> 创建库 </el-button>
<el-button icon="ele-Menu" size="small" text type="primary" @click="openGrantMenu(scope.row)" :v-auth="'sysTenant:grantMenu'"> 授权菜单 </el-button>
<el-button icon="ele-Link" size="small" text type="primary" @click="openGrantApi(scope.row)"> 授权接口 </el-button>
<el-dropdown>
<el-button icon="ele-MoreFilled" size="small" text type="primary" style="padding-left: 12px" />
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="ele-RefreshLeft" @click="resetTenantPwd(scope.row)" :v-auth="'sysTenant:resetPwd'"> 重置密码 </el-dropdown-item>
<el-dropdown-item icon="ele-Delete" @click="delTenant(scope.row)" :v-auth="'sysTenant:delete'"> 删除租户 </el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</el-table-column>
</el-table>
<el-pagination
v-model:currentPage="state.tableParams.page"
v-model:page-size="state.tableParams.pageSize"
:total="state.tableParams.total"
:page-sizes="[10, 20, 50, 100]"
small
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
layout="total, sizes, prev, pager, next, jumper"
/>
<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" @cell-dblclick="handleEdit" @sort-change="sortChange">
<template #toolbar_buttons>
<el-button icon="ele-Plus" type="primary" @click="handleAdd" v-auth="'sysTenant:add'"> 新增 </el-button>
<el-button type="danger" icon="ele-Refresh" @click="syncTenantDb" plain> 同步所有租户数据库 </el-button>
</template>
<template #toolbar_tools> </template>
<template #empty>
<el-empty :image-size="200" />
</template>
<template #row_tenantType="{ row }">
<el-tag v-if="row.tenantType === 0" type="success">ID隔离</el-tag>
<el-tag v-else type="danger">库隔离</el-tag>
</template>
<template #row_status="scope">
<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2" size="small" @change="changeStatus(scope)" :disabled="scope.row.id == 1300000000001" />
</template>
<template #row_dbType="{ row }">
<el-tag v-if="row.dbType === 0"> MySql </el-tag>
<el-tag v-else-if="row.dbType === 1"> SqlServer </el-tag>
<el-tag v-else-if="row.dbType === 2"> Sqlite </el-tag>
<el-tag v-else-if="row.dbType === 3"> Oracle </el-tag>
<el-tag v-else-if="row.dbType === 4"> PostgreSQL </el-tag>
<el-tag v-else-if="row.dbType === 5"> Dm </el-tag>
<el-tag v-else-if="row.dbType === 6"> Kdbndp </el-tag>
<el-tag v-else-if="row.dbType === 7"> Oscar </el-tag>
<el-tag v-else-if="row.dbType === 8"> MySqlConnector </el-tag>
<el-tag v-else-if="row.dbType === 9"> Access </el-tag>
<el-tag v-else-if="row.dbType === 10"> OpenGauss </el-tag>
<el-tag v-else-if="row.dbType === 11"> QuestDB </el-tag>
<el-tag v-else-if="row.dbType === 12"> HG </el-tag>
<el-tag v-else-if="row.dbType === 13"> ClickHouse </el-tag>
<el-tag v-else-if="row.dbType === 14"> GBase </el-tag>
<el-tag v-else-if="row.dbType === 15"> Odbc </el-tag>
<el-tag v-else-if="row.dbType === 16"> OceanBaseForOracle </el-tag>
<el-tag v-else-if="row.dbType === 17"> TDengine </el-tag>
<el-tag v-else-if="row.dbType === 18"> GaussDB </el-tag>
<el-tag v-else-if="row.dbType === 19"> OceanBase </el-tag>
<el-tag v-else-if="row.dbType === 20"> Tidb </el-tag>
<el-tag v-else-if="row.dbType === 21"> Vastbase </el-tag>
<el-tag v-else-if="row.dbType === 22"> PolarDB </el-tag>
<el-tag v-else-if="row.dbType === 23"> Doris </el-tag>
<el-tag v-else-if="row.dbType === 900"> Custom </el-tag>
</template>
<template #row_record="{ row }">
<ModifyRecord :data="row" />
</template>
<template #row_buttons="{ row }">
<el-tooltip content="编辑" placement="top">
<el-button icon="ele-Edit" size="small" text type="primary" @click="handleEdit(row)" v-auth="'sysTenant:update'" />
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button icon="ele-Delete" text type="danger" @click="handleDelete(row)" :v-auth="'sysTenant:delete'" :disabled="row.id == 1300000000001"> </el-button>
</el-tooltip>
<el-tooltip content="重置密码" placement="top">
<el-button icon="ele-RefreshLeft" text type="danger" @click="resetTenantPwd(row)" :v-auth="'sysTenant:resetPwd'"> </el-button>
</el-tooltip>
<el-button icon="ele-Coin" size="small" text type="danger" @click="createTenant(row)" v-auth="'sysTenant:createDb'" :disabled="row.tenantType == 0"> 创建库 </el-button>
<el-button icon="ele-Menu" size="small" text type="primary" @click="openGrantMenu(row)" :v-auth="'sysTenant:grantMenu'"> 授权菜单 </el-button>
<el-button icon="ele-Link" size="small" text type="primary" @click="openGrantApi(row)"> 授权接口 </el-button>
</template>
<template #pager>
<vxe-pager
:loading="options.loading"
v-model:current-page="state.tableParams.page"
v-model:page-size="state.tableParams.pageSize"
:total="state.tableParams.total"
@page-change="pageChange"
/>
</template>
</vxe-grid>
</el-card>
<EditTenant ref="editTenantRef" :title="state.editTenantTitle" @handleQuery="handleQuery" />
<EditTenant ref="editTenantRef" :title="state.title" @handleQuery="handleQuery" />
<GrantMenu ref="grantMenuRef" />
<GrantApi ref="grantApiRef" />
</div>
@ -119,7 +109,11 @@
<script lang="ts" setup name="sysTenant">
import { onMounted, reactive, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { ElMessageBox, ElMessage, ElButton } from 'element-plus';
import { auth } from '/@/utils/authFunction';
import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
import EditTenant from '/@/views/system/tenant/component/editTenant.vue';
import GrantMenu from '/@/views/system/tenant/component/grantMenu.vue';
import GrantApi from '/@/views/system/role/component/grantApi.vue';
@ -129,12 +123,11 @@ import { getAPI } from '/@/utils/axios-utils';
import { SysTenantApi } from '/@/api-services/api';
import { TenantOutput } from '/@/api-services/models';
const xGrid = ref<VxeGridInstance>();
const editTenantRef = ref<InstanceType<typeof EditTenant>>();
const grantMenuRef = ref<InstanceType<typeof GrantMenu>>();
const grantApiRef = ref<InstanceType<typeof GrantApi>>();
const state = reactive({
loading: false,
tenantData: [] as Array<TenantOutput>,
queryParams: {
name: undefined,
phone: undefined,
@ -142,41 +135,92 @@ const state = reactive({
tableParams: {
page: 1,
pageSize: 10,
field: 'createTime', // 默认的排序字段
order: 'desc', // 排序方向
descStr: 'desc', // 降序排序的关键字符
total: 0 as any,
},
editTenantTitle: '',
title: '',
});
// 表格参数配置
const options = useVxeTable<TenantOutput>({
id: 'sysTenant',
name: '租户信息',
columns: [
// { type: 'checkbox', width: 40, fixed: 'left' },
{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
{ field: 'name', title: '租户名称', minWidth: 160, showOverflow: 'tooltip' },
{ field: 'adminAccount', title: '租管账号', minWidth: 120, showOverflow: 'tooltip' },
{ field: 'phone', title: '电话', minWidth: 120, showOverflow: 'tooltip' },
{ field: 'host', title: '主机', minWidth: 150, showOverflow: 'tooltip' },
{ field: 'email', title: '邮箱', minWidth: 150, showOverflow: 'tooltip' },
{ field: 'tenantType', title: '租户类型', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_tenantType' } },
{ field: 'status', title: '状态', minWidth: 100, slots: { default: 'row_status' } },
{ field: 'dbType', title: '数据库类型', minWidth: 120, showOverflow: 'tooltip', slots: { default: 'row_dbType' } },
{ field: 'configId', title: '数据库标识', minWidth: 150, showOverflow: 'tooltip' },
{ field: 'connection', title: '数据库连接', minWidth: 300, showOverflow: 'tooltip' },
{ field: 'slaveConnections', title: '从库连接', showOverflow: 'tooltip' },
{ field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' },
{ field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
{ title: '操作', fixed: 'right', width: 380, showOverflow: true, slots: { default: 'row_buttons' } },
],
enableExport: auth('sysTenant:export'),
searchCallback: () => handleQuery(),
queryAllCallback: () => fetchData({ pageSize: 99999 }),
});
// 页面初始化
onMounted(async () => {
handleQuery();
await handleQuery();
});
// 查询操作
const handleQuery = async () => {
state.loading = true;
let params = Object.assign(state.queryParams, state.tableParams);
var res = await getAPI(SysTenantApi).apiSysTenantPagePost(params);
state.tenantData = res.data.result?.items ?? [];
const handleQuery = async (reset = false) => {
options.loading = true;
if (reset) state.tableParams.page = 1;
var res = await fetchData(null);
xGrid.value?.loadData(res.data.result?.items ?? []);
state.tableParams.total = res.data.result?.total;
state.loading = false;
options.loading = false;
};
// 获取数据
const fetchData = async (tableParams: any) => {
let params = Object.assign(state.queryParams, state.tableParams, tableParams);
return getAPI(SysTenantApi).apiSysTenantPagePost(params);
};
// 重置操作
const resetQuery = () => {
state.queryParams.name = undefined;
state.queryParams.phone = undefined;
handleQuery(true);
};
// 改变页码序号或页面容量
const pageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
state.tableParams.page = currentPage;
state.tableParams.pageSize = pageSize;
handleQuery();
};
// 列排序
const sortChange = (options: any) => {
state.tableParams.field = options.field;
state.tableParams.order = options.order;
handleQuery();
};
// 打开新增页面
const openAddTenant = () => {
state.editTenantTitle = '添加租户';
const handleAdd = () => {
state.title = '添加租户';
editTenantRef.value?.openDialog({ tenantType: 0, orderNo: 100 });
};
// 打开编辑页面
const openEditTenant = (row: any) => {
state.editTenantTitle = '编辑租户';
const handleEdit = (row: any) => {
state.title = '编辑租户';
editTenantRef.value?.openDialog(row);
};
@ -208,7 +252,7 @@ const resetTenantPwd = async (row: any) => {
};
// 删除
const delTenant = (row: any) => {
const handleDelete = (row: any) => {
ElMessageBox.confirm(`确定删除租户：【${row.name}】?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -222,18 +266,6 @@ const delTenant = (row: any) => {
.catch(() => {});
};
// 改变页面容量
const handleSizeChange = (val: number) => {
state.tableParams.pageSize = val;
handleQuery();
};
// 改变页码序号
const handleCurrentChange = (val: number) => {
state.tableParams.page = val;
handleQuery();
};
// 创建租户库
const createTenant = (row: any) => {
ElMessageBox.confirm(`确定创建/更新租户数据库：【${row.name}】?`, '提示', {
@ -249,14 +281,15 @@ const createTenant = (row: any) => {
};
// 修改状态
const changeStatus = (row: any) => {
const changeStatus = async (scope: any) => {
getAPI(SysTenantApi)
.apiSysTenantSetStatusPost({ id: row.id, status: row.status })
.apiSysTenantSetStatusPost({ id: scope.row.id, status: scope.row.status })
.then(() => {
ElMessage.success('租户状态设置成功');
})
.catch(() => {
row.status = row.status == 1 ? 2 : 1;
.catch(async () => {
scope.row.status = scope.row.status === 1 ? 2 : 1;
await xGrid.value?.updateStatus(scope);
});
};
@ -268,10 +301,10 @@ const syncTenantDb = (row: any) => {
type: 'warning',
})
.then(async () => {
state.loading = true;
options.loading = true;
await getAPI(SysTenantApi).apiSysTenantSyncTenantDbPost();
ElMessage.success('同步成功');
state.loading = false;
options.loading = false;
})
.catch(() => {});
};