diff --git a/20220330_Vote/Ewide.Core/Const/ClaimConst.cs b/20220330_Vote/Ewide.Core/Const/ClaimConst.cs index 09c802d..aad63c8 100644 --- a/20220330_Vote/Ewide.Core/Const/ClaimConst.cs +++ b/20220330_Vote/Ewide.Core/Const/ClaimConst.cs @@ -1,4 +1,6 @@ -namespace Ewide.Core +using System; + +namespace Ewide.Core { public class ClaimConst { @@ -21,6 +23,10 @@ /// 是否超级管理 /// public const string CLAINM_SUPERADMIN = "SuperAdmin"; + /// + /// 过期时间 + /// + public const string ExpireTime = ""; } } diff --git a/20220330_Vote/Ewide.Core/Ewide.Core.xml b/20220330_Vote/Ewide.Core/Ewide.Core.xml index 1016818..7d9b44d 100644 --- a/20220330_Vote/Ewide.Core/Ewide.Core.xml +++ b/20220330_Vote/Ewide.Core/Ewide.Core.xml @@ -489,6 +489,11 @@ 是否超级管理 + + + 过期时间 + + 默认密码 diff --git a/20220330_Vote/Ewide.Core/Extension/PageExtensions.cs b/20220330_Vote/Ewide.Core/Extension/PageExtensions.cs index e84f1af..a7d27e6 100644 --- a/20220330_Vote/Ewide.Core/Extension/PageExtensions.cs +++ b/20220330_Vote/Ewide.Core/Extension/PageExtensions.cs @@ -115,19 +115,19 @@ namespace Ewide.Core.Extension return filter; } - public static Task> ToPageData(this IQueryable source, PageInputBase input) where T : new() + public static async Task> ToPageData(this IQueryable source, PageInputBase input) where T : new() { - return source.OrderBy(OrderBuilder(input)).ToPagedListAsync(input.PageIndex, input.PageSize); + return await source.OrderBy(OrderBuilder(input)).ToPagedListAsync(input.PageIndex, input.PageSize); } - public static Task> ToPageData(this IQueryable source, PageInputBase input) where O : new() + public static async Task> ToPageData(this IQueryable source, PageInputBase input) where O : new() { - return source.OrderBy(OrderBuilder(input)).Select(u => u.Adapt()).ToPagedListAsync(input.PageIndex, input.PageSize); + return await source.OrderBy(OrderBuilder(input)).Select(u => u.Adapt()).ToPagedListAsync(input.PageIndex, input.PageSize); } - public static Task> ToPageData(this IQueryable source, PageInputBase input, TypeAdapterConfig config) where O : new() + public static async Task> ToPageData(this IQueryable source, PageInputBase input, TypeAdapterConfig config) where O : new() { - return source.OrderBy(OrderBuilder(input)).Select(u => u.Adapt(config)).ToPagedListAsync(input.PageIndex, input.PageSize); + return await source.OrderBy(OrderBuilder(input)).Select(u => u.Adapt(config)).ToPagedListAsync(input.PageIndex, input.PageSize); } #region DAPPER @@ -212,7 +212,7 @@ namespace Ewide.Core.Extension return count; } - private static string PageSqlBuilder(string sql , PageInputBase input) + private static string PageSqlBuilder(string sql, PageInputBase input) { var sqlStrList = new List(); var orderStr = OrderBuilder(input); diff --git a/20220330_Vote/Ewide.Core/Manager/IUserManager.cs b/20220330_Vote/Ewide.Core/Manager/IUserManager.cs index e213bf9..e7f8485 100644 --- a/20220330_Vote/Ewide.Core/Manager/IUserManager.cs +++ b/20220330_Vote/Ewide.Core/Manager/IUserManager.cs @@ -11,6 +11,7 @@ namespace Ewide.Core bool SuperAdmin { get; } SysUser User { get; } string UserId { get; } + bool IsExpire { get; } Task CheckUserAsync(string userId); Task CheckUserAsync(); diff --git a/20220330_Vote/Ewide.Core/Manager/UserManager.cs b/20220330_Vote/Ewide.Core/Manager/UserManager.cs index 902b7f8..68762de 100644 --- a/20220330_Vote/Ewide.Core/Manager/UserManager.cs +++ b/20220330_Vote/Ewide.Core/Manager/UserManager.cs @@ -51,7 +51,23 @@ namespace Ewide.Core { get => _httpContextAccessor.HttpContext.User.FindFirst(ClaimConst.CLAINM_SUPERADMIN)?.Value == ((int)AdminType.SuperAdmin).ToString(); } - + public bool IsExpire + { + get + { + var _extime = _httpContextAccessor.HttpContext.User.FindFirst(ClaimConst.ExpireTime)?.Value; + if (string.IsNullOrWhiteSpace(_extime)) + return true; + else + { + var extime = Convert.ToDateTime(_extime); + if (extime > DateTime.Now) + return false; + else + return true; + } + } + } public SysUser User { get => _sysUserRep.Find(UserId); @@ -220,9 +236,9 @@ namespace Ewide.Core .Select(u => u.SysOrgId).ToListAsync(); } - public Task> GetUserExtraAreaScopeList() + public async Task> GetUserExtraAreaScopeList() { - return GetUserExtraAreaScopeList(UserId); + return await GetUserExtraAreaScopeList(UserId); } public async Task> GetUserExtraAreaScopeList(string userId) @@ -230,14 +246,14 @@ namespace Ewide.Core return await _sysUserAreaRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.AreaCode).ToListAsync(); } - public Task> GetRoleExtraDataScopeList(string roleId) + public async Task> GetRoleExtraDataScopeList(string roleId) { - return _sysRoleDataRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.SysOrgId).ToListAsync(); + return await _sysRoleDataRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.SysOrgId).ToListAsync(); } - public Task> GetRoleExtraAreaScopeList(string roleId) + public async Task> GetRoleExtraAreaScopeList(string roleId) { - return _sysRoleAreaRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.AreaCode).ToListAsync(); + return await _sysRoleAreaRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.AreaCode).ToListAsync(); } public Task> GetUserAllDataScopeList() { @@ -361,15 +377,15 @@ namespace Ewide.Core var areaCode = await GetCachedAreaCode(); if (roleDataTypeList.Any(r => r == (int)DataScopeType.ALL)) { - return areaCode.Select(a => a.Code).ToList(); + return areaCode.Select(a => a.Code).ToList(); } if (roleDataTypeList.Any(r => new[] { DataScopeType.DEPT_WITH_CHILD, DataScopeType.AREA_WITH_CHILD }.Cast().Contains(r))) { - return areaCode.Where(a => a.Code.StartsWith(orgAreaCode)).Select(a => a.Code).ToList(); + return areaCode.Where(a => a.Code.StartsWith(orgAreaCode)).Select(a => a.Code).ToList(); } if (roleDataTypeList.Any(r => new[] { DataScopeType.DEPT, DataScopeType.AREA }.Cast().Contains(r))) { - return areaCode.Where(a => a.Code == orgAreaCode).Select(a => a.Code).ToList(); + return areaCode.Where(a => a.Code == orgAreaCode).Select(a => a.Code).ToList(); } return new List(); } diff --git a/20220330_Vote/Ewide.Core/Service/Auth/AuthService.cs b/20220330_Vote/Ewide.Core/Service/Auth/AuthService.cs index c05d8ad..f89d4fa 100644 --- a/20220330_Vote/Ewide.Core/Service/Auth/AuthService.cs +++ b/20220330_Vote/Ewide.Core/Service/Auth/AuthService.cs @@ -156,8 +156,8 @@ namespace Ewide.Core.Service // 判断用户名和密码是否正确 var user = await _sysUserRep.FirstOrDefaultAsync(u => (u.Account.Equals(input.Account) || u.Phone.Equals(input.Account) || u.Email.Equals(input.Account)) && u.Password.Equals(encryptPasswod)); _ = user ?? throw Oops.Oh(ErrorCode.D1000); -#endif - +#endif + _ = user ?? throw Oops.Oh(ErrorCode.D1000); // 验证账号是否被冻结 if (user.Status == CommonStatus.DISABLE) throw Oops.Oh(ErrorCode.D1017); @@ -176,6 +176,7 @@ namespace Ewide.Core.Service { ClaimConst.CLAINM_ACCOUNT, user.Account }, { ClaimConst.CLAINM_NAME, user.Name }, { ClaimConst.CLAINM_SUPERADMIN, user.AdminType }, + { ClaimConst.ExpireTime,DateTime.Now.AddHours(2)}, }); // 设置Swagger自动登录 diff --git a/20220330_Vote/Ewide.Core/Service/Cache/SysCacheService.cs b/20220330_Vote/Ewide.Core/Service/Cache/SysCacheService.cs index 80fdb33..c008c6a 100644 --- a/20220330_Vote/Ewide.Core/Service/Cache/SysCacheService.cs +++ b/20220330_Vote/Ewide.Core/Service/Cache/SysCacheService.cs @@ -117,10 +117,10 @@ namespace Ewide.Core.Service /// /// /// - public Task DelAsync(string key) + public async Task DelAsync(string key) { - _cache.DelAsync(key); - return Task.FromResult(true); + await _cache.DelAsync(key); + return true; } /// @@ -128,10 +128,10 @@ namespace Ewide.Core.Service /// /// /// - public Task DelByPatternAsync(string key) + public async Task DelByPatternAsync(string key) { - _cache.DelByPatternAsync(key); - return Task.FromResult(true); + await _cache.DelByPatternAsync(key); + return true; } /// diff --git a/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenConfigService.cs b/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenConfigService.cs index 65280d1..76c70f1 100644 --- a/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenConfigService.cs +++ b/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenConfigService.cs @@ -141,7 +141,7 @@ namespace Ewide.Core.Service codeGenConfig.EffectType = DataTypeToEff(codeGenConfig.NetType); codeGenConfig.QueryType = "=="; // QueryTypeEnum.eq.ToString(); - codeGenConfig.InsertAsync(); + codeGenConfig.Insert(); } } diff --git a/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenService.cs b/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenService.cs index 66aa15d..f22f14c 100644 --- a/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenService.cs +++ b/20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenService.cs @@ -209,7 +209,7 @@ namespace Ewide.Core.Service.CodeGen var menuType0 = new SysMenu { Pid = emptyGuid, - Pids = "["+ emptyGuid + "],", + Pids = "[" + emptyGuid + "],", Name = busName + "管理", Code = "dilon_" + className.ToLower(), Type = 1, @@ -236,7 +236,7 @@ namespace Ewide.Core.Service.CodeGen var pid1 = _sysMenuRep.InsertNowAsync(menuType1).GetAwaiter().GetResult().Entity.Id; // 按钮-page - var menuType2 = new SysMenu + var menuType2 = await new SysMenu { Pid = pid1, Pids = "[0],[" + pid0 + "],[" + pid1 + "],", @@ -248,7 +248,7 @@ namespace Ewide.Core.Service.CodeGen }.InsertAsync(); // 按钮-detail - var menuType2_1 = new SysMenu + var menuType2_1 = await new SysMenu { Pid = pid1, Pids = "[0],[" + pid0 + "],[" + pid1 + "],", @@ -260,7 +260,7 @@ namespace Ewide.Core.Service.CodeGen }.InsertAsync(); // 按钮-add - var menuType2_2 = new SysMenu + var menuType2_2 = await new SysMenu { Pid = pid1, Pids = "[0],[" + pid0 + "],[" + pid1 + "],", @@ -272,7 +272,7 @@ namespace Ewide.Core.Service.CodeGen }.InsertAsync(); // 按钮-delete - var menuType2_3 = new SysMenu + var menuType2_3 = await new SysMenu { Pid = pid1, Pids = "[0],[" + pid0 + "],[" + pid1 + "],", @@ -284,7 +284,7 @@ namespace Ewide.Core.Service.CodeGen }.InsertAsync(); // 按钮-edit - var menuType2_4 = new SysMenu + var menuType2_4 = await new SysMenu { Pid = pid1, Pids = "[0],[" + pid0 + "],[" + pid1 + "],", diff --git a/20220330_Vote/Ewide.Core/applicationconfig.json b/20220330_Vote/Ewide.Core/applicationconfig.json index 70149cf..9758e16 100644 --- a/20220330_Vote/Ewide.Core/applicationconfig.json +++ b/20220330_Vote/Ewide.Core/applicationconfig.json @@ -97,7 +97,7 @@ "logout", "sysDictType:dropDown", "sysDictType:dropDowns", - "sysFileInfo:upload", + //"sysFileInfo:upload", "sysFileInfo:download", "sysFileInfo:detail", "sysFileInfo:preview", @@ -112,7 +112,11 @@ "sysNotice:detail", "houseLog:list", "houseLog:listByInfoId", - "houseLog:listByTaskId" + "houseLog:listByTaskId", + "gb:yjb:api:outsidewall:Communitys", + "gb:yjb:api:outsidewall:sysFileInfo:upload", + "gb:yjb:api:outsidewall:VerifyIsLogin", + "gb:yjb:api:outsidewall:submit" ] }, diff --git a/20220330_Vote/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs b/20220330_Vote/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs index 7e0edc6..cf4d97d 100644 --- a/20220330_Vote/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs +++ b/20220330_Vote/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs @@ -88,8 +88,9 @@ namespace Ewide.EntityFramework.Core try { + if (dbContext == null) return; // 获取所有更改,删除,新增的实体,但排除审计实体(避免死循环) - var entities = dbContext.ChangeTracker.Entries() + var entities = dbContext?.ChangeTracker?.Entries()? .Where(u => u.Entity.GetType() != typeof(SysLogAudit) && u.Entity.GetType() != typeof(SysLogOp) && u.Entity.GetType() != typeof(SysLogVis) && (u.State == EntityState.Modified || u.State == EntityState.Deleted || u.State == EntityState.Added)) .ToList(); diff --git a/20220330_Vote/Ewide.Web.Core/Handlers/JwtHandler.cs b/20220330_Vote/Ewide.Web.Core/Handlers/JwtHandler.cs index 2e0bf42..cda7936 100644 --- a/20220330_Vote/Ewide.Web.Core/Handlers/JwtHandler.cs +++ b/20220330_Vote/Ewide.Web.Core/Handlers/JwtHandler.cs @@ -49,6 +49,7 @@ namespace Ewide.Web.Core { // 管理员跳过判断 var userManager = App.GetService(); + if (userManager.IsExpire) return false; if (userManager.SuperAdmin) return true; // 路由名称 diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20230712160859-外墙问卷调查模板.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20230712160859-外墙问卷调查模板.xlsx new file mode 100644 index 0000000..f12b505 Binary files /dev/null and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20230712160859-外墙问卷调查模板.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20230712161019-外墙问卷调查模板.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20230712161019-外墙问卷调查模板.xlsx new file mode 100644 index 0000000..e066cd1 Binary files /dev/null and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/OutPut/20230712161019-外墙问卷调查模板.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/外墙问卷调查模板.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/外墙问卷调查模板.xlsx index a1b9c74..28ce5aa 100644 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/外墙问卷调查模板.xlsx and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/外墙问卷调查模板.xlsx differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/0026f1fa-e8dc-4d3f-8289-0f378c2c3fb4.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/0026f1fa-e8dc-4d3f-8289-0f378c2c3fb4.png deleted file mode 100644 index 4789f3b..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/0026f1fa-e8dc-4d3f-8289-0f378c2c3fb4.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/008820d1-8309-40a0-9212-9896da70f367.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/008820d1-8309-40a0-9212-9896da70f367.png deleted file mode 100644 index cf739b4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/008820d1-8309-40a0-9212-9896da70f367.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/10734280-3aef-4045-95b5-c39d71978050.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/10734280-3aef-4045-95b5-c39d71978050.jpg deleted file mode 100644 index 89f7d9c..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/10734280-3aef-4045-95b5-c39d71978050.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1177d716-4b7e-4b81-b09b-d740fb95a8f5.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1177d716-4b7e-4b81-b09b-d740fb95a8f5.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1177d716-4b7e-4b81-b09b-d740fb95a8f5.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/15537aa6-9162-42b4-8b6e-8ac3319b1a2f.bmp b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/15537aa6-9162-42b4-8b6e-8ac3319b1a2f.bmp deleted file mode 100644 index d83b51a..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/15537aa6-9162-42b4-8b6e-8ac3319b1a2f.bmp and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/15fbbc7c-1f59-49b3-b54a-715d6094e33a.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/15fbbc7c-1f59-49b3-b54a-715d6094e33a.jpg deleted file mode 100644 index bf088c1..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/15fbbc7c-1f59-49b3-b54a-715d6094e33a.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1613ca29-eefd-43f0-9d92-45fc1e0771c6.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1613ca29-eefd-43f0-9d92-45fc1e0771c6.png deleted file mode 100644 index cf739b4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1613ca29-eefd-43f0-9d92-45fc1e0771c6.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1e232021-2fd6-40ba-81ac-b2b7b02037a8.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1e232021-2fd6-40ba-81ac-b2b7b02037a8.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/1e232021-2fd6-40ba-81ac-b2b7b02037a8.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/2ddea634-213a-49ae-ad86-32b13965c4e4.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/2ddea634-213a-49ae-ad86-32b13965c4e4.jpg deleted file mode 100644 index 980b98f..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/2ddea634-213a-49ae-ad86-32b13965c4e4.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3009109f-d059-4da2-b200-7b96358f8f9d.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3009109f-d059-4da2-b200-7b96358f8f9d.png deleted file mode 100644 index 0e62d7c..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3009109f-d059-4da2-b200-7b96358f8f9d.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3214cdaa-411f-4b89-acd5-145e9ecf52e5.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3214cdaa-411f-4b89-acd5-145e9ecf52e5.jpg deleted file mode 100644 index 00d33de..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3214cdaa-411f-4b89-acd5-145e9ecf52e5.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/326455ea-fdfd-4e34-bc43-6fc89b3148aa.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/326455ea-fdfd-4e34-bc43-6fc89b3148aa.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/326455ea-fdfd-4e34-bc43-6fc89b3148aa.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/35d2ecc4-2a50-44c2-a94a-5d701ce102e4.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/35d2ecc4-2a50-44c2-a94a-5d701ce102e4.jpg deleted file mode 100644 index 89f7d9c..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/35d2ecc4-2a50-44c2-a94a-5d701ce102e4.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3bf7b606-67e4-4ad3-bcf0-1a2afb89f053.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3bf7b606-67e4-4ad3-bcf0-1a2afb89f053.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3bf7b606-67e4-4ad3-bcf0-1a2afb89f053.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3df729dd-3f00-4bf7-b42b-cfcd88d7e023.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3df729dd-3f00-4bf7-b42b-cfcd88d7e023.jpg deleted file mode 100644 index 980b98f..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/3df729dd-3f00-4bf7-b42b-cfcd88d7e023.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/432312ec-4d96-4ea0-816e-dce2101a65aa.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/432312ec-4d96-4ea0-816e-dce2101a65aa.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/432312ec-4d96-4ea0-816e-dce2101a65aa.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4453d95c-120d-48ef-a7f6-f0cb783c7cbe.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4453d95c-120d-48ef-a7f6-f0cb783c7cbe.png deleted file mode 100644 index 552d49d..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4453d95c-120d-48ef-a7f6-f0cb783c7cbe.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/46c175e8-d8a0-4e22-a15a-0dba738545fb.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/46c175e8-d8a0-4e22-a15a-0dba738545fb.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/46c175e8-d8a0-4e22-a15a-0dba738545fb.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4821b9bc-1ba4-4a36-842d-e18e7a14bc5e.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4821b9bc-1ba4-4a36-842d-e18e7a14bc5e.jpg deleted file mode 100644 index bf088c1..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4821b9bc-1ba4-4a36-842d-e18e7a14bc5e.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4e065ef8-715b-4b06-8aff-8dd61ca71e60.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4e065ef8-715b-4b06-8aff-8dd61ca71e60.jpg deleted file mode 100644 index bf088c1..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4e065ef8-715b-4b06-8aff-8dd61ca71e60.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4f0b50e2-91e5-4d70-b914-a705b730c509.bmp b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4f0b50e2-91e5-4d70-b914-a705b730c509.bmp deleted file mode 100644 index d83b51a..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/4f0b50e2-91e5-4d70-b914-a705b730c509.bmp and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/505d7d2a-0d8c-440b-b6f7-8dcd37504ed7.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/505d7d2a-0d8c-440b-b6f7-8dcd37504ed7.jpg deleted file mode 100644 index 89f7d9c..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/505d7d2a-0d8c-440b-b6f7-8dcd37504ed7.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/572e3889-c5c0-4dc3-9cd6-6040fa0d39b2.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/572e3889-c5c0-4dc3-9cd6-6040fa0d39b2.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/572e3889-c5c0-4dc3-9cd6-6040fa0d39b2.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/5baf82e5-cc27-4b51-a924-285029018efb.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/5baf82e5-cc27-4b51-a924-285029018efb.jpg deleted file mode 100644 index 00d33de..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/5baf82e5-cc27-4b51-a924-285029018efb.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/5bdfc4b6-e9b8-4798-8b67-334cf76a9f26.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/5bdfc4b6-e9b8-4798-8b67-334cf76a9f26.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/5bdfc4b6-e9b8-4798-8b67-334cf76a9f26.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/690f15ec-1bff-49d1-8ebd-3d94092985e1.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/690f15ec-1bff-49d1-8ebd-3d94092985e1.jpg deleted file mode 100644 index 9c491fc..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/690f15ec-1bff-49d1-8ebd-3d94092985e1.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6a092a14-1057-4a98-a82a-e777af7ba1a3.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6a092a14-1057-4a98-a82a-e777af7ba1a3.png deleted file mode 100644 index cf739b4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6a092a14-1057-4a98-a82a-e777af7ba1a3.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6a7948cb-15c1-4087-9df9-08e1be4f2cee.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6a7948cb-15c1-4087-9df9-08e1be4f2cee.jpg deleted file mode 100644 index 86c0c20..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6a7948cb-15c1-4087-9df9-08e1be4f2cee.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6c1e520d-e396-4e73-a3a1-40e6bde0f022.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6c1e520d-e396-4e73-a3a1-40e6bde0f022.jpg deleted file mode 100644 index bf088c1..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/6c1e520d-e396-4e73-a3a1-40e6bde0f022.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7109762e-b62e-4124-99fd-3d55e1d798ff.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7109762e-b62e-4124-99fd-3d55e1d798ff.jpg deleted file mode 100644 index 980b98f..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7109762e-b62e-4124-99fd-3d55e1d798ff.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/734a950d-40c8-41a1-9285-656183008af4.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/734a950d-40c8-41a1-9285-656183008af4.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/734a950d-40c8-41a1-9285-656183008af4.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73af5207-6903-4096-b0c5-9a3ff4ae6571.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73af5207-6903-4096-b0c5-9a3ff4ae6571.jpg deleted file mode 100644 index 980b98f..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73af5207-6903-4096-b0c5-9a3ff4ae6571.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73c0cd6c-af2a-4cad-9319-bcaf6a39fc1d.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73c0cd6c-af2a-4cad-9319-bcaf6a39fc1d.png deleted file mode 100644 index 552d49d..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/73c0cd6c-af2a-4cad-9319-bcaf6a39fc1d.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/75d90184-71d7-4f55-8797-cc59fce9d44d.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/75d90184-71d7-4f55-8797-cc59fce9d44d.jpg deleted file mode 100644 index e698f66..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/75d90184-71d7-4f55-8797-cc59fce9d44d.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/77ea93ab-3e86-4bfc-9212-6f7c0f240fa9.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/77ea93ab-3e86-4bfc-9212-6f7c0f240fa9.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/77ea93ab-3e86-4bfc-9212-6f7c0f240fa9.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7991927e-be04-4be2-9af7-b55ef6e525e5.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7991927e-be04-4be2-9af7-b55ef6e525e5.jpg deleted file mode 100644 index e698f66..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7991927e-be04-4be2-9af7-b55ef6e525e5.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7a9ae7f9-3797-4494-a065-fa5a014b261d.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7a9ae7f9-3797-4494-a065-fa5a014b261d.png deleted file mode 100644 index cf739b4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7a9ae7f9-3797-4494-a065-fa5a014b261d.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7dbfc267-5a98-4554-aff5-7651738445d6.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7dbfc267-5a98-4554-aff5-7651738445d6.jpg deleted file mode 100644 index 980b98f..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/7dbfc267-5a98-4554-aff5-7651738445d6.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/83316f8c-0cb2-4aea-8c40-b8bb4412c542.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/83316f8c-0cb2-4aea-8c40-b8bb4412c542.jpg deleted file mode 100644 index 86c0c20..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/83316f8c-0cb2-4aea-8c40-b8bb4412c542.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/83ba8157-bb20-4291-a4bc-84943eacab8b.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/83ba8157-bb20-4291-a4bc-84943eacab8b.jpg deleted file mode 100644 index 980b98f..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/83ba8157-bb20-4291-a4bc-84943eacab8b.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/8ee75ce7-edc7-437a-a154-f09a4c6fd4e5.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/8ee75ce7-edc7-437a-a154-f09a4c6fd4e5.jpg deleted file mode 100644 index 86c0c20..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/8ee75ce7-edc7-437a-a154-f09a4c6fd4e5.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/938c94ca-689c-49c2-a39b-ecd4bfb87d87.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/938c94ca-689c-49c2-a39b-ecd4bfb87d87.jpg deleted file mode 100644 index e698f66..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/938c94ca-689c-49c2-a39b-ecd4bfb87d87.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/9689267f-d9d9-40fe-b0d8-ef276236c6f1.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/9689267f-d9d9-40fe-b0d8-ef276236c6f1.jpg deleted file mode 100644 index 86c0c20..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/9689267f-d9d9-40fe-b0d8-ef276236c6f1.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/971e79f3-6cc0-4a39-a897-3f55fb9a3dbd.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/971e79f3-6cc0-4a39-a897-3f55fb9a3dbd.png deleted file mode 100644 index 0e62d7c..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/971e79f3-6cc0-4a39-a897-3f55fb9a3dbd.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/9de9c879-096a-4372-bb58-77375ce28228.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/9de9c879-096a-4372-bb58-77375ce28228.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/9de9c879-096a-4372-bb58-77375ce28228.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/a460d8d5-b3aa-431e-91f9-88636490aaee.bmp b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/a460d8d5-b3aa-431e-91f9-88636490aaee.bmp deleted file mode 100644 index 66225b5..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/a460d8d5-b3aa-431e-91f9-88636490aaee.bmp and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ac705dba-f191-4ccd-a66c-8ce299e20eb4.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ac705dba-f191-4ccd-a66c-8ce299e20eb4.jpg deleted file mode 100644 index bf088c1..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ac705dba-f191-4ccd-a66c-8ce299e20eb4.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ae96da27-bfdf-44a7-a0f9-971e0c64e00f.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ae96da27-bfdf-44a7-a0f9-971e0c64e00f.jpg deleted file mode 100644 index 86c0c20..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ae96da27-bfdf-44a7-a0f9-971e0c64e00f.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/af307234-81a3-4520-a0de-06c90512abbe.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/af307234-81a3-4520-a0de-06c90512abbe.jpg deleted file mode 100644 index 89f7d9c..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/af307234-81a3-4520-a0de-06c90512abbe.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/b2b4ae4a-7cc2-4058-940a-7b3bb39bfc80.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/b2b4ae4a-7cc2-4058-940a-7b3bb39bfc80.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/b2b4ae4a-7cc2-4058-940a-7b3bb39bfc80.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/b9f45426-661c-4ac2-bf4e-d0fca87abf46.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/b9f45426-661c-4ac2-bf4e-d0fca87abf46.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/b9f45426-661c-4ac2-bf4e-d0fca87abf46.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/bcb0f81a-abc6-4d26-87df-9ff6266211e4.gif b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/bcb0f81a-abc6-4d26-87df-9ff6266211e4.gif deleted file mode 100644 index 187bdce..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/bcb0f81a-abc6-4d26-87df-9ff6266211e4.gif and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c312987f-9bfc-49db-a4a4-5a4bf772e285.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c312987f-9bfc-49db-a4a4-5a4bf772e285.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c312987f-9bfc-49db-a4a4-5a4bf772e285.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c38d8788-156a-430b-9b62-2578e6cb6c4c.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c38d8788-156a-430b-9b62-2578e6cb6c4c.jpg deleted file mode 100644 index 0ad3893..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c38d8788-156a-430b-9b62-2578e6cb6c4c.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c891cb8b-6abc-4c75-b9ca-6057fc4a5bbc.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c891cb8b-6abc-4c75-b9ca-6057fc4a5bbc.jpg deleted file mode 100644 index bf088c1..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/c891cb8b-6abc-4c75-b9ca-6057fc4a5bbc.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d2f7f624-97c7-496b-97ed-3ed0b28eb455.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d2f7f624-97c7-496b-97ed-3ed0b28eb455.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d2f7f624-97c7-496b-97ed-3ed0b28eb455.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d8b0ee6e-d910-4bc5-83c6-ab8182f58ede.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d8b0ee6e-d910-4bc5-83c6-ab8182f58ede.jpg deleted file mode 100644 index 00d33de..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d8b0ee6e-d910-4bc5-83c6-ab8182f58ede.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d91bb251-fb92-4c4d-865f-ff32a5a3fffe.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d91bb251-fb92-4c4d-865f-ff32a5a3fffe.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d91bb251-fb92-4c4d-865f-ff32a5a3fffe.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d977d098-4ec2-416d-aaf0-f8d14a0421ac.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d977d098-4ec2-416d-aaf0-f8d14a0421ac.jpg deleted file mode 100644 index 9a37171..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/d977d098-4ec2-416d-aaf0-f8d14a0421ac.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/dd0598b1-e539-4df4-a62d-ac346c63269b.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/dd0598b1-e539-4df4-a62d-ac346c63269b.png deleted file mode 100644 index cf739b4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/dd0598b1-e539-4df4-a62d-ac346c63269b.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ec871563-d43e-42c1-8ebf-df65799b0f48.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ec871563-d43e-42c1-8ebf-df65799b0f48.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ec871563-d43e-42c1-8ebf-df65799b0f48.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ee7616b7-734b-48d3-b088-0e0db3b1bf24.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ee7616b7-734b-48d3-b088-0e0db3b1bf24.jpg deleted file mode 100644 index 82d69c4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ee7616b7-734b-48d3-b088-0e0db3b1bf24.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ef39d146-887e-4ed9-adf2-c849395efd33.jpg b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ef39d146-887e-4ed9-adf2-c849395efd33.jpg deleted file mode 100644 index 980b98f..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/ef39d146-887e-4ed9-adf2-c849395efd33.jpg and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/fee56c0e-e3de-4697-a5a4-b71c861fcbcf.png b/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/fee56c0e-e3de-4697-a5a4-b71c861fcbcf.png deleted file mode 100644 index cf739b4..0000000 Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/Upload/Default/fee56c0e-e3de-4697-a5a4-b71c861fcbcf.png and /dev/null differ diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/BuildingResult.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/BuildingResult.html index 81eb495..0e2e1ab 100644 --- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/BuildingResult.html +++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/BuildingResult.html @@ -21,7 +21,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -160,7 +160,6 @@ }, methods: { handlePreview(src, srcs) { - debugger this.loading = true; console.log(src); this.dialogImageUrl = src.preview; @@ -197,7 +196,7 @@ axios({ headers: { 'Content-Type': 'application/json;charset=UTF-8' }, method: 'post', - url: '/gb/yjb/api/outsidewall/querybuilding', + url: `/gb/yjb/api/outsidewall/querybuilding`, data: { wallId: row.id }, responseType: "json", headers: { @@ -236,7 +235,7 @@ axios({ headers: { 'Content-Type': 'application/json;charset=UTF-8' }, method: 'get', - url: '/gb/yjb/api/outsidewall/Communitys?searchkey=' + queryString, + url: `/gb/yjb/api/outsidewall/Communitys?access_token=${window.sessionStorage.getItem('__TOKEN')}&searchkey=` + queryString, responseType: "json", }).then(async response => { _this.communitys = response.data.data diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/index.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/index.html index 37cd6a4..4ed7b9b 100644 --- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/index.html +++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/outsidewall/index.html @@ -18,6 +18,26 @@
+ + + + + + + + + + + + +

宁波既有建筑外墙脱落问卷调查

@@ -43,7 +63,7 @@ *@--> @@ -155,11 +175,11 @@ @@ -168,11 +188,11 @@
只能上传jpg/png文件,且不超过500kb
@@ -181,11 +201,11 @@
只能上传jpg/png文件,且不超过500kb
@@ -244,12 +264,17 @@ 提 交
+ + +
+ +