wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 8717ef61efd0467e84ebb8ba38b404289260cf0a
Former-commit-id: 195c9ce0b02433fa6527fb9fe8b0e6f3bb3019dd
1.0
wanggang 5 years ago
parent cd876e2c2f
commit 98c14989b3
3 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File

50
projects/Platform/Views/Shared/_Layout.cshtml
Unescape View File

@ -41,20 +41,7 @@
<ul class="navbar-nav ml-auto">
@if (User.Identity.IsAuthenticated)
{
var userName=User.Identity.Name;
var displayName=User.Claims.FirstOrDefault(o=>o.Type== System.Security.Claims.ClaimTypes.GivenName)?.Value??userName;
var organs = organUserRepo.ReadOnlyTable().Where(o=>o.User.UserName==userName).Select(o=>new{o.Organ.Number,o.Organ.Name});
if(organs.Any())
{
var organNumber = User.Claims.FirstOrDefault(o=>o.Type== System.Security.Claims.ClaimTypes.UserData)?.Value;
var list = new SelectList(organs, "Number", "Name", organNumber);
<li class="nav-item">
<form method="get" action="@Url.Action("ChangeOrgan","Account",new{area=""})">
<input type="hidden" name="ReturnUrl" value="@ViewContext.HttpContext.Request.GetDisplayUrl()" />
@Html.DropDownList("UserCurrentOrganNumber", list,new { @class = "form-control organ submit" })
</form>
</li>
}
var displayName = User.Claims.FirstOrDefault(o => o.Type == System.Security.Claims.ClaimTypes.GivenName)?.Value ?? User.Identity.Name;
<li class="nav-item">
<a href="@Url.Action("Index","Account",new { area=""})" class="@GetLinkClass(area:"",controller:"Account")">@displayName</a>
</li>
@ -64,7 +51,6 @@
}
else
{
<li class="nav-item">
<a class="nav-link" href="@Url.Action("Register","Account",new { area=""})">注册</a>
</li>
@ -75,10 +61,30 @@
</ul>
</nav>
<aside class="main-sidebar sidebar-dark-primary elevation-4">
<a class="brand-link" href="@Url.Action("Index","Home",new { area=""})">
<img class="brand-image img-circle" src="@Url.Content2(logo)" style="height:100%;" />
<span class="brand-text font-weight-light">@name</span>
</a>
<div class="brand-link" href="@Url.Action("Index","Home",new { area=""})">
<span class="brand-text font-weight-light">
@if (User.Identity.IsAuthenticated)
{
var userName = User.Identity.Name;
var organNumber = User.Claims.FirstOrDefault(o => o.Type == System.Security.Claims.ClaimTypes.UserData)?.Value;
var organs = organUserRepo.ReadOnlyTable().Where(o => o.User.UserName == userName).Select(o => new { o.Organ.Number, o.Organ.Name, o.Organ.Image });
var organImage = organs.FirstOrDefault(o => o.Number == organNumber)?.Image ?? logo;
var list = new SelectList(organs, "Number", "Name", organNumber);
<img class="brand-image img-circle" src="@Url.Content2(organImage)" style="display:inline-box;margin-top:0;height:32px;" />
<span class="brand-text font-weight-light">
<form method="get" action="@Url.Action("ChangeOrgan","Account",new{area=""})">
<input type="hidden" name="ReturnUrl" value="@ViewContext.HttpContext.Request.GetDisplayUrl()" />
@Html.DropDownList("UserCurrentOrganNumber", list,new { @class = "organ submit",style="background-color:#343a40;border-color: #343a40;" })
</form>
</span>
}
else
{
<img class="brand-image img-circle" src="@Url.Content2(logo)" style="display:inline-box;margin-top:0;height:32px;" />
<span class="brand-text font-weight-light">@name</span>
}
</div>
<div class="sidebar">
<nav class="mt-2">
@await Html.PartialAsync("_Menu")
@ -103,9 +109,9 @@
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="@Url.Action("Index","Home")">首页</a></li>
@RenderSection("bread", false)
<li class="breadcrumb-item active">@HtmlTitle</li>
<li class="breadcrumb-item"><a href="@Url.Action("Index","Home")">首页</a></li>
@RenderSection("bread", false)
<li class="breadcrumb-item active">@HtmlTitle</li>
</ol>
</div>
</div>

BIN
projects/Platform/wwwroot/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 931 B

20
projects/projects.sln
Unescape View File

@ -23,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{48C7AE84-0
D_5_41_10_4ZHXY_4projects_4lib_4package_1json__JsonSchema = http://json.schemastore.org/pyrseas-0.8
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects", "Projects", "{AE34E06D-C5C7-44BC-B168-85808318516C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebMVC", "WebMVC\WebMVC.csproj", "{C66B39B3-D863-4651-99CD-74104CA65C47}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSPA", "WebSPA\WebSPA.csproj", "{6F839910-580D-4CD1-A0C0-6FAF542B4480}"
@ -42,7 +40,6 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|iPhone.Build.0 = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -54,7 +51,6 @@ Global
{264A3E6B-80A1-488D-841D-930B810B85D2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|iPhone.Build.0 = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -66,7 +62,6 @@ Global
{216F0A25-9F20-4235-9316-632AB94E854A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|iPhone.Build.0 = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -78,7 +73,6 @@ Global
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|iPhone.Build.0 = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -90,7 +84,6 @@ Global
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{C66B39B3-D863-4651-99CD-74104CA65C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C66B39B3-D863-4651-99CD-74104CA65C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C66B39B3-D863-4651-99CD-74104CA65C47}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{C66B39B3-D863-4651-99CD-74104CA65C47}.Debug|iPhone.Build.0 = Debug|Any CPU
{C66B39B3-D863-4651-99CD-74104CA65C47}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -102,7 +95,6 @@ Global
{C66B39B3-D863-4651-99CD-74104CA65C47}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C66B39B3-D863-4651-99CD-74104CA65C47}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Debug|iPhone.Build.0 = Debug|Any CPU
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -114,7 +106,6 @@ Global
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|iPhone.Build.0 = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -129,17 +120,8 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{264A3E6B-80A1-488D-841D-930B810B85D2} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{216F0A25-9F20-4235-9316-632AB94E854A} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{C66B39B3-D863-4651-99CD-74104CA65C47} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{6F839910-580D-4CD1-A0C0-6FAF542B4480} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{60596088-3C4E-4EA2-933A-B66CD269845B} = {AE34E06D-C5C7-44BC-B168-85808318516C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
BuildVersion_StartDate = 2000/1/1
SolutionGuid = {0B7095FB-5E70-4EF8-805A-CB4A91AE4B0A}
BuildVersion_StartDate = 2000/1/1
EndGlobalSection
EndGlobal

Write Preview
Loading…
Cancel
Save