' : 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);
+
};
};
diff --git a/04.系统编码/App/Content/scripts/system-management/org-management/index.js b/04.系统编码/App/Content/scripts/system-management/org-management/index.js
index ed3495a..ce53216 100644
--- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js
+++ b/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 () {
diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/index.js b/04.系统编码/App/Content/scripts/system-management/user-management/index.js
index e4fda6c..4958b19 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js
+++ b/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 () {
diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css
index a33b6d2..1176134 100644
--- a/04.系统编码/App/Content/styles/common.css
+++ b/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
}
diff --git a/04.系统编码/App/Content/styles/login.css b/04.系统编码/App/Content/styles/login.css
index 8f5e167..b2d07d5 100644
--- a/04.系统编码/App/Content/styles/login.css
+++ b/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;
}
\ No newline at end of file
diff --git a/04.系统编码/App/Content/styles/register.css b/04.系统编码/App/Content/styles/register.css
new file mode 100644
index 0000000..6236432
--- /dev/null
+++ b/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;
+}
diff --git a/04.系统编码/App/Controllers/RegisterController.cs b/04.系统编码/App/Controllers/RegisterController.cs
new file mode 100644
index 0000000..c3fa884
--- /dev/null
+++ b/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();
+ }
+ }
+}
\ No newline at end of file
diff --git a/04.系统编码/App/Views/ConfigManagement/EditLineColor.cshtml b/04.系统编码/App/Views/ConfigManagement/EditLineColor.cshtml
index a588ae2..6f6ca4e 100644
--- a/04.系统编码/App/Views/ConfigManagement/EditLineColor.cshtml
+++ b/04.系统编码/App/Views/ConfigManagement/EditLineColor.cshtml
@@ -1,7 +1,27 @@
-
-@{
- ViewBag.Title = "EditLineColor";
-}
+
+
\ No newline at end of file
diff --git a/04.系统编码/App/Views/ConfigManagement/EditLineWidth.cshtml b/04.系统编码/App/Views/ConfigManagement/EditLineWidth.cshtml
new file mode 100644
index 0000000..351cc62
--- /dev/null
+++ b/04.系统编码/App/Views/ConfigManagement/EditLineWidth.cshtml
@@ -0,0 +1,26 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/04.系统编码/App/Views/ConfigManagement/EditLocateIcon.cshtml b/04.系统编码/App/Views/ConfigManagement/EditLocateIcon.cshtml
index 9bf965e..52cf1cf 100644
--- a/04.系统编码/App/Views/ConfigManagement/EditLocateIcon.cshtml
+++ b/04.系统编码/App/Views/ConfigManagement/EditLocateIcon.cshtml
@@ -1,7 +1,28 @@
-
-@{
- ViewBag.Title = "EditLocateIcon";
-}
+
+
+
+
+
\ No newline at end of file
diff --git a/04.系统编码/App/Views/ConfigManagement/EditWidth.cshtml b/04.系统编码/App/Views/ConfigManagement/EditWidth.cshtml
deleted file mode 100644
index 0bc6a22..0000000
--- a/04.系统编码/App/Views/ConfigManagement/EditWidth.cshtml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-@{
- ViewBag.Title = "EditLineWidth";
-}
-
-
+
+
+EditLineWidth
- diff --git a/04.系统编码/App/Views/ConfigManagement/Index.cshtml b/04.系统编码/App/Views/ConfigManagement/Index.cshtml index 511d7fa..891f573 100644 --- a/04.系统编码/App/Views/ConfigManagement/Index.cshtml +++ b/04.系统编码/App/Views/ConfigManagement/Index.cshtml @@ -29,9 +29,15 @@ +@{ + Html.RenderPartial("/Views/ConfigManagement/EditLineWidth.cshtml"); + Html.RenderPartial("/Views/ConfigManagement/EditLineColor.cshtml"); + Html.RenderPartial("/Views/ConfigManagement/EditLocateIcon.cshtml"); +} + @section scripts { + - } diff --git a/04.系统编码/App/Views/Register/Index.cshtml b/04.系统编码/App/Views/Register/Index.cshtml new file mode 100644 index 0000000..c63d97d --- /dev/null +++ b/04.系统编码/App/Views/Register/Index.cshtml @@ -0,0 +1,38 @@ +@{ + ViewBag.Title = "Index"; +} + +
+
+
+
+
\ No newline at end of file
diff --git a/04.系统编码/App/Views/Shared/_Layout.cshtml b/04.系统编码/App/Views/Shared/_Layout.cshtml
index 1e087c8..06b0941 100644
--- a/04.系统编码/App/Views/Shared/_Layout.cshtml
+++ b/04.系统编码/App/Views/Shared/_Layout.cshtml
@@ -38,7 +38,7 @@
diff --git a/04.系统编码/App/Views/User/Login.cshtml b/04.系统编码/App/Views/User/Login.cshtml
index 0782a85..ea6d876 100644
--- a/04.系统编码/App/Views/User/Login.cshtml
+++ b/04.系统编码/App/Views/User/Login.cshtml
@@ -15,6 +15,7 @@
+ 还没有账号？去注册
diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml
index 145e3ad..4a079f1 100644
--- a/04.系统编码/App/Views/UserManagement/Index.cshtml
+++ b/04.系统编码/App/Views/UserManagement/Index.cshtml
@@ -13,7 +13,7 @@
机构管理
+
+
+ 
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+