diff --git a/README.md b/README.md index b99e9fe..52d3d5d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ * 本项目适合有一定NetCore和 vue基础的开发人员 * 基于.NET5/.NET6实现的通用权限管理平台（RBAC模式）。整合最新技术高效快速开发，前后端分离模式，开箱即用。 * 代码量少、学习简单、通俗易懂、功能强大、易扩展、轻量级，让web开发更快速、简单高效（从此告别996），解决70%的重复工作，专注您的业务，轻松开发从现在开始！ -* 前端采用Vue2.0、Element UI。 +* 前端采用Vue2.0/vue3、Element UI/Element-UI plus、vite。 * 后端采用Net5/Net6、Sqlsugar、MySQL等，可以自动分库分表。 * 权限认证使用Jwt，支持多终端认证系统。 * 支持加载动态权限菜单，多方式轻松权限控制 @@ -67,6 +67,7 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e 15. 通知管理：系统通知公告信息发布维护，使用signalr实现对用户实时通知。 16. 参数管理：对系统动态配置常用参数。 17. 发送邮件：可以对多个用户进行发送邮件 +18. 账号注册：可以注册账号登录系统。 ## 🍻项目结构 @@ -137,7 +138,6 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e - 👉Ruoyi.vue：[Ruoyi](http://www.ruoyi.vip/) - 👉SqlSugar：[SqlSugar](https://gitee.com/dotnetchina/SqlSugar) - 👉vue-element-admin：[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) -- 👉Meiam.System：[Meiam.System](https://github.com/91270/Meiam.System) ## 🎀捐赠 如果这个项目对您有所帮助，请扫下方二维码就当打发要饭的吧。 diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs index db2d24d..83454ac 100644 --- a/ZR.Admin.WebApi/Controllers/BaseController.cs +++ b/ZR.Admin.WebApi/Controllers/BaseController.cs @@ -8,7 +8,6 @@ using OfficeOpenXml; using System; using System.Collections.Generic; using System.IO; -using ZR.Admin.WebApi.Filters; namespace ZR.Admin.WebApi.Controllers { @@ -157,7 +156,8 @@ namespace ZR.Admin.WebApi.Controllers { // 添加worksheet ExcelWorksheet worksheet = package.Workbook.Worksheets.Add(fileName); - + //单元格自动适应大小 + worksheet.Cells.Style.ShrinkToFit = true; //全部字段导出 worksheet.Cells.LoadFromCollection(list, true, OfficeOpenXml.Table.TableStyles.Light13); package.SaveAs(stream); diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index ced2b1f..f38e17d 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -160,14 +160,13 @@ namespace ZR.Admin.WebApi.Controllers throw new CustomException("表不能为空"); } string[] tableNames = tables.Split(',', StringSplitOptions.RemoveEmptyEntries); - var userName = HttpContext.GetName(); - + int result = 0; foreach (var tableName in tableNames) { var tabInfo = _CodeGeneraterService.GetTableInfo(dbName, tableName); if (tabInfo != null) { - GenTable genTable = CodeGeneratorTool.InitTable(dbName, userName, tableName, tabInfo?.Description); + GenTable genTable = CodeGeneratorTool.InitTable(dbName, HttpContext.GetName(), tableName, tabInfo?.Description); genTable.TableId = GenTableService.ImportGenTable(genTable); if (genTable.TableId > 0) @@ -179,13 +178,12 @@ namespace ZR.Admin.WebApi.Controllers GenTableColumnService.DeleteGenTableColumnByTableName(tableName); GenTableColumnService.InsertGenTableColumn(genTableColumns); genTable.Columns = genTableColumns; - - return SUCCESS(genTable); + result++; } } } - return ToResponse(ResultCode.FAIL, "生成失败"); + return ToResponse(result); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index 2b89b4c..ecf3c93 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -19,6 +19,8 @@ using ZR.Service.System; using Microsoft.Extensions.Options; using UAParser; using IPTools.Core; +using Infrastructure.Extensions; +using Microsoft.AspNetCore.Authorization; namespace ZR.Admin.WebApi.Controllers.System { @@ -80,13 +82,13 @@ namespace ZR.Admin.WebApi.Controllers.System } var user = sysLoginService.Login(loginBody, RecordLogInfo(httpContextAccessor.HttpContext)); - + List roles = roleService.SelectUserRoleListByUserId(user.UserId); //权限集合 eg *:*:*,system:user:list List permissions = permissionService.GetMenuPermission(user); LoginUser loginUser = new(user, roles, permissions); - CacheHelper.SetCache(GlobalConstant.UserPermKEY + user.UserId, permissions); + CacheService.SetUserPerms(GlobalConstant.UserPermKEY + user.UserId, permissions); return SUCCESS(JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser), jwtSettings.JwtSettings)); } @@ -105,9 +107,9 @@ namespace ZR.Admin.WebApi.Controllers.System //}).Wait(); var userid = HttpContext.GetUId(); var name = HttpContext.GetName(); - - CacheHelper.Remove(GlobalConstant.UserPermKEY + userid); - return SUCCESS(new { name , id = userid }); + + CacheService.RemoveUserPerms(GlobalConstant.UserPermKEY + userid); + return SUCCESS(new { name, id = userid }); } /// @@ -198,9 +200,41 @@ namespace ZR.Admin.WebApi.Controllers.System ipaddr = ipAddr, userName = context.GetName(), loginLocation = ip_info.Province + "-" + ip_info.City - }; + }; return sysLogininfor; } + + /// + /// 注册 + /// + /// + /// + [HttpPost("/register")] + [AllowAnonymous] + [Log(Title = "注册", BusinessType = Infrastructure.Enums.BusinessType.INSERT)] + public IActionResult Register([FromBody] RegisterDto dto) + { + SysConfig config = sysConfigService.GetSysConfigByKey("sys.account.register"); + if (config?.ConfigValue != "true") + { + return ToResponse(ResultCode.CUSTOM_ERROR, "当前系统没有开启注册功能！"); + } + SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff"); + if (sysConfig?.ConfigValue != "off" && CacheHelper.Get(dto.Uuid) is string str && !str.ToLower().Equals(dto.Code.ToLower())) + { + return ToResponse(ResultCode.CAPTCHA_ERROR, "验证码错误"); + } + if (UserConstants.NOT_UNIQUE.Equals(sysUserService.CheckUserNameUnique(dto.Username))) + { + return ToResponse(ResultCode.CUSTOM_ERROR, $"保存用户{dto.Username}失败，注册账号已存在"); + } + SysUser user = sysUserService.Register(dto); + if (user.UserId > 0) + { + return SUCCESS(user); + } + return ToResponse(ResultCode.CUSTOM_ERROR, "注册失败，请联系管理员"); + } } } diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs index 25f2b6b..4c9ead2 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -134,9 +134,7 @@ namespace ZR.Admin.WebApi.Controllers.System LoginUser loginUser = Framework.JwtUtil.GetLoginUser(HttpContext); if (formFile == null) throw new CustomException("请选择文件"); - string fileExt = Path.GetExtension(formFile.FileName); - string fileName = FileUtil.HashFileName() + (fileExt.IsEmpty() ? ".png" : fileExt); - SysFile file = await FileService.SaveFileToLocal(hostEnvironment.WebRootPath, fileName, "", HttpContext.GetName(), formFile); + SysFile file = await FileService.SaveFileToLocal(hostEnvironment.WebRootPath, "", "", HttpContext.GetName(), formFile); UserService.UpdatePhoto(new SysUser() { Avatar = file.AccessUrl, UserId = loginUser.UserId }); return SUCCESS(new { imgUrl = file.AccessUrl }); diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs index 9f6b0a5..3f86217 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -174,7 +174,7 @@ namespace ZR.Admin.WebApi.Controllers.System /// 使用IFromFile必须使用name属性否则获取不到文件 /// [HttpPost("importData")] - [Log(Title = "用户导入", BusinessType = BusinessType.IMPORT)] + [Log(Title = "用户导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = false)] [ActionPermissionFilter(Permission = "system:user:import")] public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile) { @@ -189,7 +189,7 @@ namespace ZR.Admin.WebApi.Controllers.System /// /// [HttpGet("importTemplate")] - [Log(Title = "用户模板", BusinessType = BusinessType.EXPORT)] + [Log(Title = "用户模板", BusinessType = BusinessType.EXPORT, IsSaveRequestData = false, IsSaveResponseData = false)] [AllowAnonymous] public IActionResult ImportTemplateExcel() { diff --git a/ZR.Admin.WebApi/Extensions/EntityExtension.cs b/ZR.Admin.WebApi/Extensions/EntityExtension.cs index 4abe625..734d1ca 100644 --- a/ZR.Admin.WebApi/Extensions/EntityExtension.cs +++ b/ZR.Admin.WebApi/Extensions/EntityExtension.cs @@ -10,14 +10,6 @@ namespace ZR.Admin.WebApi.Extensions { var types = source?.GetType(); - //var worker = new IdWorker(1, 1); - //if (types.GetProperty("ID") != null) - //{ - // long id = worker.NextId(); - - // types.GetProperty("ID").SetValue(source, id.ToString(), null); - //} - if (types.GetProperty("CreateTime") != null) { types.GetProperty("CreateTime").SetValue(source, DateTime.Now, null); @@ -30,7 +22,6 @@ namespace ZR.Admin.WebApi.Extensions { types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null); } - if (types.GetProperty("Create_by") != null && context != null) { types.GetProperty("Create_by").SetValue(source, context.GetName(), null); @@ -54,10 +45,6 @@ namespace ZR.Admin.WebApi.Extensions { types.GetProperty("Update_time").SetValue(source, DateTime.Now, null); } - //if (types.GetProperty("UpdateID") != null) - //{ - // types.GetProperty("UpdateID").SetValue(source, userSession.UserID, null); - //} if (types.GetProperty("UpdateBy") != null) { diff --git a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs index 14d6b4f..9be5361 100644 --- a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs +++ b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs @@ -1,9 +1,6 @@ -using Infrastructure; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http; -using Newtonsoft.Json; using System; using System.Collections.Generic; using System.IO; @@ -130,26 +127,6 @@ namespace ZR.Admin.WebApi.Extensions return context != null ? context.Request.Path.Value : ""; } - private static void WhiteCookie(HttpContext context, List claims) - { - //2.创建声明主题 指定认证方式 这里使用cookie - var claimsIdentity = new ClaimsIdentity(claims, "Login"); - - Task.Run(async () => - { - await context.SignInAsync( - JwtBearerDefaults.AuthenticationScheme,//这里要注意的是HttpContext.SignInAsync(AuthenticationType,…) 所设置的Scheme一定要与前面的配置一样，这样对应的登录授权才会生效。 - new ClaimsPrincipal(claimsIdentity), - new AuthenticationProperties() - { - IsPersistent = true, - AllowRefresh = true, - ExpiresUtc = DateTimeOffset.Now.AddDays(1),//有效时间 - }); - }).Wait(); - } - - /// /// 设置请求参数 /// diff --git a/ZR.Admin.WebApi/Framework/CookieUtil.cs b/ZR.Admin.WebApi/Framework/CookieUtil.cs new file mode 100644 index 0000000..82081fd --- /dev/null +++ b/ZR.Admin.WebApi/Framework/CookieUtil.cs @@ -0,0 +1,34 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Claims; +using System.Threading.Tasks; + +namespace ZR.Admin.WebApi.Framework +{ + public class CookieUtil + { + public static void WhiteCookie(HttpContext context, List claims) + { + //2.创建声明主题 指定认证方式 这里使用cookie + var claimsIdentity = new ClaimsIdentity(claims, "Login"); + + Task.Run(async () => + { + await context.SignInAsync( + JwtBearerDefaults.AuthenticationScheme,//这里要注意的是HttpContext.SignInAsync(AuthenticationType,…) 所设置的Scheme一定要与前面的配置一样，这样对应的登录授权才会生效。 + new ClaimsPrincipal(claimsIdentity), + new AuthenticationProperties() + { + IsPersistent = true, + AllowRefresh = true, + ExpiresUtc = DateTimeOffset.Now.AddDays(1),//有效时间 + }); + }).Wait(); + } + } +} diff --git a/ZR.Admin.WebApi/Framework/JwtUtil.cs b/ZR.Admin.WebApi/Framework/JwtUtil.cs index f74dd03..f665490 100644 --- a/ZR.Admin.WebApi/Framework/JwtUtil.cs +++ b/ZR.Admin.WebApi/Framework/JwtUtil.cs @@ -6,8 +6,8 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Text; using ZR.Admin.WebApi.Extensions; -using ZR.Common; using ZR.Model.System; +using ZR.Service.System; namespace ZR.Admin.WebApi.Framework { @@ -127,7 +127,7 @@ namespace ZR.Admin.WebApi.Framework { var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value; var loginUser = JsonConvert.DeserializeObject(userData); - var permissions = (List)CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId); + var permissions = CacheService.GetUserPerms(GlobalConstant.UserPermKEY + loginUser?.UserId); if (loginUser?.UserName == "admin") { permissions = new List() { GlobalConstant.AdminPerm }; diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index 34709e2..09785f1 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -130,7 +130,7 @@ $end - + diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 8b09e05..915aac3 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -44,7 +44,7 @@ namespace ZR.CodeGenerator string PKType = "int"; ReplaceDto replaceDto = new(); replaceDto.ModelTypeName = dto.GenTable.ClassName;//表名对应C# 实体类名 - replaceDto.PermissionPrefix = $"{dto.GenTable.ModuleName.ToLower()}:{dto.GenTable.ClassName.ToLower()}";//权限 + replaceDto.PermissionPrefix = dto.GenTable.PermissionPrefix; replaceDto.Author = dto.GenTable.FunctionAuthor; replaceDto.ShowBtnAdd = dto.GenTable.CheckedBtn.Any(f => f == 1); replaceDto.ShowBtnEdit = dto.GenTable.CheckedBtn.Any(f => f == 2); diff --git a/ZR.Common/Tools.cs b/ZR.Common/Tools.cs index 90d7a58..053802c 100644 --- a/ZR.Common/Tools.cs +++ b/ZR.Common/Tools.cs @@ -80,5 +80,38 @@ namespace ZR.Common return false; } } + + /// + /// 计算密码强度 + /// + /// 密码字符串 + /// + public static bool PasswordStrength(string password) + { + //空字符串强度值为0 + if (string.IsNullOrEmpty(password)) return false; + + //字符统计 + int iNum = 0, iLtt = 0, iSym = 0; + foreach (char c in password) + { + if (c >= '0' && c <= '9') iNum++; + else if (c >= 'a' && c <= 'z') iLtt++; + else if (c >= 'A' && c <= 'Z') iLtt++; + else iSym++; + } + + if (iLtt == 0 && iSym == 0) return false; //纯数字密码 + if (iNum == 0 && iLtt == 0) return false; //纯符号密码 + if (iNum == 0 && iSym == 0) return false; //纯字母密码 + + if (password.Length >= 6 && password.Length < 16) return true;//长度不大于6的密码 + + if (iLtt == 0) return true; //数字和符号构成的密码 + if (iSym == 0) return true; //数字和字母构成的密码 + if (iNum == 0) return true; //字母和符号构成的密码 + + return true; //由数字、字母、符号构成的密码 + } } } diff --git a/ZR.Model/System/Dto/GenTableDto.cs b/ZR.Model/System/Dto/GenTableDto.cs index a0fc883..c4137ae 100644 --- a/ZR.Model/System/Dto/GenTableDto.cs +++ b/ZR.Model/System/Dto/GenTableDto.cs @@ -21,6 +21,7 @@ namespace ZR.Model.System.Dto public string FunctionAuthor { get; set; } public string GenType { get; set; } public string GenPath { get; set; } + public string PermissionPrefix { get; set; } /// /// 额外参数 /// @@ -44,6 +45,7 @@ namespace ZR.Model.System.Dto /// 额外参数字符串 /// public string checkedBtn { get; set; } + public string permissionPrefix { get; set; } } public class GenTableColumnDto { diff --git a/ZR.Model/System/Dto/RegisterDto.cs b/ZR.Model/System/Dto/RegisterDto.cs new file mode 100644 index 0000000..36898f4 --- /dev/null +++ b/ZR.Model/System/Dto/RegisterDto.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Text; + +namespace ZR.Model.System.Dto +{ + public class RegisterDto + { + /// + /// 用户名 + /// + [Required(ErrorMessage = "用户名不能为空")] + public string Username { get; set; } + + /// + /// 用户密码 + /// + [Required(ErrorMessage = "密码不能为空")] + public string Password { get; set; } + [Required(ErrorMessage = "确认密码不能为空")] + public string ConfirmPassword { get; set; } + /** + * 验证码 + */ + public string Code { get; set; } + + /** + * 唯一标识 + */ + public string Uuid { get; set; } = ""; + } +} diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs index 1dfea22..a50f585 100644 --- a/ZR.Model/System/Generate/GenTable.cs +++ b/ZR.Model/System/Generate/GenTable.cs @@ -96,6 +96,8 @@ namespace ZR.Model.System.Generate [SqlSugar.SugarColumn(IsIgnore = true)] public object TreeParentCode { get; set; } + [SqlSugar.SugarColumn(IsIgnore = true)] + public string PermissionPrefix { get; set; } /// /// 生成的按钮功能 /// diff --git a/ZR.Service/System/CacheService.cs b/ZR.Service/System/CacheService.cs new file mode 100644 index 0000000..a18a0bd --- /dev/null +++ b/ZR.Service/System/CacheService.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Common; + +namespace ZR.Service.System +{ + public class CacheService + { + #region 用户权限 缓存 + public static List GetUserPerms(string key) + { + return (List)CacheHelper.GetCache(key); + } + + public static void SetUserPerms(string key, object data) + { + CacheHelper.SetCache(key, data); + } + public static void RemoveUserPerms(string key) + { + CacheHelper.Remove(key); + } + #endregion + } +} diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs index 40b3657..3a5afa0 100644 --- a/ZR.Service/System/GenTableService.cs +++ b/ZR.Service/System/GenTableService.cs @@ -45,7 +45,7 @@ namespace ZR.Service.System /// public int DeleteGenTableByTbName(string tableName) { - return GenTableRepository.Delete(f => f.TableName == tableName) ? 1: 0; + return GenTableRepository.Delete(f => f.TableName == tableName) ? 1 : 0; } /// @@ -83,16 +83,24 @@ namespace ZR.Service.System if (options == null) return; genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null; - + genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc"; genTable.SortField = options.GetValueOrDefault("sortField") ?? ""; genTable.TreeParentCode = options.GetValueOrDefault("treeParentCode") ?? ""; genTable.TreeName = options.GetValueOrDefault("treeName") ?? ""; genTable.TreeCode = options.GetValueOrDefault("treeCode") ?? ""; - + var checkdBtn = options.GetValueOrDefault("checkedBtn") ?? ""; genTable.CheckedBtn = Tools.SpitIntArrary(checkdBtn.ToString()); + + var permPrefix = options.GetValueOrDefault("permissionPrefix", ""); + + genTable.PermissionPrefix = permPrefix?.ToString(); + } + if (genTable.PermissionPrefix.IsEmpty()) + { + genTable.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限 } } @@ -102,7 +110,7 @@ namespace ZR.Service.System /// /// /// - public PagedInfo GetGenTables(GenTable genTable, Model.PagerInfo pagerInfo) + public PagedInfo GetGenTables(GenTable genTable, PagerInfo pagerInfo) { var predicate = Expressionable.Create(); predicate = predicate.AndIF(genTable.TableName.IfNotEmpty(), it => it.TableName.Contains(genTable.TableName)); @@ -165,7 +173,7 @@ namespace ZR.Service.System GenTableColumnService.Insert(insertColumns); List delColumns = tableColumns.FindAll(column => !dbTableColumneNames.Contains(column.ColumnName)); - if (delColumns!= null && delColumns.Count > 0) + if (delColumns != null && delColumns.Count > 0) { GenTableColumnService.Delete(delColumns.Select(f => f.ColumnId).ToList()); } diff --git a/ZR.Service/System/IService/ISysLoginService.cs b/ZR.Service/System/IService/ISysLoginService.cs index 5bd432f..3043962 100644 --- a/ZR.Service/System/IService/ISysLoginService.cs +++ b/ZR.Service/System/IService/ISysLoginService.cs @@ -9,6 +9,12 @@ namespace ZR.Service.System.IService { public interface ISysLoginService: IBaseService { + /// + /// 登录 + /// + /// + /// + /// public SysUser Login(LoginBodyDto loginBody, SysLogininfor logininfor); /// diff --git a/ZR.Service/System/IService/ISysUserService.cs b/ZR.Service/System/IService/ISysUserService.cs index 4c9d888..35848e5 100644 --- a/ZR.Service/System/IService/ISysUserService.cs +++ b/ZR.Service/System/IService/ISysUserService.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ZR.Model; +using ZR.Model; using ZR.Model.System; -using ZR.Repository; +using ZR.Model.System.Dto; namespace ZR.Service.System.IService { @@ -66,5 +61,12 @@ namespace ZR.Service.System.IService /// /// public int UpdatePhoto(SysUser user); + + /// + /// 注册 + /// + /// + /// + SysUser Register(RegisterDto dto); } } diff --git a/ZR.Service/System/SysUserService.cs b/ZR.Service/System/SysUserService.cs index eb69b9f..daa2202 100644 --- a/ZR.Service/System/SysUserService.cs +++ b/ZR.Service/System/SysUserService.cs @@ -1,10 +1,14 @@ +using Infrastructure; using Infrastructure.Attribute; +using System; using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text; +using ZR.Common; using ZR.Model; using ZR.Model.System; +using ZR.Model.System.Dto; using ZR.Repository.System; using ZR.Service.System.IService; @@ -156,5 +160,34 @@ namespace ZR.Service { return UserRepository.UpdatePhoto(user); } + + /// + /// 注册用户 + /// + /// + /// + public SysUser Register(RegisterDto dto) + { + //密码md5 + string password = NETCore.Encrypt.EncryptProvider.Md5(dto.Password); + if (!Tools.PasswordStrength(dto.Password)) + { + throw new CustomException("密码强度不符合要求"); + } + SysUser user = new() + { + Create_time = DateTime.Now, + UserName = dto.Username, + NickName = dto.Username, + Password = password, + Status = "0", + DeptId = 0, + Remark = "用户注册" + }; + + user.UserId = UserRepository.AddUser(user); + return user; + } + } } diff --git a/ZR.Vue/src/api/system/login.js b/ZR.Vue/src/api/system/login.js index 9adfb26..cd56aa7 100644 --- a/ZR.Vue/src/api/system/login.js +++ b/ZR.Vue/src/api/system/login.js @@ -9,9 +9,9 @@ export function login(username, password, code, uuid) { uuid } return request({ - url: '/login', - method: 'POST', - data: data, + url: '/login', + method: 'POST', + data: data, }) } @@ -26,8 +26,8 @@ export function getInfo() { // 退出方法 export function logout() { return request({ - url: '/LogOut', - method: 'POST' + url: '/LogOut', + method: 'POST' }) } @@ -38,3 +38,15 @@ export function getCodeImg() { method: 'get' }) } + +/** + * 注册 + * @returns + */ +export function register(data) { + return request({ + url: '/register', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/ZR.Vue/src/components/UploadImage/index.vue b/ZR.Vue/src/components/UploadImage/index.vue index 3317d27..9b38aac 100644 --- a/ZR.Vue/src/components/UploadImage/index.vue +++ b/ZR.Vue/src/components/UploadImage/index.vue @@ -34,7 +34,7 @@ export default { // 上传地址 uploadUrl: { type: String, - default: process.env.VUE_APP_UPLOAD_URL ?? '/Common/UploadFile' + default: process.env.VUE_APP_UPLOAD_URL }, // 文件类型, 例如['png', 'jpg', 'jpeg'] fileType: { diff --git a/ZR.Vue/src/router/index.js b/ZR.Vue/src/router/index.js index 09c040b..39422a0 100644 --- a/ZR.Vue/src/router/index.js +++ b/ZR.Vue/src/router/index.js @@ -38,6 +38,11 @@ export const constantRoutes = [{ path: '/login', component: (resolve) => require(['@/views/login'], resolve), hidden: true + }, + { + path: '/register', + component: (resolve) => require(['@/views/register'], resolve), + hidden: true }, { path: '/404', diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js index ee93a3e..7d96a04 100644 --- a/ZR.Vue/src/settings.js +++ b/ZR.Vue/src/settings.js @@ -2,7 +2,7 @@ module.exports = { /** * 框架版本号 */ - version: '3.7.8', + version: '3.8.0', title: 'ZrAdmin.NET-后台管理', /** * 主题颜色 @@ -47,5 +47,6 @@ module.exports = { * The default is only used in the production env * If you want to also use it in dev, you can pass ['production', 'development'] */ - errorLog: 'production' + errorLog: 'production', + copyRight: 'Copyright ©2022 izhaorui.cn All Rights Reserved.' } \ No newline at end of file diff --git a/ZR.Vue/src/store/modules/user.js b/ZR.Vue/src/store/modules/user.js index 32ed9ef..8923977 100644 --- a/ZR.Vue/src/store/modules/user.js +++ b/ZR.Vue/src/store/modules/user.js @@ -45,10 +45,13 @@ const user = { setToken(res.data) //提交上面的mutaions方法 commit('SET_TOKEN', res.data) - resolve()//then处理 + resolve() //then处理 } else { - reject(res)//catch处理 + console.log('login error ' + res); + reject(res) //catch处理 } + }).catch(err => { + reject(err); }) }) }, @@ -69,7 +72,7 @@ const user = { commit('SET_NAME', data.user.nickName) commit('SET_AVATAR', avatar) - commit('SET_USERINFO', data.user)//新加 + commit('SET_USERINFO', data.user) //新加 resolve(res) }).catch(error => { reject(error) @@ -79,10 +82,10 @@ const user = { // 退出系统 LogOut({ commit, state }) { - console.log('退出登录') + console.log('退出登录') return new Promise((resolve, reject) => { logout().then((res) => { - removeToken()// 必须先移除token + removeToken() // 必须先移除token commit('SET_TOKEN', '') commit('SET_ROLES', []) commit('SET_PERMISSIONS', []) @@ -104,4 +107,4 @@ const user = { } } -export default user +export default user \ No newline at end of file diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js index 0d18e3b..a4feaee 100644 --- a/ZR.Vue/src/utils/request.js +++ b/ZR.Vue/src/utils/request.js @@ -57,7 +57,7 @@ service.interceptors.response.use(res => { }) return Promise.reject('无效的会话，或者会话已过期，请重新登录。') - } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500 || code == 429) { + } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 103 || code == 403 || code == 500 || code == 429) { Message({ message: msg, type: 'error' diff --git a/ZR.Vue/src/utils/ruoyi.js b/ZR.Vue/src/utils/ruoyi.js index 206a468..3d570c2 100644 --- a/ZR.Vue/src/utils/ruoyi.js +++ b/ZR.Vue/src/utils/ruoyi.js @@ -135,10 +135,10 @@ export function showColumn(columns, value) { } // 通用下载方法 -export function download(fileName) { +export function download(url, fileName) { // window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; // window.open(baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true) - window.open(baseURL + fileName) + window.open(baseURL + url) } // 字符串格式化(%s ) diff --git a/ZR.Vue/src/views/login.vue b/ZR.Vue/src/views/login.vue index 890e416..f716be7 100644 --- a/ZR.Vue/src/views/login.vue +++ b/ZR.Vue/src/views/login.vue @@ -26,122 +26,126 @@ 登 录 登 录 中... +
+ 还没有账号？立即注册 +
diff --git a/ZR.Vue/src/views/system/user/index.vue b/ZR.Vue/src/views/system/user/index.vue index c5fcc82..c49e72e 100644 --- a/ZR.Vue/src/views/system/user/index.vue +++ b/ZR.Vue/src/views/system/user/index.vue @@ -279,7 +279,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "system/user/importData", + url: process.env.VUE_APP_BASE_API + "/system/user/importData", }, // 查询参数 queryParams: { diff --git a/ZR.Vue/src/views/system/user/profile/operLog.vue b/ZR.Vue/src/views/system/user/profile/operLog.vue index 1181d2d..1868f67 100644 --- a/ZR.Vue/src/views/system/user/profile/operLog.vue +++ b/ZR.Vue/src/views/system/user/profile/operLog.vue @@ -1,7 +1,7 @@ @@ -117,25 +117,25 @@ diff --git a/ZR.Vue/src/views/tool/gen/genInfoForm.vue b/ZR.Vue/src/views/tool/gen/genInfoForm.vue index e95184a..cee1e85 100644 --- a/ZR.Vue/src/views/tool/gen/genInfoForm.vue +++ b/ZR.Vue/src/views/tool/gen/genInfoForm.vue @@ -75,11 +75,7 @@ - - - 查询排序字段 - - + @@ -89,7 +85,17 @@ 倒序 - + + + + 权限前缀 + + + + + + + @@ -224,32 +230,32 @@ diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue index 7cd9614..db22125 100644 --- a/ZR.Vue/src/views/tool/gen/index.vue +++ b/ZR.Vue/src/views/tool/gen/index.vue @@ -68,29 +68,29 @@ import { listTable, delTable, previewTable, - synchDb, -} from "@/api/tool/gen"; -import importTable from "./importTable"; -import { Loading } from "element-ui"; -import hljs from "highlight.js"; -import "highlight.js/styles/idea.css"; //这里有多个样式，自己可以根据需要切换 + synchDb +} from '@/api/tool/gen' +import importTable from './importTable' +import { Loading } from 'element-ui' +import hljs from 'highlight.js' +import 'highlight.js/styles/idea.css' // 这里有多个样式，自己可以根据需要切换 export default { - name: "gen", + name: 'gen', components: { importTable, hljs }, data() { return { queryParams: { pageNum: 1, pageSize: 20, - tableName: "", + tableName: '' }, // 预览参数 preview: { open: false, - title: "代码预览", + title: '代码预览', data: {}, - activeName: "0", + activeName: '0' }, showGenerate: false, rules: {}, @@ -103,169 +103,169 @@ export default { currentSelected: {}, // 选中的列 checkedQueryColumn: [], - //是否覆盖原先代码 + // 是否覆盖原先代码 coverd: true, - // 生成SQL脚本的数据库类型 - dbType: 1, // 选中的表 tableIds: [], // 非多个禁用 - multiple: true, - }; + multiple: true + } }, created() { - this.handleSearch(); + this.handleSearch() }, methods: { /** * 点击查询 */ handleSearch() { - this.tableloading = true; + this.tableloading = true listTable(this.queryParams).then((res) => { - this.tableData = res.data.result; - this.total = res.data.totalNum; - this.tableloading = false; - }); + this.tableData = res.data.result + this.total = res.data.totalNum + this.tableloading = false + }) }, /** * 编辑表格 */ handleEditTable(row) { - this.queryParams.tableName = row.tableName; - this.handleSearch(); + this.queryParams.tableName = row.tableName + this.handleSearch() this.$router.push({ - path: "/gen/editTable", - query: { tableId: row.tableId }, - }); + path: '/gen/editTable', + query: { tableId: row.tableId } + }) }, // 代码预览 handlePreview(row) { - this.$refs["codeform"].validate((valid) => { + this.$refs['codeform'].validate((valid) => { if (!valid) { - this.msgError("请先完成表格"); - return; + this.msgError('请先完成表格') + return } + this.$modal.loading('请稍后...') previewTable(row.tableId).then((res) => { if (res.code === 200) { - this.showGenerate = false; - this.preview.open = true; - this.preview.data = res.data; + this.showGenerate = false + this.preview.open = true + this.preview.data = res.data + this.$modal.closeLoading() } - }); - }); + }) + }) }, /** * 点击生成服务端代码 */ handleGenTable(row) { - this.currentSelected = row; + this.currentSelected = row if (!this.currentSelected) { - this.msgError("请先选择要生成代码的数据表"); - return false; + this.msgError('请先选择要生成代码的数据表') + return false } - this.$refs["codeform"].validate((valid) => { + this.$refs['codeform'].validate((valid) => { if (valid) { var loadop = { lock: true, - text: "正在生成代码...", - spinner: "el-icon-loading", - background: "rgba(0, 0, 0, 0.7)", - }; - const pageLoading = Loading.service(loadop); + text: '正在生成代码...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + } + const pageLoading = Loading.service(loadop) var seachdata = { tableId: this.currentSelected.tableId, - tableName: this.currentSelected.name, + tableName: this.currentSelected.name // queryColumn: this.checkedQueryColumn, - }; + } codeGenerator(seachdata) .then((res) => { - const { data } = res; - this.showGenerate = false; - if (row.genType === "1") { - this.msgSuccess("成功生成到自定义路径：" + row.genPath); + const { data } = res + this.showGenerate = false + if (row.genType === '1') { + this.msgSuccess('成功生成到自定义路径') } else { - this.msgSuccess("恭喜你，代码生成完成！"); - this.download(data.path); + this.msgSuccess('恭喜你，代码生成完成！') + this.download(data.path) } - pageLoading.close(); + pageLoading.close() }) .catch((erre) => { - pageLoading.close(); - }); + pageLoading.close() + }) } else { - return false; + return false } - }); + }) }, cancel() { - this.showGenerate = false; - this.currentSelected = {}; + this.showGenerate = false + this.currentSelected = {} }, /** 重置按钮操作 */ resetQuery() { - this.resetForm("queryParams"); - this.handleSearch(); + this.resetForm('queryParams') + this.handleSearch() }, /** 打开导入表弹窗 */ openImportTable() { - this.$refs.import.show(); + this.$refs.import.show() }, handleDelete(row) { - const tableIds = row.tableId || this.tableIds; - this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + const tableIds = row.tableId || this.tableIds + this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' }) .then(() => { delTable(tableIds.toString()).then((res) => { if (res.code == 200) { - this.msgSuccess("删除成功"); + this.msgSuccess('删除成功') - this.handleSearch(); + this.handleSearch() } - }); + }) }) .catch(() => { this.$message({ - type: "info", - message: "已取消删除", - }); - }); + type: 'info', + message: '已取消删除' + }) + }) }, /** 复制代码成功 */ clipboardSuccess() { - this.msgSuccess("复制成功"); + this.msgSuccess('复制成功') }, // 多选框选中数据 handleSelectionChange(section) { - this.tableIds = section.map((item) => item.tableId); - this.multiple = !section.length; - console.log(this.tableIds); + this.tableIds = section.map((item) => item.tableId) + this.multiple = !section.length + console.log(this.tableIds) }, /** 高亮显示 */ highlightedCode(code, key) { // var language = key.substring(key.lastIndexOf(".") , key.length) - const result = hljs.highlightAuto(code || ""); - return result.value || " "; + const result = hljs.highlightAuto(code || '') + return result.value || ' ' }, // 同步代码 handleSynchDb(row) { - const tableName = row.tableName; + const tableName = row.tableName this.$confirm('确认要强制同步"' + tableName + '"表结构吗？') - .then(function () { - return synchDb(row.tableId, { tableName, dbName: row.dbName }); + .then(function() { + return synchDb(row.tableId, { tableName, dbName: row.dbName }) }) .then(() => { - this.msgSuccess("同步成功"); + this.msgSuccess('同步成功') }) - .catch(() => {}); - }, - }, -}; + .catch(() => {}) + } + } +} diff --git a/ZR.Vue3/.editorconfig b/ZR.Vue3/.editorconfig new file mode 100644 index 0000000..7034f9b --- /dev/null +++ b/ZR.Vue3/.editorconfig @@ -0,0 +1,22 @@ +# 告诉EditorConfig插件，这是根文件，不用继续往上查找 +root = true + +# 匹配全部文件 +[*] +# 设置字符集 +charset = utf-8 +# 缩进风格，可选space、tab +indent_style = space +# 缩进的空格数 +indent_size = 2 +# 结尾换行符，可选lf、cr、crlf +end_of_line = lf +# 在文件结尾插入新行 +insert_final_newline = true +# 删除一行中的前后空格 +trim_trailing_whitespace = true + +# 匹配md结尾的文件 +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/ZR.Vue3/.env.development b/ZR.Vue3/.env.development new file mode 100644 index 0000000..68ab4bc --- /dev/null +++ b/ZR.Vue3/.env.development @@ -0,0 +1,14 @@ +# 开发环境配置 +ENV = 'development' + +# 页面标题 +VITE_APP_TITLE = 'ZRAdmin.NET后台管理' + +# 开发环境 +VITE_APP_BASE_API = '/dev-api' + +# 路由前缀 +VITE_APP_ROUTER_PREFIX = '/' + +# 默认上传地址 +VITE_APP_UPLOAD_URL = '/Common/UploadFile' \ No newline at end of file diff --git a/ZR.Vue3/.env.production b/ZR.Vue3/.env.production new file mode 100644 index 0000000..4e0e082 --- /dev/null +++ b/ZR.Vue3/.env.production @@ -0,0 +1,14 @@ +# 生产环境配置 +ENV = 'production' + +# 页面标题 +VITE_APP_TITLE = 'ZRAdmin.NET后台管理' + +# 生产环境 +VITE_APP_BASE_API = '/prod-api' + +# 路由前缀 +VITE_APP_ROUTER_PREFIX = '/' + +# 默认上传地址 +VITE_APP_UPLOAD_URL = '/Common/UploadFile' diff --git a/ZR.Vue3/.env.staging b/ZR.Vue3/.env.staging new file mode 100644 index 0000000..29d4dc2 --- /dev/null +++ b/ZR.Vue3/.env.staging @@ -0,0 +1,17 @@ +# 测试环境配置 +ENV = 'staging' + +# 页面标题 +VITE_APP_TITLE = 'ZRAdmin.NET后台管理' + +# 测试环境 +VITE_APP_BASE_API = '/stage-api' + +# 路由前缀 +VITE_APP_ROUTER_PREFIX = '/' + +# 默认上传地址 +VITE_APP_UPLOAD_URL = '/Common/UploadFile' + +# 是否在打包时开启压缩，支持 gzip 和 brotli +VITE_BUILD_COMPRESS = gzip \ No newline at end of file diff --git a/ZR.Vue3/.gitignore b/ZR.Vue3/.gitignore new file mode 100644 index 0000000..78a752d --- /dev/null +++ b/ZR.Vue3/.gitignore @@ -0,0 +1,23 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/ZR.Vue3/.jsbeautifyrc b/ZR.Vue3/.jsbeautifyrc new file mode 100644 index 0000000..d79fae6 --- /dev/null +++ b/ZR.Vue3/.jsbeautifyrc @@ -0,0 +1,12 @@ +{ + "brace_style": "none,preserve-inline", + "indent_size": 2, + "indent_char": " ", + "jslint_happy": true, + "unformatted": [ + "" + ], + "css": { + "indent_size": 2 + } +} \ No newline at end of file diff --git a/ZR.Vue3/.prettierrc b/ZR.Vue3/.prettierrc new file mode 100644 index 0000000..c3481a7 --- /dev/null +++ b/ZR.Vue3/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "semi": false +} \ No newline at end of file diff --git a/ZR.Vue3/LICENSE b/ZR.Vue3/LICENSE new file mode 100644 index 0000000..c9d9dc2 --- /dev/null +++ b/ZR.Vue3/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 791736813@qq.com zr + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/ZR.Vue3/README.md b/ZR.Vue3/README.md new file mode 100644 index 0000000..3cce63f --- /dev/null +++ b/ZR.Vue3/README.md @@ -0,0 +1,89 @@ +

ZRAdmin.NET后台管理系统

+ +

+ + +

+ +## 🍟概述 +* 本项目适合有一定vue基础的开发人员 +* 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。 +* 配套后端代码仓库地址[ZRAdmin-Vue](https://gitee.com/izory/ZrAdminNetCore/) 版本。 +* 前端采用Vue3.0、Element UI Plus。 +* 支持加载动态权限菜单，多方式轻松权限控制 +* 七牛云通用云产品优惠券：[点我进入](https://s.qiniu.com/FzEfay)。 +* 腾讯云秒杀场：[点我进入](https://curl.qcloud.com/4yEoRquq)。 +* 腾讯云优惠券：[点我领取](https://curl.qcloud.com/5J4nag8D)。 + +``` +如果对您有帮助，您可以点右上角 “Star” 收藏一下 ，这样作者才有继续免费下去的动力，谢谢！~ +``` + +## 🍿在线体验 +- 官方文档：http://www.izhaorui.cn/doc +- 体验地址：http://www.izhaorui.cn/admin +- 管理员：admin +- 密 码：123456 + +``` +由于是个人项目，资金有限，体验服是低配，请大家爱惜，轻戳，不胜感激！！！ +``` +## 🍁前端运行 + +```bash +# 克隆项目 +git clone https://gitee.com/izory/ZrAdminNetCore + +# 进入项目目录 +cd ZR.vue3 + +# 安装依赖 +yarn --registry=https://registry.npm.taobao.org + +# 启动服务 +yarn dev + +# 构建测试环境 yarn build:stage +# 构建生产环境 yarn build:prod +# 前端访问地址 http://localhost:8887 +``` + + +## 🍖内置功能 + +1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 +2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现。 +3. 岗位管理：配置系统用户所属担任职务。 +4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 +5. 角色管理：角色菜单权限分配。 +6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 +6. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 +7. 登录日志：系统登录日志记录查询包含登录异常。 +8. 系统接口：使用swagger生成相关api接口文档。 +9. 参数设置：常用参数配置 + +## 计划 +- [ ] 服务监控 +- [ ] 代码生成 +- [ ] 文章管理 +- [ ] 任务系统 +- [ ] 控制台 + +## 🎉优势 + +1. 前台系统不用编写登录、授权、认证模块；只负责编写业务模块即可 +2. 后台系统无需任何二次开发，直接发布即可使用 +3. 前台与后台系统分离，分别为不同的系统（域名可独立） +4. 全局异常统一处理 +5. 自定义的代码生成功能 + +## 💐 特别鸣谢 +- 👉Ruoyi.vue：[Ruoyi](http://www.ruoyi.vip/) + +## 🎀捐赠 +如果这个项目对您有所帮助，请扫下方二维码就当打发要饭的吧。 + + +## 源码地址 +- [Gitee](https://gitee.com/izory/ZrAdminNetCore/) +- [Github](https://github.com/izhaorui/ZrAdmin.NET/) \ No newline at end of file diff --git a/ZR.Vue3/bat/build.bat b/ZR.Vue3/bat/build.bat new file mode 100644 index 0000000..ecbb454 --- /dev/null +++ b/ZR.Vue3/bat/build.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] Weḅdistļ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn build:prod + +pause \ No newline at end of file diff --git a/ZR.Vue3/bat/package.bat b/ZR.Vue3/bat/package.bat new file mode 100644 index 0000000..965883a --- /dev/null +++ b/ZR.Vue3/bat/package.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] װWeḅnode_modulesļ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn --registry=https://registry.npm.taobao.org + +pause \ No newline at end of file diff --git a/ZR.Vue3/bat/run-web.bat b/ZR.Vue3/bat/run-web.bat new file mode 100644 index 0000000..d2fe397 --- /dev/null +++ b/ZR.Vue3/bat/run-web.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] ʹ Vite Web ̡ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn dev + +pause \ No newline at end of file diff --git a/ZR.Vue3/html/ie.html b/ZR.Vue3/html/ie.html new file mode 100644 index 0000000..052ffcd --- /dev/null +++ b/ZR.Vue3/html/ie.html @@ -0,0 +1,46 @@ + + + + + + 请升级您的浏览器 + + + + + + +

请升级您的浏览器，以便我们更好的为您提供服务！

+

您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。

+
+

请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束

+

自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明 。

+
+

您可以选择更先进的浏览器

+

推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。

+ +
+ + \ No newline at end of file diff --git a/ZR.Vue3/index.html b/ZR.Vue3/index.html new file mode 100644 index 0000000..db62c6a --- /dev/null +++ b/ZR.Vue3/index.html @@ -0,0 +1,215 @@ + + + + + + + + + + ZRAdmin.NET管理系统 + + + + + +
+
+
+
+
+
正在加载系统资源，请耐心等待
+
+
+ + + + \ No newline at end of file diff --git a/ZR.Vue3/package.json b/ZR.Vue3/package.json new file mode 100644 index 0000000..5c1b976 --- /dev/null +++ b/ZR.Vue3/package.json @@ -0,0 +1,45 @@ +{ + "name": "zr", + "version": "1.0.0", + "description": "ZRAdmin.NET管理系统", + "author": "ZR", + "license": "MIT", + "scripts": { + "dev": "vite", + "build:prod": "vite build", + "build:stage": "vite build --mode staging", + "preview": "vite preview" + }, + "repository": { + "type": "git", + "url": "https://gitee.com/izory/ZrAdminNetCore" + }, + "dependencies": { + "@element-plus/icons-vue": "0.2.4", + "axios": "0.24.0", + "clipboard": "^2.0.10", + "echarts": "5.2.2", + "element-plus": "^2.1.8", + "file-saver": "2.0.5", + "fuse.js": "6.4.6", + "js-cookie": "3.0.1", + "jsencrypt": "3.2.1", + "mavon-editor": "^2.10.4", + "nprogress": "0.2.0", + "quill": "^1.3.7", + "vue": "3.2.26", + "vue-cropper": "1.0.2", + "vue-router": "4.0.12", + "vuex": "4.0.2" + }, + "devDependencies": { + "@vitejs/plugin-vue": "1.9.4", + "@vue/compiler-sfc": "3.2.22", + "sass": "1.45.0", + "unplugin-auto-import": "0.5.3", + "vite": "2.6.14", + "vite-plugin-compression": "0.3.6", + "vite-plugin-svg-icons": "1.0.5", + "vite-plugin-vue-setup-extend": "0.1.0" + } +} diff --git a/ZR.Vue3/public/favicon.ico b/ZR.Vue3/public/favicon.ico new file mode 100644 index 0000000..fcb6999 Binary files /dev/null and b/ZR.Vue3/public/favicon.ico differ diff --git a/ZR.Vue3/src/App.vue b/ZR.Vue3/src/App.vue new file mode 100644 index 0000000..98240ae --- /dev/null +++ b/ZR.Vue3/src/App.vue @@ -0,0 +1,3 @@ + diff --git a/ZR.Vue3/src/api/common.js b/ZR.Vue3/src/api/common.js new file mode 100644 index 0000000..c57228f --- /dev/null +++ b/ZR.Vue3/src/api/common.js @@ -0,0 +1,23 @@ +import request from '@/utils/request' + +export function upload(data) { + return request({ + url: '/common/UploadFile', + method: 'POST', + data: data, + headers: { "Content-Type": "multipart/form-data" }, + }) +} + +/** + * 发送邮件 + * @param {*} data + * @returns + */ +export function sendEmail(data) { + return request({ + url: '/common/SendEmail', + method: 'POST', + data: data, + }) +} diff --git a/ZR.Vue3/src/api/login.js b/ZR.Vue3/src/api/login.js new file mode 100644 index 0000000..6fd2f99 --- /dev/null +++ b/ZR.Vue3/src/api/login.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 登录方法 +export function login(username, password, code, uuid) { + const data = { + username, + password, + code, + uuid + } + return request({ + url: '/login', + method: 'POST', + data: data, + }) +} + +// 获取用户详细信息 +export function getInfo() { + return request({ + url: '/getInfo', + method: 'get' + }) +} + +// 退出方法 +export function logout() { + return request({ + url: '/LogOut', + method: 'POST' + }) +} + +// 获取验证码 +export function getCodeImg() { + return request({ + url: '/captchaImage', + method: 'get' + }) +} \ No newline at end of file diff --git a/ZR.Vue3/src/api/monitor/cache.js b/ZR.Vue3/src/api/monitor/cache.js new file mode 100644 index 0000000..59d3505 --- /dev/null +++ b/ZR.Vue3/src/api/monitor/cache.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 查询缓存详细 +export function getCache() { + return request({ + url: '/monitor/cache', + method: 'get' + }) +} diff --git a/ZR.Vue3/src/api/monitor/job.js b/ZR.Vue3/src/api/monitor/job.js new file mode 100644 index 0000000..09107ff --- /dev/null +++ b/ZR.Vue3/src/api/monitor/job.js @@ -0,0 +1,115 @@ +import request from '@/utils/request' + +export function queryTasks(data) { + return request({ + url: '/system/tasks/list', + method: 'get', + data + }) +} + +export function getTasks(id) { + return request({ + url: '/system/tasks/get?id=' + id, + method: 'get' + }) +} + +/** + * + * 获取所有任务 + * @returns + */ +export function getAllTasks() { + return request({ + url: '/system/tasks/getAll', + method: 'get' + }) +} + +/** + * 创建任务 + * @param {*} data + * @returns + */ +export function createTasks(data) { + return request({ + url: '/system/tasks/create', + method: 'post', + data + }) +} + +/** + * 更新任务 + * @param {*} data + * @returns + */ +export function updateTasks(data) { + return request({ + url: '/system/tasks/update', + method: 'post', + data + }) +} + +/** + * 删除任务 + * @param {*} id + * @returns + */ +export function deleteTasks(id) { + return request({ + url: '/system/tasks/delete?id=' + id, + method: 'delete' + }) +} + +/** + * 启动任务 + * @param {*} id + * @returns + */ +export function startTasks(id) { + return request({ + url: '/system/tasks/start?id=' + id, + method: 'get' + }) +} + +/** + * 停止任务 + * @param {*} id + * @returns + */ +export function stopTasks(id) { + return request({ + url: '/system/tasks/stop?id=' + id, + method: 'get' + }) +} + +/** + * 运行一次 + * @param {*} id + * @returns + */ +export function runTasks(id) { + return request({ + url: '/system/tasks/run?id=' + id, + method: 'get' + }) +} +/** + * 导出 + * @returns + */ +export function exportTasks() { + return request({ + url: '/system/tasks/export', + method: 'get' + }) +} + + +export default { queryTasks, getTasks, getAllTasks, createTasks, updateTasks, deleteTasks, startTasks, stopTasks, runTasks, exportTasks } diff --git a/ZR.Vue3/src/api/monitor/jobLog.js b/ZR.Vue3/src/api/monitor/jobLog.js new file mode 100644 index 0000000..be1fffd --- /dev/null +++ b/ZR.Vue3/src/api/monitor/jobLog.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 查询调度日志列表 +export function listJobLog(query) { + return request({ + url: '/monitor/jobLog/list', + method: 'get', + params: query + }) +} + +// 删除调度日志 +export function delJobLog(jobLogId) { + return request({ + url: '/monitor/jobLog/' + jobLogId, + method: 'delete' + }) +} + +// 清空调度日志 +export function cleanJobLog() { + return request({ + url: '/monitor/jobLog/clean', + method: 'delete' + }) +} + +// 导出调度日志 +export function exportJobLog(query) { + return request({ + url: '/monitor/jobLog/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ZR.Vue3/src/api/monitor/logininfor.js b/ZR.Vue3/src/api/monitor/logininfor.js new file mode 100644 index 0000000..7ff412d --- /dev/null +++ b/ZR.Vue3/src/api/monitor/logininfor.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 查询登录日志列表 +export function list(query) { + return request({ + url: '/monitor/logininfor/list', + method: 'get', + params: query + }) +} + +// 删除登录日志 +export function delLogininfor(infoId) { + return request({ + url: '/monitor/logininfor/' + infoId, + method: 'delete' + }) +} + +// 清空登录日志 +export function cleanLogininfor() { + return request({ + url: '/monitor/logininfor/clean', + method: 'delete' + }) +} + +// 导出登录日志 +export function exportLogininfor(query) { + return request({ + url: '/monitor/logininfor/export', + method: 'get', + params: query + }) +} diff --git a/ZR.Vue3/src/api/monitor/online.js b/ZR.Vue3/src/api/monitor/online.js new file mode 100644 index 0000000..bd22137 --- /dev/null +++ b/ZR.Vue3/src/api/monitor/online.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 查询在线用户列表 +export function list(query) { + return request({ + url: '/monitor/online/list', + method: 'get', + params: query + }) +} + +// 强退用户 +export function forceLogout(tokenId) { + return request({ + url: '/monitor/online/' + tokenId, + method: 'delete' + }) +} diff --git a/ZR.Vue3/src/api/monitor/operlog.js b/ZR.Vue3/src/api/monitor/operlog.js new file mode 100644 index 0000000..07e27ab --- /dev/null +++ b/ZR.Vue3/src/api/monitor/operlog.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 查询操作日志列表 +export function list(query) { + return request({ + url: '/monitor/operlog/list', + method: 'get', + params: query + }) +} + +// 删除操作日志 +export function delOperlog(operId) { + return request({ + url: '/monitor/operlog/' + operId, + method: 'delete' + }) +} + +// 清空操作日志 +export function cleanOperlog() { + return request({ + url: '/monitor/operlog/clean', + method: 'delete' + }) +} + +// 导出操作日志 +export function exportOperlog(query) { + return request({ + url: '/monitor/operlog/export', + method: 'get', + params: query + }) +} diff --git a/ZR.Vue3/src/api/monitor/server.js b/ZR.Vue3/src/api/monitor/server.js new file mode 100644 index 0000000..bdcc62b --- /dev/null +++ b/ZR.Vue3/src/api/monitor/server.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 查询服务器详细 +export function getServer() { + return request({ + url: '/monitor/server', + method: 'get' + }) +} diff --git a/ZR.Vue3/src/api/system/article.js b/ZR.Vue3/src/api/system/article.js new file mode 100644 index 0000000..05fb94d --- /dev/null +++ b/ZR.Vue3/src/api/system/article.js @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +// 查询列表 +export function listArticle(query) { + return request({ + url: '/Article/list', + method: 'get', + params: query + }) +} +// 查询最新列表 +export function listNewArticle(query) { + return request({ + url: '/Article/newList', + method: 'get', + params: query + }) +} + +// 查询详细 +export function getArticle(Id) { + return request({ + url: '/Article/' + Id, + method: 'get', + }) +} + +// 新增 +export function addArticle(data) { + return request({ + url: '/Article/add', + method: 'post', + data: data, + }) +} + +// 修改 +export function updateArticle(data) { + return request({ + url: '/Article/edit', + method: 'put', + data: data + }) +} + +// 删除菜单 +export function delArticle(id) { + return request({ + url: '/Article/' + id, + method: 'delete' + }) +} +// 查询菜单目录 +export function listArticleCategory() { + return request({ + url: '/Article/CategoryList', + method: 'get' + }) +} +// 查询菜单目录树 +export function listArticleCategoryTree(){ + return request({ + url: '/Article/CategoryTreeList', + menubar: 'get' + }) +} diff --git a/ZR.Vue3/src/api/system/config.js b/ZR.Vue3/src/api/system/config.js new file mode 100644 index 0000000..3633ba1 --- /dev/null +++ b/ZR.Vue3/src/api/system/config.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +// 查询参数列表 +export function listConfig(query) { + return request({ + url: '/system/config/list', + method: 'get', + params: query + }) +} + +// 查询参数详细 +export function getConfig(configId) { + return request({ + url: '/system/config/' + configId, + method: 'get' + }) +} + +// 根据参数键名查询参数值 +export function getConfigKey(configKey) { + return request({ + url: '/system/config/configKey/' + configKey, + method: 'get' + }) +} + +// 新增参数配置 +export function addConfig(data) { + return request({ + url: '/system/config', + method: 'post', + data: data + }) +} + +// 修改参数配置 +export function updateConfig(data) { + return request({ + url: '/system/config', + method: 'put', + data: data + }) +} + +// 删除参数配置 +export function delConfig(configId) { + return request({ + url: '/system/config/' + configId, + method: 'delete' + }) +} + +// 刷新参数缓存 +export function refreshCache() { + return request({ + url: '/system/config/refreshCache', + method: 'delete' + }) +} + +// 导出参数 +// export function exportConfig(query) { +// return request({ +// url: '/system/config/export', +// method: 'get', +// params: query +// }) +// } diff --git a/ZR.Vue3/src/api/system/dept.js b/ZR.Vue3/src/api/system/dept.js new file mode 100644 index 0000000..2804676 --- /dev/null +++ b/ZR.Vue3/src/api/system/dept.js @@ -0,0 +1,68 @@ +import request from '@/utils/request' + +// 查询部门列表 +export function listDept(query) { + return request({ + url: '/system/dept/list', + method: 'get', + params: query + }) +} + +// 查询部门列表（排除节点） +export function listDeptExcludeChild(deptId) { + return request({ + url: '/system/dept/list/exclude/' + deptId, + method: 'get' + }) +} + +// 查询部门详细 +export function getDept(deptId) { + return request({ + url: '/system/dept/' + deptId, + method: 'get' + }) +} + +// 查询部门下拉树结构 +export function treeselect() { + return request({ + url: '/system/dept/treeselect', + method: 'get' + }) +} + +// 根据角色ID查询部门树结构 +export function roleDeptTreeselect(roleId) { + return request({ + url: '/system/dept/roleDeptTreeselect/' + roleId, + method: 'get' + }) +} + +// 新增部门 +export function addDept(data) { + return request({ + url: '/system/dept', + method: 'post', + data: data + }) +} + +// 修改部门 +export function updateDept(data) { + return request({ + url: '/system/dept', + method: 'put', + data: data + }) +} + +// 删除部门 +export function delDept(deptId) { + return request({ + url: '/system/dept/' + deptId, + method: 'delete' + }) +} \ No newline at end of file diff --git a/ZR.Vue3/src/api/system/dict/data.js b/ZR.Vue3/src/api/system/dict/data.js new file mode 100644 index 0000000..0351dd6 --- /dev/null +++ b/ZR.Vue3/src/api/system/dict/data.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +// 查询字典数据列表 +export function listData(query) { + return request({ + url: '/system/dict/data/list', + method: 'get', + params: query + }) +} + +// 查询字典数据详细 +export function getData(dictCode) { + return request({ + url: '/system/dict/data/info/' + dictCode, + method: 'get' + }) +} + +// 根据字典类型查询字典数据信息 +export function getDicts(dictType) { + if (typeof (dictType) === "object") { + return request({ + url: '/system/dict/data/types', + data: dictType, + method: 'post' + }) + } else { + return request({ + url: '/system/dict/data/type/' + dictType, + method: 'get' + }) + } +} + +// 新增字典数据 +export function addData(data) { + return request({ + url: '/system/dict/data', + method: 'post', + data: data + }) +} + +// 修改字典数据 +export function updateData(data) { + return request({ + url: '/system/dict/data', + method: 'put', + data: data + }) +} + +// 删除字典数据 +export function delData(dictCode) { + return request({ + url: '/system/dict/data/' + dictCode, + method: 'delete' + }) +} + +// 导出字典数据 +export function exportData(query) { + return request({ + url: '/system/dict/data/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ZR.Vue3/src/api/system/dict/type.js b/ZR.Vue3/src/api/system/dict/type.js new file mode 100644 index 0000000..27ae18f --- /dev/null +++ b/ZR.Vue3/src/api/system/dict/type.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +// 查询字典类型列表 +export function listType(query) { + return request({ + url: '/system/dict/type/list', + method: 'get', + params: query + }) +} + +// 查询字典类型详细 +export function getType(dictId) { + return request({ + url: '/system/dict/type/' + dictId, + method: 'get' + }) +} + +// 新增字典类型 +export function addType(data) { + return request({ + url: '/system/dict/type/edit', + method: 'post', + data: data + }) +} + +// 修改字典类型 +export function updateType(data) { + return request({ + url: '/system/dict/type/edit', + method: 'put', + data: data + }) +} + +// 删除字典类型 +export function delType(dictId) { + return request({ + url: '/system/dict/type/' + dictId, + method: 'delete' + }) +} + +// 清理参数缓存 +export function clearCache() { + return request({ + url: '/system/dict/type/clearCache', + method: 'delete' + }) +} + +// 导出字典类型 +export function exportType(query) { + return request({ + url: '/system/dict/type/export', + method: 'get', + params: query + }) +} + +// 获取字典选择框列表 +export function optionselect() { + return request({ + url: '/system/dict/type/optionselect', + method: 'get' + }) +} diff --git a/ZR.Vue3/src/api/system/login.js b/ZR.Vue3/src/api/system/login.js new file mode 100644 index 0000000..9adfb26 --- /dev/null +++ b/ZR.Vue3/src/api/system/login.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 登录方法 +export function login(username, password, code, uuid) { + const data = { + username, + password, + code, + uuid + } + return request({ + url: '/login', + method: 'POST', + data: data, + }) +} + +// 获取用户详细信息 +export function getInfo() { + return request({ + url: '/getInfo', + method: 'get' + }) +} + +// 退出方法 +export function logout() { + return request({ + url: '/LogOut', + method: 'POST' + }) +} + +// 获取验证码 +export function getCodeImg() { + return request({ + url: '/captchaImage', + method: 'get' + }) +} diff --git a/ZR.Vue3/src/api/system/menu.js b/ZR.Vue3/src/api/system/menu.js new file mode 100644 index 0000000..124538b --- /dev/null +++ b/ZR.Vue3/src/api/system/menu.js @@ -0,0 +1,78 @@ +import request from '@/utils/request' + +// 查询菜单列表 +export function listMenu(query) { + return request({ + url: '/system/menu/list', + method: 'get', + params: query + }) +} + +// 查询菜单详细 +export function getMenu(menuId) { + return request({ + url: '/system/menu/' + menuId, + method: 'get', + }) +} + +// 查询菜单下拉树结构 +export function treeselect() { + return request({ + url: '/system/Menu/treeSelect', + method: 'get' + }) +} + +// 根据角色ID查询菜单下拉树结构 +export function roleMenuTreeselect(roleId) { + return request({ + url: '/system/menu/roleMenuTreeselect/' + roleId, + method: 'get', + }) +} + +// 新增菜单 +export const addMenu = (data) => { + return request({ + url: '/system/menu/add', + method: 'put', + data: data, + }) +} + +// 修改菜单 +export function updateMenu(data) { + return request({ + url: '/system/Menu/edit', + method: 'post', + data: data + }) +} + +// 删除菜单 +export function delMenu(menuId) { + return request({ + url: '/system/Menu/' + menuId, + method: 'delete' + }) +} + +//排序 +export function changeMenuSort(data) { + return request({ + url: '/system/Menu/ChangeSort', + method: 'post', + data: data + }) +} + +// 获取路由 +export const getRouters = (query) => { + return request({ + url: '/getRouters', + method: 'get', + params: query + }) +} diff --git a/ZR.Vue3/src/api/system/notice.js b/ZR.Vue3/src/api/system/notice.js new file mode 100644 index 0000000..fc80afb --- /dev/null +++ b/ZR.Vue3/src/api/system/notice.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' + +// 导航栏查询公告列表 +export function queryNotice(query) { + return request({ + url: '/system/notice/queryNotice', + method: 'get', + params: query + }) +} + +// 查询公告列表 +export function listNotice(query) { + return request({ + url: '/system/notice/list', + method: 'get', + params: query + }) +} + +// 查询公告详细 +export function getNotice(noticeId) { + return request({ + url: '/system/notice/' + noticeId, + method: 'get' + }) +} + +// 新增公告 +export function addNotice(data) { + return request({ + url: '/system/notice', + method: 'post', + data: data + }) +} + +// 修改公告 +export function updateNotice(data) { + return request({ + url: '/system/notice', + method: 'put', + data: data + }) +} + +// 删除公告 +export function delNotice(noticeId) { + return request({ + url: '/system/notice/' + noticeId, + method: 'delete' + }) +} + +// 发送通知公告 +export function sendNotice(noticeId) { + return request({ + url: '/system/notice/send/' + noticeId, + method: 'PUT' + }) +} \ No newline at end of file diff --git a/ZR.Vue3/src/api/system/post.js b/ZR.Vue3/src/api/system/post.js new file mode 100644 index 0000000..434cd35 --- /dev/null +++ b/ZR.Vue3/src/api/system/post.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询岗位列表 +export function listPost(query) { + return request({ + url: '/system/post/list', + method: 'get', + params: query + }) +} + +// 查询岗位详细 +export function getPost(postId) { + return request({ + url: '/system/post/' + postId, + method: 'get' + }) +} + +// 新增岗位 +export function addPost(data) { + return request({ + url: '/system/post', + method: 'post', + data: data + }) +} + +// 修改岗位 +export function updatePost(data) { + return request({ + url: '/system/post', + method: 'put', + data: data + }) +} + +// 删除岗位 +export function delPost(postId) { + return request({ + url: '/system/post/' + postId, + method: 'delete' + }) +} + +// 导出岗位 +export function exportPost(query) { + return request({ + url: '/system/post/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ZR.Vue3/src/api/system/role.js b/ZR.Vue3/src/api/system/role.js new file mode 100644 index 0000000..25b8d1e --- /dev/null +++ b/ZR.Vue3/src/api/system/role.js @@ -0,0 +1,75 @@ +import request from '@/utils/request' + +// 查询角色列表 +export function listRole(query) { + return request({ + url: '/system/role/list', + method: 'get', + params: query + }) +} + +// 查询角色详细 +export function getRole(roleId) { + return request({ + url: '/system/role/' + roleId, + method: 'get' + }) +} + +// 新增角色 +export const addRole = (data) => { + return request({ + url: '/system/role/edit', + method: 'post', + data: data, + }) +} + +// 修改角色 +export function updateRole(data) { + return request({ + url: '/system/role/edit', + method: 'put', + data: data + }) +} + +// 角色数据权限 +export function dataScope(data) { + return request({ + url: '/system/role/dataScope', + method: 'put', + data: data + }) +} + +// 角色状态修改 +export function changeRoleStatus(roleId, status) { + const data = { + roleId, + status + } + return request({ + url: '/system/role/changeStatus', + method: 'put', + data: data + }) +} + +// 删除角色 +export function delRole(roleId) { + return request({ + url: '/system/role/' + roleId, + method: 'delete' + }) +} + +// 导出角色 +export function exportRole(query) { + return request({ + url: '/system/role/export', + method: 'get', + params: query + }) +} diff --git a/ZR.Vue3/src/api/system/user.js b/ZR.Vue3/src/api/system/user.js new file mode 100644 index 0000000..0d3cf9b --- /dev/null +++ b/ZR.Vue3/src/api/system/user.js @@ -0,0 +1,128 @@ +import request from '@/utils/request' +import { praseStrZero } from "@/utils/ruoyi"; + +// 查询用户列表 +export function listUser(query) { + return request({ + url: '/system/user/list', + method: 'get', + params: query + }) +} + +// 查询用户详细 +export function getUser(userId) { + return request({ + url: '/system/user/' + praseStrZero(userId), + method: 'get' + }) +} + +// 新增用户 +export function addUser(data) { + return request({ + url: '/system/user/edit', + method: 'post', + data: data + }) +} + +// 修改用户 +export function updateUser(data) { + return request({ + url: '/system/user/edit', + method: 'put', + data: data + }) +} + +// 删除用户 +export function delUser(userId) { + return request({ + url: '/system/user/' + userId, + method: 'delete' + }) +} + +// 导出用户 +export function exportUser(query) { + return request({ + url: '/system/User/export', + method: 'get', + params: query + }) +} + +// 用户密码重置 +export function resetUserPwd(userId, password) { + const data = { + userId, + password + } + return request({ + url: '/system/user/resetPwd', + method: 'put', + data: data + }) +} + +// 用户状态修改 +export function changeUserStatus(userId, status) { + const data = { + userId, + status + } + return request({ + url: '/system/user/changeStatus', + method: 'put', + data: data + }) +} + +// 查询用户个人信息 +export function getUserProfile() { + return request({ + url: '/system/user/Profile', + method: 'get' + }) +} + +// 修改用户个人信息 +export function updateUserProfile(data) { + return request({ + url: '/system/user/profile', + method: 'put', + data: data + }) +} + +// 用户密码重置 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword + } + return request({ + url: '/system/user/profile/updatePwd', + method: 'put', + params: data + }) +} + +// 用户头像上传 +export function uploadAvatar(data) { + return request({ + url: '/system/user/profile/avatar', + method: 'post', + data: data + }) +} + +// 下载用户导入模板 +export function importTemplate() { + return request({ + url: '/system/user/importTemplate', + method: 'get', + responseType: 'blob'//1.首先设置responseType对象格式为 blob: + }) +} diff --git a/ZR.Vue3/src/api/system/userRoles.js b/ZR.Vue3/src/api/system/userRoles.js new file mode 100644 index 0000000..d5d94b3 --- /dev/null +++ b/ZR.Vue3/src/api/system/userRoles.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 查询角色用户 +export function getRoleUsers(query) { + return request({ + url: '/system/userRole/list', + method: 'get', + params: query, + }) +} + +// 添加角色用户 +export function createRoleUsers(data) { + return request({ + url: '/system/userRole/create', + method: 'post', + data + }) +} +// 删除角色用户 +export function deleteRoleUsers(data) { + return request({ + url: '/system/userRole/delete', + method: 'post', + data + }) +} +// 查询角色未添加用户列表 +export function getExcludeUsers(query) { + return request({ + url: '/system/userRole/getExcludeUsers', + method: 'get', + params: query, + }) +} + +// export default { getRoleUsers, getExcludeUsers } diff --git a/ZR.Vue3/src/api/tool/file.js b/ZR.Vue3/src/api/tool/file.js new file mode 100644 index 0000000..03b64a8 --- /dev/null +++ b/ZR.Vue3/src/api/tool/file.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +/** +* 文件存储分页查询 +* @param {查询条件} data +*/ +export function listSysfile(query) { + return request({ + url: 'tool/file/list', + method: 'get', + params: query, + }) +} + +/** +* 新增文件存储 +* @param data +*/ +export function addSysfile(data) { + return request({ + url: 'tool/file', + method: 'post', + data: data, + }) +} + +/** +* 修改文件存储 +* @param data +*/ +export function updateSysfile(data) { + return request({ + url: 'tool/file', + method: 'PUT', + data: data, + }) +} + +/** +* 获取文件存储详情 +* @param {Id} +*/ +export function getSysfile(id) { + return request({ + url: 'tool/file/' + id, + method: 'get' + }) +} + +/** +* 删除文件存储 +* @param {主键} pid +*/ +export function delSysfile(pid) { + return request({ + url: 'tool/file/' + pid, + method: 'delete' + }) +} + +// 导出文件存储 +export function exportSysfile(query) { + return request({ + url: 'tool/file/export', + method: 'get', + params: query + }) +} + diff --git a/ZR.Vue3/src/api/tool/gen.js b/ZR.Vue3/src/api/tool/gen.js new file mode 100644 index 0000000..b28fe8e --- /dev/null +++ b/ZR.Vue3/src/api/tool/gen.js @@ -0,0 +1,103 @@ +import request from '@/utils/request'; + +/** + * 获取数据库 + */ +export function codeGetDBList() { + return request({ + url: 'tool/gen/getDbList', + method: 'get', + }) +} +/** + * 获取数据库表 + */ +export function listDbTable(data) { + return request({ + url: 'tool/gen/getTableList', + method: 'get', + params: data, + }) +} +/** + * 生成代码 + */ +export async function codeGenerator(data) { + return await request({ + url: 'tool/gen/genCode', + method: 'POST', + data: data, + }) +} + +/** + * 获取表格列信息 + * @param {*} data + * @returns + */ +export function queryColumnInfo(tableId) { + return request({ + url: 'tool/gen/Column/' + tableId, + method: 'GET', + }) +} + +// 查询生成表数据 +export function listTable(params) { + return request({ + url: 'tool/gen/list', + method: 'get', + params: params + }) +} + +// 查询表详细信息 +export function getGenTable(tableId) { + return request({ + url: '/tool/gen/' + tableId, + method: 'get' + }) +} + +// 导入表 +export function importTable(data) { + return request({ + url: '/tool/gen/importTable', + method: 'post', + params: data + }) +} +// 删除表数据 +export function delTable(tableId) { + return request({ + url: '/tool/gen/' + tableId, + method: 'delete' + }) +} + +// 修改代码生成表信息 +export function updateGenTable(data) { + return request({ + url: '/tool/gen/', + method: 'put', + data: data + }) +} + +// 预览生成代码 +export function previewTable(tableId) { + return request({ + url: '/tool/gen/preview/' + tableId, + method: 'post', + // data: data + }) +} + +// 同步数据库 +export function synchDb(tableId, data) { + return request({ + url: '/tool/gen/synchDb/' + tableId, + method: 'get', + params: data + }) +} \ No newline at end of file diff --git a/ZR.Vue3/src/assets/401_images/401.gif b/ZR.Vue3/src/assets/401_images/401.gif new file mode 100644 index 0000000..cd6e0d9 Binary files /dev/null and b/ZR.Vue3/src/assets/401_images/401.gif differ diff --git a/ZR.Vue3/src/assets/404_images/404.png b/ZR.Vue3/src/assets/404_images/404.png new file mode 100644 index 0000000..3d8e230 Binary files /dev/null and b/ZR.Vue3/src/assets/404_images/404.png differ diff --git a/ZR.Vue3/src/assets/404_images/404_cloud.png b/ZR.Vue3/src/assets/404_images/404_cloud.png new file mode 100644 index 0000000..c6281d0 Binary files /dev/null and b/ZR.Vue3/src/assets/404_images/404_cloud.png differ diff --git a/ZR.Vue3/src/assets/icons/svg/404.svg b/ZR.Vue3/src/assets/icons/svg/404.svg new file mode 100644 index 0000000..6df5019 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/404.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/Steve-Jobs.svg b/ZR.Vue3/src/assets/icons/svg/Steve-Jobs.svg new file mode 100644 index 0000000..53843e2 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/Steve-Jobs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/alipay.svg b/ZR.Vue3/src/assets/icons/svg/alipay.svg new file mode 100644 index 0000000..9138981 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/alipay.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/anq.svg b/ZR.Vue3/src/assets/icons/svg/anq.svg new file mode 100644 index 0000000..a466608 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/anq.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/app.svg b/ZR.Vue3/src/assets/icons/svg/app.svg new file mode 100644 index 0000000..0796da3 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/app.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/backup.svg b/ZR.Vue3/src/assets/icons/svg/backup.svg new file mode 100644 index 0000000..a3272a4 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/backup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/bug.svg b/ZR.Vue3/src/assets/icons/svg/bug.svg new file mode 100644 index 0000000..05a150d --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/bug.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/build.svg b/ZR.Vue3/src/assets/icons/svg/build.svg new file mode 100644 index 0000000..97c4688 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/build.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/button.svg b/ZR.Vue3/src/assets/icons/svg/button.svg new file mode 100644 index 0000000..904fddc --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/button.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/cascader.svg b/ZR.Vue3/src/assets/icons/svg/cascader.svg new file mode 100644 index 0000000..e256024 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/cascader.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/chain.svg b/ZR.Vue3/src/assets/icons/svg/chain.svg new file mode 100644 index 0000000..ed3317f --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/chain.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/chart.svg b/ZR.Vue3/src/assets/icons/svg/chart.svg new file mode 100644 index 0000000..27728fb --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/chart.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/checkbox.svg b/ZR.Vue3/src/assets/icons/svg/checkbox.svg new file mode 100644 index 0000000..013fd3a --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/checkbox.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/clipboard.svg b/ZR.Vue3/src/assets/icons/svg/clipboard.svg new file mode 100644 index 0000000..90923ff --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/clipboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/code.svg b/ZR.Vue3/src/assets/icons/svg/code.svg new file mode 100644 index 0000000..ed4d23c --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/codeConsole.svg b/ZR.Vue3/src/assets/icons/svg/codeConsole.svg new file mode 100644 index 0000000..672ec6e --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/codeConsole.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/color.svg b/ZR.Vue3/src/assets/icons/svg/color.svg new file mode 100644 index 0000000..44a81aa --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/color.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/component.svg b/ZR.Vue3/src/assets/icons/svg/component.svg new file mode 100644 index 0000000..29c3458 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/component.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/dashboard.svg b/ZR.Vue3/src/assets/icons/svg/dashboard.svg new file mode 100644 index 0000000..5317d37 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/database.svg b/ZR.Vue3/src/assets/icons/svg/database.svg new file mode 100644 index 0000000..7fbad9b --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/database.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/date-range.svg b/ZR.Vue3/src/assets/icons/svg/date-range.svg new file mode 100644 index 0000000..fda571e --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/date-range.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/date.svg b/ZR.Vue3/src/assets/icons/svg/date.svg new file mode 100644 index 0000000..52dc73e --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/date.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/deploy.svg b/ZR.Vue3/src/assets/icons/svg/deploy.svg new file mode 100644 index 0000000..f4a1c56 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/deploy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/dept.svg b/ZR.Vue3/src/assets/icons/svg/dept.svg new file mode 100644 index 0000000..894e4bf --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/dept.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/develop.svg b/ZR.Vue3/src/assets/icons/svg/develop.svg new file mode 100644 index 0000000..e189223 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/develop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/dict.svg b/ZR.Vue3/src/assets/icons/svg/dict.svg new file mode 100644 index 0000000..4849377 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/dict.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/dictionary.svg b/ZR.Vue3/src/assets/icons/svg/dictionary.svg new file mode 100644 index 0000000..6e83c43 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/dictionary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/doc.svg b/ZR.Vue3/src/assets/icons/svg/doc.svg new file mode 100644 index 0000000..9160de8 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/doc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/documentation.svg b/ZR.Vue3/src/assets/icons/svg/documentation.svg new file mode 100644 index 0000000..7043122 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/documentation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/download.svg b/ZR.Vue3/src/assets/icons/svg/download.svg new file mode 100644 index 0000000..c896951 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/drag.svg b/ZR.Vue3/src/assets/icons/svg/drag.svg new file mode 100644 index 0000000..4185d3c --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/drag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/druid.svg b/ZR.Vue3/src/assets/icons/svg/druid.svg new file mode 100644 index 0000000..a2b4b4e --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/druid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/edit.svg b/ZR.Vue3/src/assets/icons/svg/edit.svg new file mode 100644 index 0000000..d26101f --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/edit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/education.svg b/ZR.Vue3/src/assets/icons/svg/education.svg new file mode 100644 index 0000000..7bfb01d --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/education.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/email.svg b/ZR.Vue3/src/assets/icons/svg/email.svg new file mode 100644 index 0000000..74d25e2 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/email.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/error.svg b/ZR.Vue3/src/assets/icons/svg/error.svg new file mode 100644 index 0000000..fd935da --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/example.svg b/ZR.Vue3/src/assets/icons/svg/example.svg new file mode 100644 index 0000000..46f42b5 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/example.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/excel.svg b/ZR.Vue3/src/assets/icons/svg/excel.svg new file mode 100644 index 0000000..74d97b8 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/excel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/exit-fullscreen.svg b/ZR.Vue3/src/assets/icons/svg/exit-fullscreen.svg new file mode 100644 index 0000000..485c128 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/exit-fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/eye-open.svg b/ZR.Vue3/src/assets/icons/svg/eye-open.svg new file mode 100644 index 0000000..88dcc98 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/eye-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/eye.svg b/ZR.Vue3/src/assets/icons/svg/eye.svg new file mode 100644 index 0000000..16ed2d8 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/form.svg b/ZR.Vue3/src/assets/icons/svg/form.svg new file mode 100644 index 0000000..dcbaa18 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/fullscreen.svg b/ZR.Vue3/src/assets/icons/svg/fullscreen.svg new file mode 100644 index 0000000..0e86b6f --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/fwb.svg b/ZR.Vue3/src/assets/icons/svg/fwb.svg new file mode 100644 index 0000000..59933fc --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/fwb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/github.svg b/ZR.Vue3/src/assets/icons/svg/github.svg new file mode 100644 index 0000000..db0a0d4 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/gonggao.svg b/ZR.Vue3/src/assets/icons/svg/gonggao.svg new file mode 100644 index 0000000..22aed08 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/gonggao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/guide.svg b/ZR.Vue3/src/assets/icons/svg/guide.svg new file mode 100644 index 0000000..b271001 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/guide.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/icon.svg b/ZR.Vue3/src/assets/icons/svg/icon.svg new file mode 100644 index 0000000..82be8ee --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/icon1.svg b/ZR.Vue3/src/assets/icons/svg/icon1.svg new file mode 100644 index 0000000..82fbdd9 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/icon1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/image.svg b/ZR.Vue3/src/assets/icons/svg/image.svg new file mode 100644 index 0000000..16d572f --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/image.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/index.svg b/ZR.Vue3/src/assets/icons/svg/index.svg new file mode 100644 index 0000000..fdb3826 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/index.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/input.svg b/ZR.Vue3/src/assets/icons/svg/input.svg new file mode 100644 index 0000000..ab91381 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/input.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/international.svg b/ZR.Vue3/src/assets/icons/svg/international.svg new file mode 100644 index 0000000..e9b56ee --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/international.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/ipvisits.svg b/ZR.Vue3/src/assets/icons/svg/ipvisits.svg new file mode 100644 index 0000000..4ca473d --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/ipvisits.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/java.svg b/ZR.Vue3/src/assets/icons/svg/java.svg new file mode 100644 index 0000000..e2effbb --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/java.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/job.svg b/ZR.Vue3/src/assets/icons/svg/job.svg new file mode 100644 index 0000000..2a93a25 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/job.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/language.svg b/ZR.Vue3/src/assets/icons/svg/language.svg new file mode 100644 index 0000000..0082b57 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/language.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/link.svg b/ZR.Vue3/src/assets/icons/svg/link.svg new file mode 100644 index 0000000..48197ba --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/list.svg b/ZR.Vue3/src/assets/icons/svg/list.svg new file mode 100644 index 0000000..20259ed --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/lock.svg b/ZR.Vue3/src/assets/icons/svg/lock.svg new file mode 100644 index 0000000..74fee54 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/lock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/log.svg b/ZR.Vue3/src/assets/icons/svg/log.svg new file mode 100644 index 0000000..d879d33 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/log.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/login.svg b/ZR.Vue3/src/assets/icons/svg/login.svg new file mode 100644 index 0000000..cc5a854 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/login.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/logininfor.svg b/ZR.Vue3/src/assets/icons/svg/logininfor.svg new file mode 100644 index 0000000..267f844 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/logininfor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/markdown.svg b/ZR.Vue3/src/assets/icons/svg/markdown.svg new file mode 100644 index 0000000..7cd6747 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/markdown.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/menu.svg b/ZR.Vue3/src/assets/icons/svg/menu.svg new file mode 100644 index 0000000..e4360a0 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/message.svg b/ZR.Vue3/src/assets/icons/svg/message.svg new file mode 100644 index 0000000..14ca817 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/message.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/mnt.svg b/ZR.Vue3/src/assets/icons/svg/mnt.svg new file mode 100644 index 0000000..502a7c0 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/mnt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/money.svg b/ZR.Vue3/src/assets/icons/svg/money.svg new file mode 100644 index 0000000..c1580de --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/money.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/monitor.svg b/ZR.Vue3/src/assets/icons/svg/monitor.svg new file mode 100644 index 0000000..bc308cb --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/monitor.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/nested.svg b/ZR.Vue3/src/assets/icons/svg/nested.svg new file mode 100644 index 0000000..06713a8 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/number.svg b/ZR.Vue3/src/assets/icons/svg/number.svg new file mode 100644 index 0000000..ad5ce9a --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/number.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/online.svg b/ZR.Vue3/src/assets/icons/svg/online.svg new file mode 100644 index 0000000..330a202 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/online.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/password.svg b/ZR.Vue3/src/assets/icons/svg/password.svg new file mode 100644 index 0000000..6c64def --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/pdf.svg b/ZR.Vue3/src/assets/icons/svg/pdf.svg new file mode 100644 index 0000000..957aa0c --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/people.svg b/ZR.Vue3/src/assets/icons/svg/people.svg new file mode 100644 index 0000000..2bd54ae --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/peoples.svg b/ZR.Vue3/src/assets/icons/svg/peoples.svg new file mode 100644 index 0000000..aab852e --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/peoples.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/permission.svg b/ZR.Vue3/src/assets/icons/svg/permission.svg new file mode 100644 index 0000000..c4c7409 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/permission.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/phone.svg b/ZR.Vue3/src/assets/icons/svg/phone.svg new file mode 100644 index 0000000..ab8e8c4 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/phone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/post.svg b/ZR.Vue3/src/assets/icons/svg/post.svg new file mode 100644 index 0000000..2922c61 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/post.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/qiniu.svg b/ZR.Vue3/src/assets/icons/svg/qiniu.svg new file mode 100644 index 0000000..c2f9f8b --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/qiniu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/qq.svg b/ZR.Vue3/src/assets/icons/svg/qq.svg new file mode 100644 index 0000000..ee13d4e --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/qq.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/question.svg b/ZR.Vue3/src/assets/icons/svg/question.svg new file mode 100644 index 0000000..cf75bd4 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/question.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/radio.svg b/ZR.Vue3/src/assets/icons/svg/radio.svg new file mode 100644 index 0000000..0cde345 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/radio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/rate.svg b/ZR.Vue3/src/assets/icons/svg/rate.svg new file mode 100644 index 0000000..aa3b14d --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/rate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/redis.svg b/ZR.Vue3/src/assets/icons/svg/redis.svg new file mode 100644 index 0000000..2f1d62d --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/redis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/role.svg b/ZR.Vue3/src/assets/icons/svg/role.svg new file mode 100644 index 0000000..76cb18f --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/role.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/row.svg b/ZR.Vue3/src/assets/icons/svg/row.svg new file mode 100644 index 0000000..0780992 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/row.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/search.svg b/ZR.Vue3/src/assets/icons/svg/search.svg new file mode 100644 index 0000000..84233dd --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/select.svg b/ZR.Vue3/src/assets/icons/svg/select.svg new file mode 100644 index 0000000..d628382 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/select.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/server.svg b/ZR.Vue3/src/assets/icons/svg/server.svg new file mode 100644 index 0000000..ca37b00 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/server.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/shopping.svg b/ZR.Vue3/src/assets/icons/svg/shopping.svg new file mode 100644 index 0000000..87513e7 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/shopping.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/size.svg b/ZR.Vue3/src/assets/icons/svg/size.svg new file mode 100644 index 0000000..ddb25b8 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/size.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/skill.svg b/ZR.Vue3/src/assets/icons/svg/skill.svg new file mode 100644 index 0000000..a3b7312 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/skill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/slider.svg b/ZR.Vue3/src/assets/icons/svg/slider.svg new file mode 100644 index 0000000..fbe4f39 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/slider.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/source.svg b/ZR.Vue3/src/assets/icons/svg/source.svg new file mode 100644 index 0000000..1c3a038 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/source.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/sqlMonitor.svg b/ZR.Vue3/src/assets/icons/svg/sqlMonitor.svg new file mode 100644 index 0000000..950a430 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/sqlMonitor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/star.svg b/ZR.Vue3/src/assets/icons/svg/star.svg new file mode 100644 index 0000000..6cf86e6 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/swagger.svg b/ZR.Vue3/src/assets/icons/svg/swagger.svg new file mode 100644 index 0000000..05d4e7b --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/swagger.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/switch.svg b/ZR.Vue3/src/assets/icons/svg/switch.svg new file mode 100644 index 0000000..0ba61e3 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/switch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/sys-tools.svg b/ZR.Vue3/src/assets/icons/svg/sys-tools.svg new file mode 100644 index 0000000..324aa04 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/sys-tools.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/system.svg b/ZR.Vue3/src/assets/icons/svg/system.svg new file mode 100644 index 0000000..dba28cf --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/system.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/system1.svg b/ZR.Vue3/src/assets/icons/svg/system1.svg new file mode 100644 index 0000000..37b0a0a --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/system1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/tab.svg b/ZR.Vue3/src/assets/icons/svg/tab.svg new file mode 100644 index 0000000..b4b48e4 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/table.svg b/ZR.Vue3/src/assets/icons/svg/table.svg new file mode 100644 index 0000000..0e3dc9d --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/textarea.svg b/ZR.Vue3/src/assets/icons/svg/textarea.svg new file mode 100644 index 0000000..2709f29 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/textarea.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/theme.svg b/ZR.Vue3/src/assets/icons/svg/theme.svg new file mode 100644 index 0000000..5982a2f --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/theme.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/time-range.svg b/ZR.Vue3/src/assets/icons/svg/time-range.svg new file mode 100644 index 0000000..13c1202 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/time-range.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/time.svg b/ZR.Vue3/src/assets/icons/svg/time.svg new file mode 100644 index 0000000..b376e32 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/time.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/tool.svg b/ZR.Vue3/src/assets/icons/svg/tool.svg new file mode 100644 index 0000000..c813067 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/tool.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/tools.svg b/ZR.Vue3/src/assets/icons/svg/tools.svg new file mode 100644 index 0000000..aba1a40 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/tools.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/tree-table.svg b/ZR.Vue3/src/assets/icons/svg/tree-table.svg new file mode 100644 index 0000000..8aafdb8 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/tree-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/tree.svg b/ZR.Vue3/src/assets/icons/svg/tree.svg new file mode 100644 index 0000000..dd4b7dd --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/unlock.svg b/ZR.Vue3/src/assets/icons/svg/unlock.svg new file mode 100644 index 0000000..1219e41 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/unlock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/upload.svg b/ZR.Vue3/src/assets/icons/svg/upload.svg new file mode 100644 index 0000000..bae49c0 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/upload.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/user.svg b/ZR.Vue3/src/assets/icons/svg/user.svg new file mode 100644 index 0000000..0ba0716 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/validCode.svg b/ZR.Vue3/src/assets/icons/svg/validCode.svg new file mode 100644 index 0000000..cfb1021 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/validCode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/visits.svg b/ZR.Vue3/src/assets/icons/svg/visits.svg new file mode 100644 index 0000000..8425662 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/visits.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/web.svg b/ZR.Vue3/src/assets/icons/svg/web.svg new file mode 100644 index 0000000..9c57415 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/web.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/wechat.svg b/ZR.Vue3/src/assets/icons/svg/wechat.svg new file mode 100644 index 0000000..c586e55 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/wechat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/weixin.svg b/ZR.Vue3/src/assets/icons/svg/weixin.svg new file mode 100644 index 0000000..8dbcfa5 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/weixin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/zip.svg b/ZR.Vue3/src/assets/icons/svg/zip.svg new file mode 100644 index 0000000..f806fc4 --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/zip.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/icons/svg/zujian.svg b/ZR.Vue3/src/assets/icons/svg/zujian.svg new file mode 100644 index 0000000..2aba32f --- /dev/null +++ b/ZR.Vue3/src/assets/icons/svg/zujian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/images/dark.svg b/ZR.Vue3/src/assets/images/dark.svg new file mode 100644 index 0000000..f646bd7 --- /dev/null +++ b/ZR.Vue3/src/assets/images/dark.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/images/light.svg b/ZR.Vue3/src/assets/images/light.svg new file mode 100644 index 0000000..ab7cc08 --- /dev/null +++ b/ZR.Vue3/src/assets/images/light.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/assets/images/login-background.jpg b/ZR.Vue3/src/assets/images/login-background.jpg new file mode 100644 index 0000000..3066bd1 Binary files /dev/null and b/ZR.Vue3/src/assets/images/login-background.jpg differ diff --git a/ZR.Vue3/src/assets/images/profile.jpg b/ZR.Vue3/src/assets/images/profile.jpg new file mode 100644 index 0000000..997732a Binary files /dev/null and b/ZR.Vue3/src/assets/images/profile.jpg differ diff --git a/ZR.Vue3/src/assets/images/reward.jpg b/ZR.Vue3/src/assets/images/reward.jpg new file mode 100644 index 0000000..68fe0d3 Binary files /dev/null and b/ZR.Vue3/src/assets/images/reward.jpg differ diff --git a/ZR.Vue3/src/assets/logo/logo.png b/ZR.Vue3/src/assets/logo/logo.png new file mode 100644 index 0000000..9838306 Binary files /dev/null and b/ZR.Vue3/src/assets/logo/logo.png differ diff --git a/ZR.Vue3/src/assets/styles/btn.scss b/ZR.Vue3/src/assets/styles/btn.scss new file mode 100644 index 0000000..3590d8d --- /dev/null +++ b/ZR.Vue3/src/assets/styles/btn.scss @@ -0,0 +1,99 @@ +@import './variables.module.scss'; + +@mixin colorBtn($color) { + background: $color; + + &:hover { + color: $color; + + &:before, + &:after { + background: $color; + } + } +} + +.blue-btn { + @include colorBtn($blue) +} + +.light-blue-btn { + @include colorBtn($light-blue) +} + +.red-btn { + @include colorBtn($red) +} + +.pink-btn { + @include colorBtn($pink) +} + +.green-btn { + @include colorBtn($green) +} + +.tiffany-btn { + @include colorBtn($tiffany) +} + +.yellow-btn { + @include colorBtn($yellow) +} + +.pan-btn { + font-size: 14px; + color: #fff; + padding: 14px 36px; + border-radius: 8px; + border: none; + outline: none; + transition: 600ms ease all; + position: relative; + display: inline-block; + + &:hover { + background: #fff; + + &:before, + &:after { + width: 100%; + transition: 600ms ease all; + } + } + + &:before, + &:after { + content: ''; + position: absolute; + top: 0; + right: 0; + height: 2px; + width: 0; + transition: 400ms ease all; + } + + &::after { + right: inherit; + top: inherit; + left: 0; + bottom: 0; + } +} + +.custom-button { + display: inline-block; + line-height: 1; + white-space: nowrap; + cursor: pointer; + background: #fff; + color: #fff; + -webkit-appearance: none; + text-align: center; + box-sizing: border-box; + outline: 0; + margin: 0; + padding: 10px 15px; + font-size: 14px; + border-radius: 4px; +} diff --git a/ZR.Vue3/src/assets/styles/element-ui.scss b/ZR.Vue3/src/assets/styles/element-ui.scss new file mode 100644 index 0000000..a0db303 --- /dev/null +++ b/ZR.Vue3/src/assets/styles/element-ui.scss @@ -0,0 +1,144 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +// .el-upload { +// input[type="file"] { +// display: none !important; +// } +// } + +.el-upload__input { + display: none; +} + +.cell { + .el-tag { + margin-right: 0px; + } +} + +.small-padding { + .cell { + padding-left: 5px; + padding-right: 5px; + } +} + +.fixed-width { + .el-button--mini { + padding: 7px 10px; + width: 60px; + } +} + +.status-col { + .cell { + padding: 0 10px; + text-align: center; + + .el-tag { + margin-right: 0px; + } + } +} + +// to fixed https://github.com/ElemeFE/element/issues/2461 +// .el-dialog { +// transform: none; +// left: 0; +// position: relative; +// margin: 0 auto; +// } + +// refine element ui upload +// .upload-container { +// .el-upload { +// width: 100%; + +// .el-upload-dragger { +// width: 100%; +// height: 200px; +// } +// } +// } + +// dropdown +// .el-dropdown-menu { +// a { +// display: block +// } +// } + +// fix date-picker ui bug in filter-item +// .el-range-editor.el-input__inner { +// display: inline-flex !important; +// } + +// to fix el-date-picker css style +// .el-range-separator { +// box-sizing: content-box; +// } + +// .el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow { +// display: none; +// } + +// .el-dropdown .el-dropdown-link { +// color: var(--el-color-primary) !important; +// } + + +// element ui 移动端组件适配 +.el-icon { + vertical-align: middle; +} + +@media screen and (max-width: 500px) { + .el-message { + min-width: 300px !important; + } +} + +@media screen and (max-width: 500px) { + .el-message-box { + width: 300px !important; + } + + .el-pagination__jump { + display: none !important; + } + + .el-pagination__sizes { + display: none !important; + } +} + +// dialog +@media screen and (max-width: 500px) { + .el-dialog__wrapper .el-dialog { + width: 95% !important; + } +} + +/** 表格更多操作下拉样式 */ +.el-table .el-dropdown-link { + cursor: pointer; + color: #409EFF; + margin-left: 5px; +} + +.el-table .el-dropdown, +.el-icon-arrow-down { + font-size: 12px; +} + +//适配完毕 + +// 隐藏picture-card 上传按钮 +.hide .el-upload--picture-card { + display: none; +} \ No newline at end of file diff --git a/ZR.Vue3/src/assets/styles/index.scss b/ZR.Vue3/src/assets/styles/index.scss new file mode 100644 index 0000000..909811c --- /dev/null +++ b/ZR.Vue3/src/assets/styles/index.scss @@ -0,0 +1,265 @@ +@import './variables.module.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; +@import './btn.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +.no-padding { + padding: 0 !important; +} + +.padding-content { + padding: 4px 0; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.fr { + float: right; +} + +.fl { + float: left; +} + +.pr-5 { + padding-right: 5px; +} + +.pl-5 { + padding-left: 5px; +} + +.block { + display: block; +} + +.pointer { + cursor: pointer; +} + +.inlineBlock { + display: block; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +//main-container全局样式 +.app-container { + padding: 20px; +} + +.text-center { + text-align: center +} + +.link-type, +.link-type:focus { + color: #337ab7; + cursor: pointer; + + &:hover { + color: rgb(32, 160, 255); + } +} + +/** 基础通用 **/ +.pt5 { + padding-top: 5px; +} + +.pr5 { + padding-right: 5px; +} + +.pb5 { + padding-bottom: 5px; +} + +.mt5 { + margin-top: 5px; +} + +.mr5 { + margin-right: 5px; +} + +.mb5 { + margin-bottom: 5px; +} + +.mb8 { + margin-bottom: 8px; +} + +.ml5 { + margin-left: 5px; +} + +.mt10 { + margin-top: 10px; +} + +.mr10 { + margin-right: 10px; +} + +.mb10 { + margin-bottom: 10px; +} + +.ml10 { + margin-left: 10px; +} + +.mt20 { + margin-top: 20px; +} + +.mr20 { + margin-right: 20px; +} + +.mb20 { + margin-bottom: 20px; +} + +.ml20 { + margin-left: 20px; +} + +.ml { + margin-left: auto; +} + +.mr { + margin-right: auto; +} + +.mt { + margin-top: auto; +} + +.mb { + margin-bottom: auto; +} + +.el-dialog:not(.is-fullscreen) { + margin-top: 6vh !important; +} + +.pull-right { + float: right !important; +} + +/* text color */ +.text-navy { + color: #1ab394; +} + +.text-primary { + color: inherit; +} + +.text-success { + color: #1c84c6; +} + +.text-info { + color: #23c6c8; +} + +.text-warning { + color: #f8ac59; +} + +.text-danger { + color: #ed5565; +} + +.text-muted { + color: #888888; +} +.text-orange { + color: orangered; +} + +.text-hotpink { + color: hotpink; +} +.text-green { + color: green; +} +.text-greenyellow { + color: greenyellow; +} +/* image */ +.img-circle { + border-radius: 50%; +} + +.card-box { + padding-right: 15px; + padding-left: 15px; + margin-bottom: 10px; +} + +.icon { + width: 100px; +} + +.table-td-thumb { + width: 56px; +} diff --git a/ZR.Vue3/src/assets/styles/mixin.scss b/ZR.Vue3/src/assets/styles/mixin.scss new file mode 100644 index 0000000..06fa061 --- /dev/null +++ b/ZR.Vue3/src/assets/styles/mixin.scss @@ -0,0 +1,66 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} + +@mixin pct($pct) { + width: #{$pct}; + position: relative; + margin: 0 auto; +} + +@mixin triangle($width, $height, $color, $direction) { + $width: $width/2; + $color-border-style: $height solid $color; + $transparent-border-style: $width solid transparent; + height: 0; + width: 0; + + @if $direction==up { + border-bottom: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } + + @else if $direction==right { + border-left: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } + + @else if $direction==down { + border-top: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } + + @else if $direction==left { + border-right: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } +} diff --git a/ZR.Vue3/src/assets/styles/sidebar.scss b/ZR.Vue3/src/assets/styles/sidebar.scss new file mode 100644 index 0000000..365646a --- /dev/null +++ b/ZR.Vue3/src/assets/styles/sidebar.scss @@ -0,0 +1,235 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $base-sidebar-width; + position: relative; + } + + // 改动2022年3月31日 + .el-menu-item .el-menu-tooltip__trigger { + // padding: 0 !important; + // justify-content: space-around; + + // .svg-icon { + // margin-right: 0 !important; + // } + } + + .sidebar-container { + -webkit-transition: width .28s; + transition: width 0.28s; + width: $base-sidebar-width !important; + background-color: $base-menu-background; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + // 有改动 + -webkit-box-shadow: 2px 0 14px rgba(0, 21, 41, .10); + box-shadow: 2px 0 14px rgba(0, 21, 41, .10); + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + .el-menu-item, + .el-submenu__title { + overflow: hidden !important; + text-overflow: ellipsis !important; + white-space: nowrap !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + & .theme-dark .is-active>.el-submenu__title { + color: $base-menu-color-active !important; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $base-sidebar-width !important; + + &:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + & .theme-dark .nest-menu .el-submenu>.el-submenu__title, + & .theme-dark .el-submenu .el-menu-item { + background-color: $base-sub-menu-background !important; + + &:hover { + background-color: $base-sub-menu-hover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $base-sidebar-width !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $base-sidebar-width !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$base-sidebar-width, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } + } \ No newline at end of file diff --git a/ZR.Vue3/src/assets/styles/transition.scss b/ZR.Vue3/src/assets/styles/transition.scss new file mode 100644 index 0000000..4cb27cc --- /dev/null +++ b/ZR.Vue3/src/assets/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/ZR.Vue3/src/assets/styles/variables.module.scss b/ZR.Vue3/src/assets/styles/variables.module.scss new file mode 100644 index 0000000..3dbfaa7 --- /dev/null +++ b/ZR.Vue3/src/assets/styles/variables.module.scss @@ -0,0 +1,65 @@ +// base color +$blue: #324157; +$light-blue: #3A71A8; +$red: #C03639; +$pink: #E65D6E; +$green: #30B08F; +$tiffany: #4AB7BD; +$yellow: #FEC171; +$panGreen: #30B08F; + +// 默认菜单主题风格 +$base-menu-color: #bfcbd9; +$base-menu-color-active: #f4f4f5; +$base-menu-background: #304156; +$base-logo-title-color: #ffffff; + +$base-menu-light-color: rgba(0, 0, 0, 0.7); +$base-menu-light-background: #ffffff; +$base-logo-light-title-color: #001529; + +$base-sub-menu-background: #1f2d3d; +$base-sub-menu-hover: #001528; + +// 自定义暗色菜单风格 +/** +$base-menu-color:hsla(0,0%,100%,.65); +$base-menu-color-active:#fff; +$base-menu-background:#001529; +$base-logo-title-color: #ffffff; + +$base-menu-light-color:rgba(0,0,0,.70); +$base-menu-light-background:#ffffff; +$base-logo-light-title-color: #001529; + +$base-sub-menu-background:#000c17; +$base-sub-menu-hover:#001528; +*/ + +$--color-primary: #409EFF; +$--color-success: #67C23A; +$--color-warning: #E6A23C; +$--color-danger: #F56C6C; +$--color-info: #909399; + +$base-sidebar-width: 200px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuColor: $base-menu-color; + menuLightColor: $base-menu-light-color; + menuColorActive: $base-menu-color-active; + menuBackground: $base-menu-background; + menuLightBackground: $base-menu-light-background; + subMenuBackground: $base-sub-menu-background; + subMenuHover: $base-sub-menu-hover; + sideBarWidth: $base-sidebar-width; + logoTitleColor: $base-logo-title-color; + logoLightTitleColor: $base-logo-light-title-color; + primaryColor: $--color-primary; + successColor: $--color-success; + dangerColor: $--color-danger; + infoColor: $--color-info; + warningColor: $--color-warning; +} diff --git a/ZR.Vue3/src/components/Breadcrumb/index.vue b/ZR.Vue3/src/components/Breadcrumb/index.vue new file mode 100644 index 0000000..489cba1 --- /dev/null +++ b/ZR.Vue3/src/components/Breadcrumb/index.vue @@ -0,0 +1,66 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/DictTag/index.vue b/ZR.Vue3/src/components/DictTag/index.vue new file mode 100644 index 0000000..c812079 --- /dev/null +++ b/ZR.Vue3/src/components/DictTag/index.vue @@ -0,0 +1,41 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/Editor/index.vue b/ZR.Vue3/src/components/Editor/index.vue new file mode 100644 index 0000000..723db42 --- /dev/null +++ b/ZR.Vue3/src/components/Editor/index.vue @@ -0,0 +1,198 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/FileUpload/index.vue b/ZR.Vue3/src/components/FileUpload/index.vue new file mode 100644 index 0000000..3b9b581 --- /dev/null +++ b/ZR.Vue3/src/components/FileUpload/index.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/ZR.Vue3/src/components/Hamburger/index.vue b/ZR.Vue3/src/components/Hamburger/index.vue new file mode 100644 index 0000000..18c201e --- /dev/null +++ b/ZR.Vue3/src/components/Hamburger/index.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/ZR.Vue3/src/components/HeaderSearch/index.vue b/ZR.Vue3/src/components/HeaderSearch/index.vue new file mode 100644 index 0000000..182adb5 --- /dev/null +++ b/ZR.Vue3/src/components/HeaderSearch/index.vue @@ -0,0 +1,180 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/IconSelect/index.vue b/ZR.Vue3/src/components/IconSelect/index.vue new file mode 100644 index 0000000..bca47e0 --- /dev/null +++ b/ZR.Vue3/src/components/IconSelect/index.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/IconSelect/requireIcons.js b/ZR.Vue3/src/components/IconSelect/requireIcons.js new file mode 100644 index 0000000..ac22fd7 --- /dev/null +++ b/ZR.Vue3/src/components/IconSelect/requireIcons.js @@ -0,0 +1,8 @@ +let icons = [] +const modules = import.meta.glob('./../../assets/icons/svg/*.svg'); +for (const path in modules) { + const p = path.split('assets/icons/svg/')[1].split('.svg')[0]; + icons.push(p); +} + +export default icons \ No newline at end of file diff --git a/ZR.Vue3/src/components/ImagePreview/index.vue b/ZR.Vue3/src/components/ImagePreview/index.vue new file mode 100644 index 0000000..30fd088 --- /dev/null +++ b/ZR.Vue3/src/components/ImagePreview/index.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/ZR.Vue3/src/components/ImageUpload/index.vue b/ZR.Vue3/src/components/ImageUpload/index.vue new file mode 100644 index 0000000..706de3d --- /dev/null +++ b/ZR.Vue3/src/components/ImageUpload/index.vue @@ -0,0 +1,190 @@ + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/Pagination/index.vue b/ZR.Vue3/src/components/Pagination/index.vue new file mode 100644 index 0000000..1377b19 --- /dev/null +++ b/ZR.Vue3/src/components/Pagination/index.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/ParentView/index.vue b/ZR.Vue3/src/components/ParentView/index.vue new file mode 100644 index 0000000..7bf6148 --- /dev/null +++ b/ZR.Vue3/src/components/ParentView/index.vue @@ -0,0 +1,3 @@ + diff --git a/ZR.Vue3/src/components/RightToolbar/index.vue b/ZR.Vue3/src/components/RightToolbar/index.vue new file mode 100644 index 0000000..8825591 --- /dev/null +++ b/ZR.Vue3/src/components/RightToolbar/index.vue @@ -0,0 +1,88 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/Screenfull/index.vue b/ZR.Vue3/src/components/Screenfull/index.vue new file mode 100644 index 0000000..7ad28ea --- /dev/null +++ b/ZR.Vue3/src/components/Screenfull/index.vue @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/SizeSelect/index.vue b/ZR.Vue3/src/components/SizeSelect/index.vue new file mode 100644 index 0000000..d7f13cb --- /dev/null +++ b/ZR.Vue3/src/components/SizeSelect/index.vue @@ -0,0 +1,57 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/SvgIcon/index.vue b/ZR.Vue3/src/components/SvgIcon/index.vue new file mode 100644 index 0000000..bb66d79 --- /dev/null +++ b/ZR.Vue3/src/components/SvgIcon/index.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/ZR.Vue3/src/components/SvgIcon/svgicon.js b/ZR.Vue3/src/components/SvgIcon/svgicon.js new file mode 100644 index 0000000..4431719 --- /dev/null +++ b/ZR.Vue3/src/components/SvgIcon/svgicon.js @@ -0,0 +1,10 @@ +import * as components from '@element-plus/icons-vue' + +export default { + install: (app) => { + for (const key in components) { + const componentConfig = components[key]; + app.component(componentConfig.name, componentConfig); + } + }, +}; diff --git a/ZR.Vue3/src/components/TopNav/index.vue b/ZR.Vue3/src/components/TopNav/index.vue new file mode 100644 index 0000000..510179d --- /dev/null +++ b/ZR.Vue3/src/components/TopNav/index.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/ZR.Vue3/src/components/TreeSelect/index.vue b/ZR.Vue3/src/components/TreeSelect/index.vue new file mode 100644 index 0000000..3baed21 --- /dev/null +++ b/ZR.Vue3/src/components/TreeSelect/index.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/Zr/Doc/index.vue b/ZR.Vue3/src/components/Zr/Doc/index.vue new file mode 100644 index 0000000..662b734 --- /dev/null +++ b/ZR.Vue3/src/components/Zr/Doc/index.vue @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/Zr/Git/index.vue b/ZR.Vue3/src/components/Zr/Git/index.vue new file mode 100644 index 0000000..c9a4e36 --- /dev/null +++ b/ZR.Vue3/src/components/Zr/Git/index.vue @@ -0,0 +1,20 @@ + + \ No newline at end of file diff --git a/ZR.Vue3/src/components/iFrame/index.vue b/ZR.Vue3/src/components/iFrame/index.vue new file mode 100644 index 0000000..091b1a2 --- /dev/null +++ b/ZR.Vue3/src/components/iFrame/index.vue @@ -0,0 +1,31 @@ +