From b9fe93d83bcd3dd39ac8715586d666e0391778d5 Mon Sep 17 00:00:00 2001
From: dathlin <hsl200909@163.com>
Date: Mon, 7 Aug 2017 21:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=B4=A6=E6=88=B7=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E8=AE=A1=EF=BC=8C=E7=AD=89=E5=BE=85=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AccountController.cs          | 13 +++
 .../Controllers/HomeController.cs             | 10 ---
 .../Views/Account/RegisterAccount.cshtml      | 86 +++++++++++++++++++
 .../Views/Home/RegisterAccount.cshtml         | 55 ------------
 .../Views/Shared/_Layout.cshtml               |  2 +-
 软件系统浏览器模版/软件系统浏览器模版.csproj  |  2 +-
 6 files changed, 101 insertions(+), 67 deletions(-)
 create mode 100644 软件系统浏览器模版/Views/Account/RegisterAccount.cshtml
 delete mode 100644 软件系统浏览器模版/Views/Home/RegisterAccount.cshtml

diff --git a/软件系统浏览器模版/Controllers/AccountController.cs b/软件系统浏览器模版/Controllers/AccountController.cs
index 2c16fd8..97508ff 100644
--- a/软件系统浏览器模版/Controllers/AccountController.cs
+++ b/软件系统浏览器模版/Controllers/AccountController.cs
@@ -252,5 +252,18 @@ namespace 软件系统浏览器模版.Controllers
             }
         }
 
+
+
+        //GET
+        /// <summary>
+        /// 注册新的账户界面
+        /// </summary>
+        [HttpGet]
+        [AuthorizeAdmin]
+        public ActionResult RegisterAccount()
+        {
+            return View();
+        }
+
     }
 }
\ No newline at end of file
diff --git a/软件系统浏览器模版/Controllers/HomeController.cs b/软件系统浏览器模版/Controllers/HomeController.cs
index 35ac8e4..5df8f46 100644
--- a/软件系统浏览器模版/Controllers/HomeController.cs
+++ b/软件系统浏览器模版/Controllers/HomeController.cs
@@ -236,16 +236,6 @@ namespace 软件系统浏览器模版.Controllers
 
 
 
-        //GET
-        /// <summary>
-        /// 注册新的账户界面
-        /// </summary>
-        [HttpGet]
-        [AuthorizeAdmin]
-        public ActionResult RegisterAccount()
-        {
-            return View();
-        }
 
     }
 }
\ No newline at end of file
diff --git a/软件系统浏览器模版/Views/Account/RegisterAccount.cshtml b/软件系统浏览器模版/Views/Account/RegisterAccount.cshtml
new file mode 100644
index 0000000..8119fc0
--- /dev/null
+++ b/软件系统浏览器模版/Views/Account/RegisterAccount.cshtml
@@ -0,0 +1,86 @@
+
+@{
+    ViewBag.Title = "注册新的账户";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
+
+
+
+@section scripts
+{
+    <script src="~/Scripts/jquery.unobtrusive-ajax.min.js"></script>
+}
+
+<br />
+
+<div>
+    @{ string updateId = Guid.NewGuid().ToString();}
+    @using (Ajax.BeginForm("RegisterAccount", null, new AjaxOptions { HttpMethod = "Post", UpdateTargetId = updateId, InsertionMode = InsertionMode.Replace },
+                                                                new { @class = "form-horizontal" }))
+    {
+        <fieldset>
+            @Html.AntiForgeryToken()
+            <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>
+                <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>
+                <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>
+                <div class="col-lg-10">
+                    <input type="text" class="form-control" id="factory" name="factory" required />
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="grade" class="col-lg-2 control-label">权限：</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>
+                        <option value="@CommonLibrary.AccountGrade.Admin">@CommonLibrary.AccountGrade.GetDescription(CommonLibrary.AccountGrade.Admin)</option>
+                        <option value="@CommonLibrary.AccountGrade.Technology">@CommonLibrary.AccountGrade.GetDescription(CommonLibrary.AccountGrade.Technology)</option>
+                        <option value="@CommonLibrary.AccountGrade.General">@CommonLibrary.AccountGrade.GetDescription(CommonLibrary.AccountGrade.General)</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="loginEnable" class="col-lg-2 control-label">能否登录：</label>
+                <div class="col-lg-10">
+                    <select class="form-control" id="loginEnable" name="loginEnable">
+                        <option value="True">允许登录</option>
+                        <option value="False">禁止登录</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="loginEnable" class="col-lg-2 control-label">禁止原因：</label>
+                <div class="col-lg-10">
+                    <textarea class="form-control" name="reason" id="reason" placeholder="禁止登录的原因，在禁止登录时将会显示这个信息" rows="3"></textarea>
+                </div>
+            </div>
+
+            
+            <div class="form-group">
+                <div class="col-lg-10 col-lg-offset-2">
+                    <button type="submit" class="btn btn-primary">提交信息</button>
+                </div>
+            </div>
+        </fieldset>
+    }
+</div>
+<div id="@updateId">
+
+</div>
diff --git a/软件系统浏览器模版/Views/Home/RegisterAccount.cshtml b/软件系统浏览器模版/Views/Home/RegisterAccount.cshtml
deleted file mode 100644
index 2a0c64f..0000000
--- a/软件系统浏览器模版/Views/Home/RegisterAccount.cshtml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-@{
-    ViewBag.Title = "注册新的账户";
-    Layout = "~/Views/Shared/_Layout.cshtml";
-}
-
-
-
-@section scripts
-{
-    <script src="~/Scripts/jquery.unobtrusive-ajax.min.js"></script>
-}
-
-<br />
-
-<div>
-    @{ string updateId = Guid.NewGuid().ToString();}
-    @using (Ajax.BeginForm("RegisterAccount", null, new AjaxOptions { HttpMethod = "Post", UpdateTargetId = updateId, InsertionMode = InsertionMode.Replace },
-                                                                new { @class = "form-horizontal" }))
-    {
-        <fieldset>
-            @Html.AntiForgeryToken()
-            <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>
-                <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>
-                <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="Announcement" class="col-lg-2 control-label"></label>
-                <div class="col-lg-10">
-                    <textarea class="form-control" id="Announcement" name="Announcement" placeholder="1000字以内" required rows="10">@ClientsLibrary.UserClient.Announcement</textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-lg-10 col-lg-offset-2">
-                    <button type="submit" class="btn btn-primary">提交公告</button>
-                </div>
-            </div>
-        </fieldset>
-    }
-</div>
-<div id="@updateId">
-
-</div>
diff --git a/软件系统浏览器模版/Views/Shared/_Layout.cshtml b/软件系统浏览器模版/Views/Shared/_Layout.cshtml
index cd42353..b6a267d 100644
--- a/软件系统浏览器模版/Views/Shared/_Layout.cshtml
+++ b/软件系统浏览器模版/Views/Shared/_Layout.cshtml
@@ -28,7 +28,7 @@
                         <ul class="dropdown-menu">
                             <li>@Html.ActionLink("公告更改", "ChangeAnnouncement", "Home")</li>
                             <li>@Html.ActionLink("账号管理", "ManagementAccount", "Home")</li>
-                            <li>@Html.ActionLink("注册账户", "About", "Home")</li>
+                            <li>@Html.ActionLink("注册账户", "RegisterAccount", "Account")</li>
                             <li role="separator" class="divider"></li>
                             <li>@Html.ActionLink("日志查看", "About", "Home")</li>
                             <li>@Html.ActionLink("消息发送", "About", "Home")</li>
diff --git a/软件系统浏览器模版/软件系统浏览器模版.csproj b/软件系统浏览器模版/软件系统浏览器模版.csproj
index 7f3a702..6dd9788 100644
--- a/软件系统浏览器模版/软件系统浏览器模版.csproj
+++ b/软件系统浏览器模版/软件系统浏览器模版.csproj
@@ -229,7 +229,7 @@
     <Content Include="Views\Home\ChangeAnnouncement.cshtml" />
     <Content Include="Views\Home\ManagementAccount.cshtml" />
     <Content Include="Views\Home\LackOfAuthority.cshtml" />
-    <Content Include="Views\Home\RegisterAccount.cshtml" />
+    <Content Include="Views\Account\RegisterAccount.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />