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-08-14 13:58:16 +08:00
parent 312aa17914
commit eca5cf0c56
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs
View File

@ -103,7 +103,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
new SysMenu{ Id=1310000000319, Pid=1310000000311, Title="设置状态", Permission="sysTenant/setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000321, Pid=1310000000301, Title="菜单管理", Path="/platform/menu", Name="sysMenu", Component="/system/menu/index", Icon="ele-Menu", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
new SysMenu{ Id=1310000000322, Pid=1310000000321, Title="查询", Permission="sysMenu/list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
//new SysMenu{ Id=1310000000322, Pid=1310000000321, Title="查询", Permission="sysMenu/list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000323, Pid=1310000000321, Title="编辑", Permission="sysMenu/update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000324, Pid=1310000000321, Title="增加", Permission="sysMenu/add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000325, Pid=1310000000321, Title="删除", Permission="sysMenu/delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },

1
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs
View File

@ -42,7 +42,6 @@ public class SysDictDataService : IDynamicApiController, ITransient
/// 获取字典值列表 🔖
/// </summary>
/// <returns></returns>
[UnitOfWork]
[DisplayName("获取字典值列表")]
public async Task<List<SysDictData>> GetList([FromQuery] GetDataDictDataInput input)
{

9
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
View File

@ -242,12 +242,13 @@ public class SysTenantService : IDynamicApiController, ITransient
// 默认租户管理员角色菜单集合
var menuIdList = new List<long> { 1300000000111,1300000000121, // 工作台
1310000000111,1310000000112,1310000000113,1310000000114,1310000000115,1310000000116,1310000000117,1310000000118,1310000000119,1310000000120, // 账号
1310000000111,1310000000112,1310000000113,1310000000114,1310000000115,1310000000116,1310000000117,1310000000118,1310000000119,1310000000120,1310000000121, // 账号
1310000000131,1310000000132,1310000000133,1310000000134,1310000000135,1310000000136,1310000000137,1310000000138, // 角色
1310000000141,1310000000142,1310000000143,1310000000144,1310000000145, // 机构
1310000000151,1310000000152,1310000000153,1310000000154,1310000000155, // 职位
1310000000161,1310000000162,1310000000163,1310000000164, // 个人中心
1310000000171,1310000000172,1310000000173,1310000000174,1310000000175,1310000000176,1310000000177 // 通知公告
1310000000151,1310000000152,1310000000153,1310000000154,1310000000155,1310000000156, // 职位
1310000000161,1310000000162,1310000000163,1310000000164,1310000000165, // 个人中心
1310000000171,1310000000172,1310000000173,1310000000174,1310000000175,1310000000176, // 通知公告
1310000000801 // 关于项目
};
await _sysRoleMenuService.GrantRoleMenu(new RoleMenuInput() { Id = newRole.Id, MenuIdList = menuIdList });
}

4
Web/package.json
View File

@ -31,7 +31,7 @@
"@wangeditor/editor-for-vue": "^5.1.12",
"animate.css": "^4.1.1",
"async-validator": "^4.2.5",
"axios": "^1.7.3",
"axios": "^1.7.4",
"countup.js": "^2.8.0",
"cropperjs": "^1.6.2",
"echarts": "^5.5.1",
@ -71,7 +71,7 @@
"vue-grid-layout": "3.0.0-beta1",
"vue-i18n": "^9.13.1",
"vue-json-pretty": "^2.4.0",
"vue-plugin-hiprint": "0.0.57-beta27",
"vue-plugin-hiprint": "0.0.57-beta28",
"vue-router": "^4.4.3",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",

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

@ -87,7 +87,7 @@
</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>
<el-button icon="ele-Link" size="small" text type="primary" @click="openGrantApi(row)"> 接口黑名单 </el-button>
</template>
</vxe-grid>
</el-card>
@ -101,7 +101,6 @@
<script lang="ts" setup name="sysTenant">
import { onMounted, reactive, ref } from 'vue';
import { ElMessageBox, ElMessage, ElButton } from 'element-plus';
import { auth } from '/@/utils/authFunction';
import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table';
import { useVxeTable } from '/@/hooks/useVxeTableOptionsHook';
import { Local } from '/@/utils/storage';
@ -291,7 +290,7 @@ const resetTenantPwd = async (row: any) => {
};
// 同步所有租户数据库
const syncTenantDb = (row: any) => {
const syncTenantDb = () => {
ElMessageBox.confirm(`确定同步所有租户数据库?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',