diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 3038264..2a97369 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/.suo and b/04.系统编码/.vs/BeijingSafeguard/v15/.suo differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 72de6a2..08e5d33 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal differ diff --git a/04.系统编码/App/Content/scripts/beijing/info-point.js b/04.系统编码/App/Content/scripts/beijing/info-point.js index 86dfe65..5b8f6a7 100644 --- a/04.系统编码/App/Content/scripts/beijing/info-point.js +++ b/04.系统编码/App/Content/scripts/beijing/info-point.js @@ -48,7 +48,8 @@ Title: $("#title").textbox('getValue'), Icon: $('.icon-view .active').attr('name'), Longitude: this.Point.lng, - Latitude: this.Point.lat + Latitude: this.Point.lat, + region: 'bj' }, success: function (result) { this.Parent.AddInfoPoint(this.Point, $("#title").textbox('getValue'), $('.icon-view .active').attr('name'), result); diff --git a/04.系统编码/App/Content/scripts/beijing/map.js b/04.系统编码/App/Content/scripts/beijing/map.js index cf828ec..115b2d6 100644 --- a/04.系统编码/App/Content/scripts/beijing/map.js +++ b/04.系统编码/App/Content/scripts/beijing/map.js @@ -647,6 +647,9 @@ var Map = function (parent) { type: "POST", dataType: 'text', url: '/Point/Query', + data: { + region: 'bj' + }, success: function (result) { var data = JSON.parse(result); data.forEach(function (item, index) { diff --git a/04.系统编码/App/Content/scripts/menggu/info-point.js b/04.系统编码/App/Content/scripts/menggu/info-point.js index 8e1f137..588b03a 100644 --- a/04.系统编码/App/Content/scripts/menggu/info-point.js +++ b/04.系统编码/App/Content/scripts/menggu/info-point.js @@ -48,7 +48,8 @@ Title: $("#title").textbox('getValue'), Icon: $('.icon-view .active').attr('name'), Longitude: this.Point.lng, - Latitude: this.Point.lat + Latitude: this.Point.lat, + region: 'mg' }, success: function (result) { this.Parent.AddInfoPoint(this.Point, $("#title").textbox('getValue'), $('.icon-view .active').attr('name'), result); diff --git a/04.系统编码/App/Content/scripts/menggu/map.js b/04.系统编码/App/Content/scripts/menggu/map.js index 14f6c0f..9e13f16 100644 --- a/04.系统编码/App/Content/scripts/menggu/map.js +++ b/04.系统编码/App/Content/scripts/menggu/map.js @@ -396,6 +396,9 @@ var Map = function (parent) { type: "POST", dataType: 'text', url: '/Point/Query', + data: { + region: 'mg' + }, success: function (result) { var data = JSON.parse(result); data.forEach(function (item, index) { diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 5c070d2..ae7c43d 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -564,31 +564,13 @@ 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; + padding: 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; diff --git a/04.系统编码/App/Content/styles/index.css b/04.系统编码/App/Content/styles/index.css index 2fc09d9..80529b9 100644 --- a/04.系统编码/App/Content/styles/index.css +++ b/04.系统编码/App/Content/styles/index.css @@ -897,8 +897,9 @@ .dialog-delete .dialog-content { width: 380px; - height: 140px; - margin: -70px 0 0 -190px; + height: 137px; + margin: 0; + transform: translate(-50%, -50%) } .dialog-delete .dialog-title h2 { @@ -960,7 +961,6 @@ } .dialog-btn-group .dialog-btn { - width: 60px; height: 28px; line-height: 28px; border-radius: 3px; @@ -979,6 +979,10 @@ background: linear-gradient(to bottom, #febd52, #faa71c); } +.dialog-btn-group .dialog-btn.dialog-sure-btn:hover { + color: #ffffff; +} + .dialog-clear h2 { margin: 10px 0; line-height: 30px; @@ -1070,6 +1074,12 @@ border-radius: 3px; border: 1px solid #dddddd; line-height: 28px; + color: #3a3a3a; +} + +.dialog-select-point .item .col input::selection { + color: #3a3a3a; + background: #ffffff; } .dialog-select-point .item .col .copy-btn { diff --git a/04.系统编码/App/Views/Menggu/Index.cshtml b/04.系统编码/App/Views/Menggu/Index.cshtml index a88dac0..c2c7ed3 100644 --- a/04.系统编码/App/Views/Menggu/Index.cshtml +++ b/04.系统编码/App/Views/Menggu/Index.cshtml @@ -141,7 +141,7 @@

确定删除释放时间为的任务吗?

- +
@@ -170,7 +170,7 @@ - + } \ No newline at end of file diff --git a/04.系统编码/App/Views/OrgManagement/Index.cshtml b/04.系统编码/App/Views/OrgManagement/Index.cshtml index 13950f4..21eec7f 100644 --- a/04.系统编码/App/Views/OrgManagement/Index.cshtml +++ b/04.系统编码/App/Views/OrgManagement/Index.cshtml @@ -38,7 +38,7 @@ -
+

确认删除

@@ -48,7 +48,7 @@

确定删除吗?

- +
diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml index 470df00..15c0b75 100644 --- a/04.系统编码/App/Views/UserManagement/Index.cshtml +++ b/04.系统编码/App/Views/UserManagement/Index.cshtml @@ -53,7 +53,7 @@

确定删除吗?

- +