Skip to content

D
DataCenter_Core2.1_20190520
Commit 02f05388 by guanzhenshan
Options

同上

parent 7da36b04
Showing with 6 additions and 5 deletions
Bailun.DC.Web/Areas/Users/Views/Home/UserRoleRelation.cshtml
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-3" style="padding-left:0px;"> @*<div class="col-sm-3" style="padding-left:0px;">
<div style="background:#fff;-moz-box-shadow:3px 3px 8px #bbb; -webkit-box-shadow:3px 3px 3px #bbb; box-shadow:3px 3px 8px #bbb;"> <div style="background:#fff;-moz-box-shadow:3px 3px 8px #bbb; -webkit-box-shadow:3px 3px 3px #bbb; box-shadow:3px 3px 8px #bbb;">
<div style="margin-left:10px;padding-top:15px;padding-bottom:20px;"> <div style="margin-left:10px;padding-top:15px;padding-bottom:20px;">
<h3 style="margin-top:20px;">已授权导出权限<span style="font-size:13px;color:#aaa;">(已勾选的)</span></h3> <h3 style="margin-top:20px;">已授权导出权限<span style="font-size:13px;color:#aaa;">(已勾选的)</span></h3>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>*@
</div> </div>
<div class="row" style="margin-bottom:20px;"> <div class="row" style="margin-bottom:20px;">
<div class="col-sm-12" style="text-align:center;"> <div class="col-sm-12" style="text-align:center;">
......
Bailun.DC.Web/Controllers/HomeController.cs
...@@ -70,7 +70,8 @@ namespace Bailun.DC.Web.Controllers ...@@ -70,7 +70,8 @@ namespace Bailun.DC.Web.Controllers
if (json["statusCode"].ToStr() == "200" && json["result"]["success"].ToString().ToLower() == "true") if (json["statusCode"].ToStr() == "200" && json["result"]["success"].ToString().ToLower() == "true")
{ {
username = json["result"]["Account"].ToString(); username = json["result"]["Account"].ToString();
userid = json["result"]["UserId"].ToInt32(); //userid = json["result"]["UserId"].ToInt32();
userid = json["result"]["OaUserId"].ToInt32();
isAllCompany = json["result"]["AllCompany"].ToStr().ToLower() == "false" ? 0 : 1; isAllCompany = json["result"]["AllCompany"].ToStr().ToLower() == "false" ? 0 : 1;
int.TryParse(json["result"]["Company"]["Id"].ToString(), out companyid); int.TryParse(json["result"]["Company"]["Id"].ToString(), out companyid);
if (json["result"]["Department"].ToString() != "null") if (json["result"]["Department"].ToString() != "null")
......
Bailun.DC.Web/Pages/Index.cshtml
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden"> <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
<script type="text/javascript"> <script type="text/javascript">
login_localhost(); //login_localhost();
//login(); login();
window.location = "@Url.Content("~/Home/Main")"; window.location = "@Url.Content("~/Home/Main")";
</script> </script>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment