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

Merge branch 'main' of http://101.43.53.74:3000/Admin.NET/Admin.NET

Browse Source
This commit is contained in:
zuohuaijun 2024-09-04 14:15:37 +08:00
commit 9c9550a114
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/sys_menu_seed_data.cs.vm
View File

@ -24,7 +24,7 @@ public class @(@Model.ClassName)SeedData : ISqlSugarEntitySeedData<SysMenu>
#region @(@Model.BusName) #region @(@Model.BusName)
@foreach (var menu in Model.MenuList){ @foreach (var menu in Model.MenuList){
@if((int)menu.Type==2){ @if((int)menu.Type==2){
@:list.Add(new SysMenu { Id = @(menu.Id), Pid = @(menu.Pid), Title = "@(menu.Title)", Path = "@(menu.Path)", Name = "@(menu.Name)", Component = "@(menu.Name)", Icon = "@(menu.Icon)", Type = MenuTypeEnum.Menu, CreateTime = DateTime.Parse("@(menu.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"))"), OrderNo = @(menu.OrderNo) }); @:list.Add(new SysMenu { Id = @(menu.Id), Pid = @(menu.Pid), Title = "@(menu.Title)", Path = "@(menu.Path)", Name = "@(menu.Name)", Component = "@(menu.Component)", Icon = "@(menu.Icon)", Type = MenuTypeEnum.Menu, CreateTime = DateTime.Parse("@(menu.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"))"), OrderNo = @(menu.OrderNo) });
} }
@if((int)menu.Type==3) { @if((int)menu.Type==3) {
@:list.Add(new SysMenu { Id = @(menu.Id), Pid = @(menu.Pid), Title = "@(menu.Title)", Permission = "@(menu.Permission)", Type = MenuTypeEnum.Btn, CreateTime = DateTime.Parse("@(menu.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"))"), OrderNo = @(menu.OrderNo) }); @:list.Add(new SysMenu { Id = @(menu.Id), Pid = @(menu.Pid), Title = "@(menu.Title)", Permission = "@(menu.Permission)", Type = MenuTypeEnum.Btn, CreateTime = DateTime.Parse("@(menu.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"))"), OrderNo = @(menu.OrderNo) });

11
Web/src/views/system/user/component/userCenter.vue
View File

@ -219,6 +219,7 @@ watch(state.signOptions, () => {
const uploadCropperImg = async (e: any) => { const uploadCropperImg = async (e: any) => {
var res = await getAPI(SysFileApi).apiSysFileUploadAvatarPostForm(blobToFile(e.img, userInfos.value.account + '.png')); var res = await getAPI(SysFileApi).apiSysFileUploadAvatarPostForm(blobToFile(e.img, userInfos.value.account + '.png'));
userInfos.value.avatar = getFileUrl(res.data.result!); userInfos.value.avatar = getFileUrl(res.data.result!);
state.ruleFormBase.avatar = userInfos.value.avatar;
}; };
// 打开电子签名页面 // 打开电子签名页面
@ -229,11 +230,14 @@ const openSignDialog = () => {
// 保存并上传电子签名 // 保存并上传电子签名
const saveUploadSign = async () => { const saveUploadSign = async () => {
const { isEmpty, data } = signaturePadRef.value.saveSignature(); const { isEmpty, data } = signaturePadRef.value.saveSignature();
if (isEmpty) return; if (isEmpty) {
userInfos.value.signature = null;
state.ruleFormBase.signature = null;
} else {
var res = await getAPI(SysFileApi).apiSysFileUploadSignaturePostForm(base64ToFile(data, userInfos.value.account + '.png')); var res = await getAPI(SysFileApi).apiSysFileUploadSignaturePostForm(base64ToFile(data, userInfos.value.account + '.png'));
userInfos.value.signature = getFileUrl(res.data.result!); userInfos.value.signature = getFileUrl(res.data.result!);
state.ruleFormBase.signature = userInfos.value.signature;
}
clearSign(); clearSign();
state.signDialogVisible = false; state.signDialogVisible = false;
}; };
@ -252,6 +256,7 @@ const clearSign = () => {
const uploadSignFile = async (file: any) => { const uploadSignFile = async (file: any) => {
var res = await getAPI(SysFileApi).apiSysFileUploadSignaturePostForm(file.raw); var res = await getAPI(SysFileApi).apiSysFileUploadSignaturePostForm(file.raw);
userInfos.value.signature = res.data.result?.url; userInfos.value.signature = res.data.result?.url;
state.ruleFormBase.signature = userInfos.value.signature;
}; };
// 获得电子签名文件列表 // 获得电子签名文件列表