代码整理，组件窗口移动到项目中，公共库代码新建UserSystem共同静态数据，v1.6.14
This commit is contained in:
dathlin
@@ -275,6 +275,7 @@ namespace 软件系统浏览器模版.Controllers
|
||||
{
|
||||
UserAccount account = new UserAccount();
|
||||
account.UserName = fc["username"];
|
||||
account.NameAlias = fc["alias"];
|
||||
account.Password = fc["password"];
|
||||
account.Factory = fc["factory"];
|
||||
account.Grade = int.Parse(fc["grade"]);
|
||||
|
||||
@@ -18,47 +18,52 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">1</th>
|
||||
<td>账户名</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountName</td>
|
||||
<td>@account.UserName</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">2</th>
|
||||
<td>密码</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountPassword</td>
|
||||
<td>********</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">3</th>
|
||||
<td>分厂</td>
|
||||
<td>@account.Factory</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountAlias</td>
|
||||
<td>@account.NameAlias</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">4</th>
|
||||
<td>权限</td>
|
||||
<td>@CommonLibrary.AccountGrade.GetDescription(account.Grade)</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountFactory</td>
|
||||
<td>@account.Factory</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">5</th>
|
||||
<td>注册时间</td>
|
||||
<td>@account.RegisterTime.ToString()</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountGrade</td>
|
||||
<td>@CommonLibrary.AccountGrade.GetDescription(account.Grade)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">6</th>
|
||||
<td>登录次数</td>
|
||||
<td>@account.LoginFrequency</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountRegisterTime</td>
|
||||
<td>@account.RegisterTime.ToString()</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">7</th>
|
||||
<td>上次登录时间</td>
|
||||
<td>@account.LastLoginTime</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountLoginFrequency</td>
|
||||
<td>@account.LoginFrequency</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">8</th>
|
||||
<td>上次登录Ip</td>
|
||||
<td>@account.LastLoginIpAddress</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountLastLoginTime</td>
|
||||
<td>@account.LastLoginTime</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">9</th>
|
||||
<td>上次登录方式</td>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountLastLoginIpAddress</td>
|
||||
<td>@account.LastLoginIpAddress</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">10</th>
|
||||
<td>@CommonLibrary.UserLocalization.Localization.AccountLastLoginWay</td>
|
||||
<td>@account.LastLoginWay</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -23,28 +23,48 @@
|
||||
<legend style="font-family:'Microsoft YaHei UI',Arial, Helvetica, sans-serif">注册新的账户<small>如果账户名已存在，会注册失败</small></legend>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="username" class="col-lg-2 control-label">用户名：</label>
|
||||
<label for="username" class="col-lg-2 control-label">@CommonLibrary.UserLocalization.Localization.AccountName：</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" id="username" name="username" placeholder="唯一标志的用户名" required />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password" class="col-lg-2 control-label">密码：</label>
|
||||
<label for="password" class="col-lg-2 control-label">@CommonLibrary.UserLocalization.Localization.AccountPassword：</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="password" class="form-control" id="password" name="password" placeholder="用户登录的密码" required />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="factory" class="col-lg-2 control-label">工厂：</label>
|
||||
<label for="alias" class="col-lg-2 control-label">@CommonLibrary.UserLocalization.Localization.AccountAlias：</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" id="factory" name="factory" required />
|
||||
<input type="text" class="form-control" id="alias" name="alias" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label for="factory" class="col-lg-2 control-label">@CommonLibrary.UserLocalization.Localization.AccountFactory：</label>
|
||||
<div class="col-lg-10">
|
||||
@*<input type="text" class="form-control" id="factory" name="factory" required />*@
|
||||
<select class="form-control" id="factory" name="factory">
|
||||
|
||||
@{
|
||||
string[] factories = Newtonsoft.Json.Linq.JArray.Parse(ClientsLibrary.UserClient.Net_simplify_client.ReadFromServer(
|
||||
CommonLibrary.CommonHeadCode.SimplifyHeadCode.请求分厂, "").Content).ToObject<string[]>();
|
||||
|
||||
foreach (var m in factories)
|
||||
{
|
||||
<option value="@m">@m</option>
|
||||
}
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="grade" class="col-lg-2 control-label">权限：</label>
|
||||
<label for="grade" class="col-lg-2 control-label">@CommonLibrary.UserLocalization.Localization.AccountGrade：</label>
|
||||
<div class="col-lg-10">
|
||||
<select class="form-control" id="grade" name="grade">
|
||||
<option value="@CommonLibrary.AccountGrade.SuperAdministrator">@CommonLibrary.AccountGrade.GetDescription(CommonLibrary.AccountGrade.SuperAdministrator)</option>
|
||||
@@ -56,7 +76,7 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="loginEnable" class="col-lg-2 control-label">能否登录：</label>
|
||||
<label for="loginEnable" class="col-lg-2 control-label">@CommonLibrary.UserLocalization.Localization.AccountLoginEnable：</label>
|
||||
<div class="col-lg-10">
|
||||
<select class="form-control" id="loginEnable" name="loginEnable">
|
||||
<option value="True">允许登录</option>
|
||||
@@ -66,7 +86,7 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="reason" class="col-lg-2 control-label">禁止原因：</label>
|
||||
<label for="reason" class="col-lg-2 control-label">@CommonLibrary.UserLocalization.Localization.AccountForbidMessage：</label>
|
||||
<div class="col-lg-10">
|
||||
<textarea class="form-control" name="reason" id="reason" placeholder="禁止登录的原因，在禁止登录时将会显示这个信息" rows="3"></textarea>
|
||||
</div>
|
||||
|
||||
@@ -53,7 +53,8 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\ClientsLibrary\bin\Debug\ClientsLibrary.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonLibrary">
|
||||
<Reference Include="CommonLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="HslCommunication">
|
||||
|
||||
Reference in New Issue
Block a user