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

Merge branch 'v2' into v2

Browse Source
This commit is contained in:
zuohuaijun 2025-04-10 02:02:50 +08:00
commit fe3b25dc36
8 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Web/src/views/system/log/logex/index.vue
View File

@ -96,6 +96,7 @@
</template> </template>
<template #row_status="{ row }"> <template #row_status="{ row }">
<el-tag v-if="row.status === '200'" type="success">成功</el-tag> <el-tag v-if="row.status === '200'" type="success">成功</el-tag>
<el-tag v-else-if="row.status === '304'" type="warning">成功</el-tag>
<el-tag v-else type="danger">失败</el-tag> <el-tag v-else type="danger">失败</el-tag>
</template> </template>
<template #row_buttons="{ row }"> <template #row_buttons="{ row }">

1
Web/src/views/system/log/logop/index.vue
View File

@ -92,6 +92,7 @@
</template> </template>
<template #row_status="{ row }"> <template #row_status="{ row }">
<el-tag v-if="row.status === '200'" type="success">成功</el-tag> <el-tag v-if="row.status === '200'" type="success">成功</el-tag>
<el-tag v-else-if="row.status === '304'" type="warning">成功</el-tag>
<el-tag v-else type="danger">失败</el-tag> <el-tag v-else type="danger">失败</el-tag>
</template> </template>
<template #row_buttons="{ row }"> <template #row_buttons="{ row }">

1
Web/src/views/system/log/logvis/index.vue
View File

@ -88,6 +88,7 @@
</template> </template>
<template #row_status="{ row }"> <template #row_status="{ row }">
<el-tag v-if="row.status === '200'" type="success">成功</el-tag> <el-tag v-if="row.status === '200'" type="success">成功</el-tag>
<el-tag v-else-if="row.status === '304'" type="warning">成功</el-tag>
<el-tag v-else type="danger">失败</el-tag> <el-tag v-else type="danger">失败</el-tag>
</template> </template>
</vxe-grid> </vxe-grid>

8
Web/src/views/system/menu/index.vue
View File

@ -70,7 +70,7 @@
</vxe-grid> </vxe-grid>
</el-card> </el-card>
<EditMenu ref="editMenuRef" :title="state.title" :menuData="state.menuData" @handleQuery="handleQuery" /> <EditMenu ref="editMenuRef" :title="state.title" :menuData="state.menuData" @handleQuery="handleQuery(false)" />
</div> </div>
</template> </template>
@ -131,7 +131,11 @@ const options = useVxeTable<SysMenu>(
// 工具栏配置 // 工具栏配置
toolbarConfig: { export: false }, toolbarConfig: { export: false },
// 树形配置 // 树形配置
treeConfig: { expandAll: false }, treeConfig: { expandAll: false, reserve: true },
// 行配置信息
rowConfig: {
keyField: 'id',
},
} }
); );

2
Web/src/views/system/role/component/grantApi.vue
View File

@ -134,7 +134,7 @@ const cancel = () => {
// 授权角色接口资源 // 授权角色接口资源
const submit = async () => { const submit = async () => {
state.ownApiList = treeRef.value?.getCheckedKeys() as Array<string>; state.ownApiList = treeRef.value?.getCheckedKeys(true) as Array<string>;
await getAPI(SysRoleApi).apiSysRoleGrantApiPost({ id: state.roleId, apiList: state.ownApiList }); await getAPI(SysRoleApi).apiSysRoleGrantApiPost({ id: state.roleId, apiList: state.ownApiList });
cancel(); cancel();
}; };

2
Web/src/views/system/role/component/grantMenu.vue
View File

@ -97,7 +97,7 @@ const cancel = () => {
// 提交 // 提交
const submit = async () => { const submit = async () => {
state.menuIdList = treeRef.value?.getCheckedKeys() as Array<number>; //.concat(treeRef.value?.getHalfCheckedKeys()); state.menuIdList = treeRef.value?.getCheckedKeys(true) as Array<number>; //.concat(treeRef.value?.getHalfCheckedKeys());
await getAPI(SysRoleApi).apiSysRoleGrantMenuPost({ id: state.roleId, menuIdList: state.menuIdList }); await getAPI(SysRoleApi).apiSysRoleGrantMenuPost({ id: state.roleId, menuIdList: state.menuIdList });
cancel(); cancel();
}; };

2
Web/src/views/system/role/component/grantTable.vue
View File

@ -87,7 +87,7 @@ const cancel = () => {
// 提交 // 提交
const submit = async () => { const submit = async () => {
state.tableColumnList = treeRef.value?.getCheckedKeys() as Array<number>; //.concat(treeRef.value?.getHalfCheckedKeys()); state.tableColumnList = treeRef.value?.getCheckedKeys(true) as Array<number>; //.concat(treeRef.value?.getHalfCheckedKeys());
await getAPI(SysRoleApi).apiSysRoleGrantRoleTablePost({ id: state.roleId, tableColumnList: state.tableColumnList }); await getAPI(SysRoleApi).apiSysRoleGrantRoleTablePost({ id: state.roleId, tableColumnList: state.tableColumnList });
cancel(); cancel();
}; };

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

@ -91,7 +91,7 @@ const cancel = () => {
// 提交 // 提交
const submit = async () => { const submit = async () => {
state.ruleForm.menuIdList = treeRef.value?.getCheckedKeys() as Array<number>; state.ruleForm.menuIdList = treeRef.value?.getCheckedKeys(true) as Array<number>;
await getAPI(SysTenantApi).apiSysTenantGrantMenuPost(state.ruleForm); await getAPI(SysTenantApi).apiSysTenantGrantMenuPost(state.ruleForm);
state.isShowDialog = false; state.isShowDialog = false;
}; };