commit

04.系统编码/App/App.csproj

@@ -129,6 +129,7 @@
     <Compile Include="Controllers\BaseController.cs" />
     <Compile Include="Controllers\ConfigManagementController.cs" />
     <Compile Include="Controllers\OrgManagementController.cs" />
+    <Compile Include="Controllers\RegisterController.cs" />
     <Compile Include="Controllers\TiananmenController.cs" />
     <Compile Include="Controllers\BeijingController.cs" />
     <Compile Include="Controllers\MengguController.cs" />
@@ -203,9 +204,10 @@
     <Content Include="Content\scripts\menggu\result-list.js" />
     <Content Include="Content\scripts\beijing\history-panel.js" />
     <Content Include="Content\scripts\beijing\realtime-panel.js" />
+    <Content Include="Content\scripts\register\register.js" />
     <Content Include="Content\scripts\system-management\config-management\edit-line-color.js" />
     <Content Include="Content\scripts\system-management\config-management\edit-locate-icon.js" />
-    <Content Include="Content\scripts\system-management\config-management\edit-width.js" />
+    <Content Include="Content\scripts\system-management\config-management\edit-line-width.js" />
     <Content Include="Content\scripts\system-management\config-management\index.js" />
     <Content Include="Content\scripts\system-management\org-management\add.js" />
     <Content Include="Content\scripts\system-management\org-management\edit.js" />
@@ -223,6 +225,7 @@
     <Content Include="Content\styles\common.css" />
     <Content Include="Content\styles\index.css" />
     <Content Include="Content\styles\login.css" />
+    <Content Include="Content\styles\register.css" />
     <Content Include="Content\styles\reset.css" />
     <Content Include="Content\styles\user-management.css" />
     <Content Include="Content\thirds\ajaxfileupload.js" />
@@ -337,9 +340,10 @@
     <Content Include="Views\UserManagement\EditDialog.cshtml" />
     <Content Include="Views\OrgManagement\AddDialog.cshtml" />
     <Content Include="Views\OrgManagement\EditDialog.cshtml" />
-    <Content Include="Views\ConfigManagement\EditWidth.cshtml" />
+    <Content Include="Views\ConfigManagement\EditLineWidth.cshtml" />
     <Content Include="Views\ConfigManagement\EditLineColor.cshtml" />
     <Content Include="Views\ConfigManagement\EditLocateIcon.cshtml" />
+    <Content Include="Views\Register\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BLL\BLL.csproj">

04.系统编码/App/Content/scripts/register/register.js

@@ -0,0 +1,26 @@
+var Register = function () {
+    this.Startup = function () {
+        $('#select').on('click', this.OnSelectChange.bind(this));
+    };
+
+    this.OnSelectChange = function () {
+        var option = $("#select option:selected");
+        console.log(option.val());
+        if (option.val() !== '请选择') {
+            $('#select').css({
+                color: '#3a3a3a',
+                fontSize: '16px'
+            });
+        } else {
+            $('#select').css({
+                color: '#868686',
+                fontSize: '14px'
+            });
+        }
+    };
+};
+
+$(document).ready(function () {
+    var register = new Register();
+    register.Startup();
+});

04.系统编码/App/Content/scripts/system-management/config-management/edit-line-color.js

@@ -1 +1,30 @@
-
+var EditLineColor = function (parent) {
+    this.Parent = parent;
+    this.Dialog = $('#edit-line-color-dialog');
+
+    this.Setup = function () {
+        $("#color-picker").on("change", this.ColorChange.bind(this));
+        $("#color-sure-btn").on("click", this.OnSureButtonClick.bind(this));
+        $("#color-cancel-btn").on("click", this.HideDialog.bind(this));
+        $("#color-close").on("click", this.HideDialog.bind(this));
+    };
+
+    this.Show = function (data) {
+        this.Dialog.show();
+        console.log(data);
+        $("#color").textbox('setValue', data.Value);
+        $('#color-picker').val('#ff0000');
+    };
+
+    this.ColorChange = function () {
+        $("#color").textbox('setValue', $('#color-picker').val());
+    };
+
+    this.OnSureButtonClick = function () {
+        this.Dialog.hide();
+    };
+
+    this.HideDialog = function () {
+        this.Dialog.hide();
+    };
+};

04.系统编码/App/Content/scripts/system-management/config-management/edit-line-width.js

@@ -0,0 +1,23 @@
+var EditLineWidth = function (parent) {
+    this.Parent = parent;
+    this.Dialog = $('#edit-line-width-dialog');
+
+    this.Setup = function () {
+        $("#width-sure-btn").on("click", this.OnSureButtonClick.bind(this));
+        $("#width-cancel-btn").on("click", this.HideDialog.bind(this));
+        $("#width-close").on("click", this.HideDialog.bind(this));
+    };
+
+    this.Show = function (data) {
+        this.Dialog.show();
+        $("#width").textbox('setValue', data.Value);
+    };
+
+    this.OnSureButtonClick = function () {
+        this.Dialog.hide();
+    };
+
+    this.HideDialog = function () {
+        this.Dialog.hide();
+    };
+};

04.系统编码/App/Content/scripts/system-management/config-management/edit-locate-icon.js

@@ -1 +1,28 @@
-
+var EditLocateIcon = function (parent) {
+    this.Parent = parent;
+    this.Dialog = $('#edit-locate-icon-dialog');
+
+    this.Setup = function () {
+        $('#file').on('change', this.onFileChange.bind(this))
+        $("#icon-sure-btn").on("click", this.OnSureButtonClick.bind(this));
+        $("#icon-cancel-btn").on("click", this.HideDialog.bind(this));
+        $("#icon-close").on("click", this.HideDialog.bind(this));
+    };
+
+    this.Show = function (data) {
+        this.Dialog.show();
+        //$("#path").textbox('setValue', data.Value);
+    };
+
+    this.onFileChange = function () {
+        $("#path").textbox('setValue', $('#file').val());
+    };
+
+    this.OnSureButtonClick = function () {
+        this.Dialog.hide();
+    };
+
+    this.HideDialog = function () {
+        this.Dialog.hide();
+    };
+};

04.系统编码/App/Content/scripts/system-management/config-management/edit-width.js

@@ -1 +0,0 @@
-

04.系统编码/App/Content/scripts/system-management/config-management/index.js

@@ -2,69 +2,48 @@
 
     this.data = {
         "total": 20,
-        "rows": [{ Id: 1, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 2, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 3, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 4, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 5, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 6, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-        { Id: 7, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 8, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-        { Id: 9, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 10, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 11, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 12, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-        { Id: 13, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 14, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 15, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 16, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 17, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 18, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 19, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-        { Id: 20, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 21, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 22, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 23, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 24, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-        { Id: 25, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 26, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 27, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 28, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 29, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 30, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 31, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 32, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 33, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 34, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-        { Id: 35, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 36, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 37, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 38, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-        { Id: 39, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }]
+        "rows": [{ Id: 1, Name: '线条宽度', Value: "2", Unit: '像素' },
+            { Id: 2, Name: '线条颜色', Value: "#ff0000", Unit: '-' },
+            { Id: 3, Name: '定位图标', Value: "", Unit: '-' }]
     };
     this.selectedRow = [];
-    this.EditDialog = new EditDialog(this);
+    this.EditLineWidth = new EditLineWidth(this);
+    this.EditLineColor = new EditLineColor(this);
+    this.EditLocateIcon = new EditLocateIcon(this);
 
     this.Startup = function () {
+        this.ReLayout();
         this.InitDataGrid();
-        this.EditDialog.Setup();
-        
+        this.EditLineWidth.Setup();
+        this.EditLineColor.Setup();
+        this.EditLocateIcon.Setup();
+
+        $('#manage').addClass('active');
         $('#edit-btn').on('click', this.onEditButtonClick.bind(this));
+
+        window.onresize = this.ReLayout.bind(this);
+    };
+
+    this.ReLayout = function () {
+        var width = $(window).width();
+        var height = $(window).height();
+
+        $('.manage-table, .manage-table .datagrid').width(width - 247);
+        $('.manage-table, .manage-table .datagrid').height(height - 109);
     };
 
     this.InitDataGrid = function () {
         $('#task-grid').datagrid({
             columns: [[
-                { field: 'OrgName', title: '名称', align: 'center', width: 100 },
-                { field: 'CreateTime', title: '创建时间', align: 'center', width: 100 },
-                { field: 'isEnable', title: '启用', align: 'center', width: 30, formatter: this.formatText.bind(this) }
+                { field: 'Name', title: '名称', align: 'center', width: 100, formatter: this.formatIcon.bind(this) },
+                { field: 'Value', title: '值', align: 'center', width: 100, formatter: this.formatIcon.bind(this) },
+                { field: 'Unit', title: '单位', align: 'center', width: 30, formatter: this.formatIcon.bind(this) }
             ]],
             striped: true,
             singleSelect: false,
             fitColumns: true,
             fit: true,
             scrollbarSize: 0,
-            pagination: true,
             onSelect: this.OnTaskSelected.bind(this),
             onUnselect: this.OnTaskUnselected.bind(this)
         });
@@ -72,8 +51,8 @@
         $('#task-grid').datagrid('loadData', this.data);
     };
 
-    this.formatText = function (value) {
-        return value === 1 ? '<span style="color: #00c541">已启用</span>' : '<span style="color: #f40000">已禁用</span>';
+    this.formatIcon = function (value) {
+        return value === "" ? '<img src="../Content/images/locate.png" />' : value;
     };
 
     this.OnTaskSelected = function (index, row) {
@@ -83,20 +62,20 @@
 
         //set buttons disabled state
         $('#edit-btn').prop('disabled', row === null);
-        $('#delete-btn').prop('disabled', row === null);
-        $('#enable-btn').prop('disabled', row.isEnable !== 1 ? null : true);
-        $('#disable-btn').prop('disabled', row.isEnable === 1 ? null : true);
     };
 
     this.OnTaskUnselected = function (index, row) {
         $('#edit-btn').prop('disabled', true);
-        $('#delete-btn').prop('disabled', true);
-        $('#enable-btn').prop('disabled', true);
-        $('#disable-btn').prop('disabled', true);
     };
 
     this.onEditButtonClick = function () {
-        this.EditDialog.Show(this.selectedRow);
+        if (this.selectedRow.Name === '线条宽度')
+            this.EditLineWidth.Show(this.selectedRow);
+        else if (this.selectedRow.Name === '线条颜色')
+            this.EditLineColor.Show(this.selectedRow);
+        else if (this.selectedRow.Name === '定位图标')
+            this.EditLocateIcon.Show(this.selectedRow);
+
     };
 };
 

04.系统编码/App/Content/scripts/system-management/org-management/index.js

@@ -47,13 +47,28 @@
     this.EditDialog = new EditDialog(this);
 
     this.Startup = function () {
+        this.ReLayout();
         this.InitDataGrid();
         this.AddDialog.Setup();
         this.EditDialog.Setup();
 
+        $('#manage').addClass('active');
         $('#add-btn').on('click', this.OnAddButtonClick.bind(this));
         $('#edit-btn').on('click', this.onEditButtonClick.bind(this));
         $('#delete-btn').on('click', this.onDeleteButtonClick.bind(this));
+        $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this));
+        $('#dialog-sure').on('click', this.CloseDeleteDialog.bind(this));
+        $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this));
+
+        window.onresize = this.ReLayout.bind(this);
+    };
+
+    this.ReLayout = function () {
+        var width = $(window).width();
+        var height = $(window).height();
+
+        $('.manage-table, .manage-table .datagrid').width(width - 247);
+        $('.manage-table, .manage-table .datagrid').height(height - 109);
     };
 
     this.InitDataGrid = function () {
@@ -111,6 +126,10 @@
         $('.dialog-delete').show();
         $('.dialog-clear h2').text('确定删除名为「{0}」的机构吗？'.format(this.selectedRow.OrgName));
     };
+
+    this.CloseDeleteDialog = function () {
+        $('.dialog-delete').hide();
+    };
 };
 
 $(document).ready(function () {

04.系统编码/App/Content/scripts/system-management/user-management/index.js

@@ -47,13 +47,28 @@
     this.EditDialog = new EditDialog(this);
 
     this.Startup = function () {
+        this.ReLayout();
         this.InitDataGrid();
         this.AddDialog.Setup();
         this.EditDialog.Setup();
 
+        $('#manage').addClass('active');
         $('#add-btn').on('click', this.OnAddButtonClick.bind(this));
         $('#edit-btn').on('click', this.onEditButtonClick.bind(this));
         $('#delete-btn').on('click', this.onDeleteButtonClick.bind(this));
+        $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this));
+        $('#dialog-sure').on('click', this.CloseDeleteDialog.bind(this));
+        $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this));
+
+        window.onresize = this.ReLayout.bind(this);
+    };
+
+    this.ReLayout = function () {
+        var width = $(window).width();
+        var height = $(window).height();
+
+        $('.manage-table, .manage-table .datagrid').width(width -247);
+        $('.manage-table, .manage-table .datagrid').height(height - 109);
     };
 
     this.InitDataGrid = function () {
@@ -114,6 +129,10 @@
         $('.dialog-delete').show();
         $('.dialog-clear h2').text('确定删除名为「{0}」的账户吗？'.format(this.selectedRow.Name));
     };
+
+    this.CloseDeleteDialog = function () {
+        $('.dialog-delete').hide();
+    };
 };
 
 $(document).ready(function () {

04.系统编码/App/Content/styles/common.css

@@ -56,7 +56,9 @@
     background: url('../images/user-management.png') no-repeat left;
 }
 
+.admin a.manage.active,
 .admin a.manage:hover {
+    color: #faa71b;
     background: url('../images/user-management-hover.png') no-repeat left;
 }
 
@@ -417,6 +419,39 @@
     padding-left: 14px;
 }
 
+.delete-user-dialog .dialog-btn {
+    height: 28px;
+    padding: 0 16px;
+    line-height: 28px;
+    border-radius: 3px;
+}
+
+.delete-user-dialog .dialog-content {
+    height: 150px !important;
+    margin-top: -75px !important;
+}
+
+.delete-user-dialog .dialog-btn-group {
+    width: auto;
+    margin: 0;
+    padding: 16px 10px;
+}
+
+.delete-user-dialog .dialog-btn:first-of-type {
+    margin-right: 8px;
+    color: #ffffff;
+    background: linear-gradient(to bottom, #febd52, #faa71c);
+}
+
+.delete-user-dialog .dialog-btn:last-of-type {
+    border: 1px solid #d2d2d2;
+    background: linear-gradient(to bottom, #fefefe, #dcdcdc);
+}
+
+.delete-user-dialog .dialog-btn:last-of-type:hover {
+    color: #3a3a3a;
+}
+
 .manage-dialog .modal-dialog {
     width: 362px;
     margin-left: -181px;
@@ -461,6 +496,7 @@
 
 .manage-dialog .modal-body .row .col {
     width: calc(50% - 5px);
+    position: relative;
 }
 
 .manage-dialog .modal-body .row .col label {
@@ -525,6 +561,52 @@
     color: #3a3a3a;
 }
 
+.manage-dialog .modal-body .row .col .textbox-readonly .textbox-text {
+    width: calc(100% - 30px) !important;
+}
+
+.manage-dialog .modal-body .row .col .color-picker {
+    padding: 0;
+    height: 30px;
+    position: absolute;
+    right: -1px;
+    top: 29px;
+    background: transparent;
+    border: 1px solid #cfcfcf;
+    border-radius: 0 3px 3px 0;
+}
+
+.manage-dialog .modal-body .row .col .file-upload {
+    width: 30px;
+    height: 30px;
+    text-align: center;
+    position: absolute;
+    top: 30px;
+    right: 1px;
+    cursor: pointer;
+    background: url("../images/upload.png") no-repeat center center;
+}
+
+.manage-dialog .modal-body .row .col .file-input {
+    width: 30px;
+    height: 30px;
+    opacity: 0;
+    position: absolute;
+    top: 32px;
+    right: 0;
+    z-index: 10;
+    cursor: pointer;
+    font-size: 0;
+}
+
+::-webkit-color-swatch-wrapper {
+    background-color: #ffffff;
+}
+
+::-webkit-color-swatch {
+    position: relative;
+}
+
 .manage-dialog .modal-body .row .col .star {
     color: #f40000
 }

04.系统编码/App/Content/styles/login.css

@@ -54,11 +54,26 @@
     font-size: 16px;
 }
 
+.login-tip {
+    margin-top: 20px;
+    display: block;
+    text-align: right;
+    padding-right: 43px;
+}
+
+.login-tip a {
+    text-decoration: underline;
+    display: inline-block;
+    color: #1e6f95;
+}
+
 .login-btn {
     width: 345px;
-    margin: 40px 0 0 38px;
+    margin: 12px 0 0 38px;
     line-height: 46px;
     text-align: center;
     cursor: pointer;
+    font-size: 16px;
+    color: #868686;
     background: url('../images/login-btn.png') no-repeat center/cover;
 }

04.系统编码/App/Content/styles/register.css

@@ -0,0 +1,78 @@
+.register-bg {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1005;
+    background: url('../images/login-bg.png') no-repeat center/cover;
+}
+
+.register {
+    width: 802px;
+    height: 464px;
+    margin: -232px 0 0 -401px;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    background: url('../images/login-picture.png') no-repeat center/cover;
+}
+
+.register-content {
+    width: 425px;
+    height: 446px;
+    margin-top: 4px;
+    background: #ffffff;
+}
+
+.register-logo {
+    margin: 75px 0 20px 40px;
+}
+
+.register-block {
+    margin: 10px 0 0 40px;
+    position: relative;
+}
+
+.register-block select {
+    width: 341px;
+    height: 40px;
+    padding-left: 37px;
+    line-height: 40px;  
+    border: 1px solid #dddddd;
+    border-radius: 3px;  
+    background: #ffffff; 
+    color: #868686;
+    font-size: 14px;
+}
+
+.register-block span.icon {
+    position: absolute;
+    top: 12px;
+    left: 10px;
+}
+
+.register-block input {
+    width: 341px;
+    height: 40px;
+    padding-left: 37px;
+    display: block;
+    line-height: 44px;
+    border: 1px solid #dddddd;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    color: #3a3a3a;
+    font-size: 16px;
+}
+
+.register-btn {
+    width: 345px;
+    margin: 12px 0 0 38px;
+    line-height: 46px;
+    text-align: center;
+    cursor: pointer;
+    font-size: 16px;
+    color: #868686;
+    background: url('../images/login-btn.png') no-repeat center/cover;
+}

04.系统编码/App/Controllers/RegisterController.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace Pingchuan.BeijingSafeguard.App.Controllers
+{
+    public class RegisterController : Controller
+    {
+        // GET: Register
+        public ActionResult Index()
+        {
+            return View();
+        }
+    }
+}

04.系统编码/App/Views/ConfigManagement/EditLineColor.cshtml

@@ -1,7 +1,27 @@
-
-@{
-    ViewBag.Title = "EditLineColor";
-}
+<div class="dialog manage-dialog" id="edit-line-color-dialog">
+    <div class="modal-dialog">
+        <form class="form">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">编辑线条颜色</h4>
+                    <span class="close" id="color-close"><img src="~/Content/images/close-dialog.png" /></span>
+                </div>
 
-<h2>EditLineColor</h2>
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col single-col">
+                            <label>线条颜色&nbsp;<span class="star">*</span></label>
+                            <input type="text" id="color" class="easyui-textbox" prompt="请输入线条颜色" />
+                            <input type="color" id="color-picker" value="#ffffff" class="color-picker" />
+                        </div>
+                    </div>
+                </div>
 
+                <div class="modal-footer">
+                    <button type="button" class="btn sure-btn" id="color-sure-btn">确定</button>
+                    <button type="button" class="btn cancel-btn" id="color-cancel-btn">取消</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

04.系统编码/App/Views/ConfigManagement/EditLineWidth.cshtml

@@ -0,0 +1,26 @@
+<div class="dialog manage-dialog" id="edit-line-width-dialog">
+    <div class="modal-dialog">
+        <form class="form">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">编辑线条宽度</h4>
+                    <span class="close" id="width-close"><img src="~/Content/images/close-dialog.png" /></span>
+                </div>
+
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col single-col">
+                            <label>宽度值（像素）&nbsp;<span class="star">*</span></label>
+                            <input type="text" id="width" class="easyui-textbox" prompt="请输入姓名" />
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn sure-btn" id="width-sure-btn">确定</button>
+                    <button type="button" class="btn cancel-btn" id="width-cancel-btn">取消</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

04.系统编码/App/Views/ConfigManagement/EditLocateIcon.cshtml

@@ -1,7 +1,28 @@
-
-@{
-    ViewBag.Title = "EditLocateIcon";
-}
+<div class="dialog manage-dialog" id="edit-locate-icon-dialog">
+    <div class="modal-dialog">
+        <form class="form">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">编辑定位图标</h4>
+                    <span class="close" id="icon-close"><img src="~/Content/images/close-dialog.png" /></span>
+                </div>
 
-<h2>EditLocateIcon</h2>
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col single-col">
+                            <label>请上传格式为PNG的图标文件&nbsp;<span class="star">*</span></label>
+                            <input type="text" readonly id="path" class="easyui-textbox" prompt="请选择文件路径" />
+                            <input type="file" id="file" accept="image/png" name="file" class="file-input" />
+                            <span class="file-upload"> </span>
+                        </div>
+                    </div>
+                </div>
 
+                <div class="modal-footer">
+                    <button type="button" class="btn sure-btn" id="icon-sure-btn">确定</button>
+                    <button type="button" class="btn cancel-btn" id="icon-cancel-btn">取消</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

04.系统编码/App/Views/ConfigManagement/EditWidth.cshtml

@@ -1,7 +0,0 @@
-
-@{
-    ViewBag.Title = "EditLineWidth";
-}
-
-<h2>EditLineWidth</h2>
-

04.系统编码/App/Views/ConfigManagement/Index.cshtml

@@ -29,9 +29,15 @@
     </div>
 </div>
 
+@{
+    Html.RenderPartial("/Views/ConfigManagement/EditLineWidth.cshtml");
+    Html.RenderPartial("/Views/ConfigManagement/EditLineColor.cshtml");
+    Html.RenderPartial("/Views/ConfigManagement/EditLocateIcon.cshtml");
+}
+
 @section scripts {
+    <script src="~/Content/scripts/system-management/config-management/edit-line-width.js"></script>
     <script src="~/Content/scripts/system-management/config-management/edit-line-color.js"></script>
     <script src="~/Content/scripts/system-management/config-management/edit-locate-icon.js"></script>
-    <script src="~/Content/scripts/system-management/config-management/edit-width.js"></script>
     <script src="~/Content/scripts/system-management/config-management/index.js"></script>
 }

04.系统编码/App/Views/Register/Index.cshtml

@@ -0,0 +1,38 @@
+@{
+    ViewBag.Title = "Index";
+}
+<link href="~/Content/styles/register.css" rel="stylesheet" />
+<div class="register-bg">
+    <div class="register clearfix">
+        <div class="register-content fr">
+            <img src="~/Content/images/login-logo.png" class="register-logo" />
+            <div class="register-block register-username">
+                <span class="icon"><img src="~/Content/images/login-username.png" /></span>
+                <input type="text" id="register-name" placeholder="请输入用户名" />
+            </div>
+            <div class="register-block register-password">
+                <span class="icon"><img src="~/Content/images/org.png" /></span>
+                <select id="select">
+                    <option disabled selected>请选择</option>
+                    <option value="org1">机构</option>
+                    <option value="org2">机构</option>
+                    <option value="org3">机构</option>
+                    <option value="org4">机构</option>
+                </select>
+            </div>
+            <div class="register-block register-username">
+                <span class="icon"><img src="~/Content/images/login-username.png" /></span>
+                <input type="text" id="login-account" placeholder="请输入登录账户" />
+            </div>
+            <div class="register-block register-password">
+                <span class="icon"><img src="~/Content/images/login-password.png" /></span>
+                <input type="password" id="register-password" placeholder="请输入密码" />
+            </div>
+
+            <button class="register-btn" id="register-button">注册</button>
+        </div>
+    </div>
+</div>
+
+<script src="~/Content/thirds/jquery-3.2.1.min.js"></script>
+<script src="~/Content/scripts/register/register.js"></script>

04.系统编码/App/Views/Shared/_Layout.cshtml

@@ -38,7 +38,7 @@
                     </div>
                     <div class="admin fl">
                         <span id="user-info" userid="@(ViewBag.LoginUser != null ? ViewBag.LoginUser.Id : 0)">欢迎，@(ViewBag.LoginUser != null ? ViewBag.LoginUser.RealName : "未登录")</span>
-                        <a class="manage" href="/UserManagement/Index" @((ViewBag.Title == "用户管理" || ViewBag.Title == "机构管理" || ViewBag.Title == "系统设置") ? "class=action" : string.Empty)>系统管理</a>
+                        <a class="manage" id="manage" href="/UserManagement/Index" @((ViewBag.Title == "用户管理" || ViewBag.Title == "机构管理" || ViewBag.Title == "系统设置") ? "class=action" : string.Empty)>系统管理</a>
                         <a class="exit" href="/User/Login">退出</a>
                     </div>
                 </div>

04.系统编码/App/Views/User/Login.cshtml

@@ -15,6 +15,7 @@
                 <input type="password" id="login-password" placeholder="请输入密码" value="123456" />
             </div>
 
+            <span class="login-tip">还没有账号？<a href="/Register/Index">去注册</a></span>
             <button class="login-btn" id="login-button">登录</button>
         </div>
     </div>

04.系统编码/App/Views/UserManagement/Index.cshtml

@@ -13,7 +13,7 @@
                 <a href="/OrgManagement/Index" class="">机构管理</a>
             </li>
             <li>
-                <a href="/ConfigManagement/Index">系统设置@((ViewBag.Title))1</a>
+                <a href="/ConfigManagement/Index">系统设置</a>
             </li>
         </ul>
     </div>

04.系统编码/App/obj/Debug/App.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-9e5a6d8a5667807925d357541947185e8f5c2cd9
+bdde16ab3ba11b51894227e99d7630dc755cd8b3

04.系统编码/BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt

@@ -12,3 +12,17 @@ E:\Work\2019\BeijingSafeguard\04.系统编码\BLL\obj\Debug\BLL.csproj.CoreCompi
 E:\Work\2019\BeijingSafeguard\04.系统编码\BLL\obj\Debug\BLL.csproj.CopyComplete
 E:\Work\2019\BeijingSafeguard\04.系统编码\BLL\obj\Debug\Pingchuan.BeijingSafeguard.BLL.dll
 E:\Work\2019\BeijingSafeguard\04.系统编码\BLL\obj\Debug\Pingchuan.BeijingSafeguard.BLL.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.BLL.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.BLL.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.DAL.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.Model.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.Utility.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\PetaPoco.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.DAL.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.Model.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\bin\Debug\Pingchuan.BeijingSafeguard.Utility.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\obj\Debug\BLL.csprojAssemblyReference.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\obj\Debug\BLL.csproj.CopyComplete
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\obj\Debug\Pingchuan.BeijingSafeguard.BLL.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\BLL\obj\Debug\Pingchuan.BeijingSafeguard.BLL.pdb

04.系统编码/DAL/obj/Debug/DAL.csproj.FileListAbsolute.txt

@@ -11,3 +11,16 @@ E:\Work\2019\BeijingSafeguard\04.系统编码\DAL\obj\Debug\DAL.csproj.CoreCompi
 E:\Work\2019\BeijingSafeguard\04.系统编码\DAL\obj\Debug\DAL.csproj.CopyComplete
 E:\Work\2019\BeijingSafeguard\04.系统编码\DAL\obj\Debug\Pingchuan.BeijingSafeguard.DAL.dll
 E:\Work\2019\BeijingSafeguard\04.系统编码\DAL\obj\Debug\Pingchuan.BeijingSafeguard.DAL.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\Pingchuan.BeijingSafeguard.DAL.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\Pingchuan.BeijingSafeguard.DAL.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\MySql.Data.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\PetaPoco.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\Pingchuan.BeijingSafeguard.Model.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\Pingchuan.BeijingSafeguard.Utility.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\Pingchuan.BeijingSafeguard.Model.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\bin\Debug\Pingchuan.BeijingSafeguard.Utility.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\obj\Debug\DAL.csprojAssemblyReference.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\obj\Debug\DAL.csproj.CoreCompileInputs.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\obj\Debug\DAL.csproj.CopyComplete
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\obj\Debug\Pingchuan.BeijingSafeguard.DAL.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\DAL\obj\Debug\Pingchuan.BeijingSafeguard.DAL.pdb

04.系统编码/Model/obj/Debug/Model.csproj.FileListAbsolute.txt

@@ -8,3 +8,13 @@ E:\Work\2019\BeijingSafeguard\04.系统编码\Model\obj\Debug\Model.csproj.CoreC
 E:\Work\2019\BeijingSafeguard\04.系统编码\Model\obj\Debug\Model.csproj.CopyComplete
 E:\Work\2019\BeijingSafeguard\04.系统编码\Model\obj\Debug\Pingchuan.BeijingSafeguard.Model.dll
 E:\Work\2019\BeijingSafeguard\04.系统编码\Model\obj\Debug\Pingchuan.BeijingSafeguard.Model.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\bin\Debug\Pingchuan.BeijingSafeguard.Model.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\bin\Debug\Pingchuan.BeijingSafeguard.Model.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\bin\Debug\PetaPoco.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\bin\Debug\Pingchuan.BeijingSafeguard.Utility.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\bin\Debug\Pingchuan.BeijingSafeguard.Utility.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\obj\Debug\Model.csprojAssemblyReference.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\obj\Debug\Model.csproj.CopyComplete
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\obj\Debug\Pingchuan.BeijingSafeguard.Model.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\Model\obj\Debug\Pingchuan.BeijingSafeguard.Model.pdb

04.系统编码/Utility/obj/Debug/Utility.csproj.FileListAbsolute.txt

@@ -4,3 +4,9 @@ E:\Work\2019\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Utility.csprojAs
 E:\Work\2019\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Utility.csproj.CoreCompileInputs.cache
 E:\Work\2019\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Pingchuan.BeijingSafeguard.Utility.dll
 E:\Work\2019\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Pingchuan.BeijingSafeguard.Utility.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\Utility\bin\Debug\Pingchuan.BeijingSafeguard.Utility.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\Utility\bin\Debug\Pingchuan.BeijingSafeguard.Utility.pdb
+E:\Work\2021\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Utility.csprojAssemblyReference.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Utility.csproj.CoreCompileInputs.cache
+E:\Work\2021\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Pingchuan.BeijingSafeguard.Utility.dll
+E:\Work\2021\BeijingSafeguard\04.系统编码\Utility\obj\Debug\Pingchuan.BeijingSafeguard.Utility.pdb