From 14e1fcfaec4599ad9b975032ff8a72276ed033a9 Mon Sep 17 00:00:00 2001 From: hhx <1284857778@qq.com> Date: Sat, 15 Jan 2022 14:06:54 +0800 Subject: [PATCH] commit --- 04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 215040 -> 203264 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 4157112 -> 4157112 bytes 04.系统编码/App/App.csproj | 1 + .../App/Content/scripts/beijing/app.js | 7 ++ .../App/Content/scripts/beijing/info-point.js | 25 +++++ .../config-management/index.js | 2 +- 04.系统编码/App/Content/styles/common.css | 2 +- 04.系统编码/App/Content/styles/index.css | 100 +++++++++++++++++- .../App/Views/Beijing/Index.cshtml | 52 ++++++++- 9 files changed, 180 insertions(+), 9 deletions(-) create mode 100644 04.系统编码/App/Content/scripts/beijing/info-point.js diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 9ceb9ec3c65e40475bdd2c5754fd734a9e02a540..4921ff73c463f3a6ffc304759f40a1d5bb08ac7e 100644 GIT binary patch delta 7755 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 NTfd@6RX&Bz{{YxwFYo{W diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index d5f9eee7fd19a5978490710a218e3311b83ba61c..634026d65ab225aca2da134b9acc1225ebd4661c 100644 GIT binary patch delta 24866 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 delta 6284 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 diff --git a/04.系统编码/App/App.csproj b/04.系统编码/App/App.csproj index af292f3..08ee1cc 100644 --- a/04.系统编码/App/App.csproj +++ b/04.系统编码/App/App.csproj @@ -201,6 +201,7 @@ + diff --git a/04.系统编码/App/Content/scripts/beijing/app.js b/04.系统编码/App/Content/scripts/beijing/app.js index e786372..1f55a72 100644 --- a/04.系统编码/App/Content/scripts/beijing/app.js +++ b/04.系统编码/App/Content/scripts/beijing/app.js @@ -2,6 +2,7 @@ this.Map = new Map(this); this.RealtimePanel = new RealtimePanel(this); this.HistoryPanel = new HistoryPanel(this); + this.InfoPoint = new InfoPoint(this); this.IsShrink = false; this.Startup = function () { @@ -11,11 +12,13 @@ this.Map.Startup(); this.RealtimePanel.Startup(); this.HistoryPanel.Startup(); + this.InfoPoint.Startup(); window.onresize = this.Relayout.bind(this); $('#real-time').on('click', this.OnRealtimeTabClick.bind(this)); $('#history-time').on('click', this.OnHistoryTabClick.bind(this)); $('#shrink').on('click', this.OnShrinkClick.bind(this)); + $('#mark-button').on('click', this.onMarkClick.bind(this)); }; this.Relayout = function () { @@ -71,6 +74,10 @@ $('.shadow').removeClass('shadow-toggle'); } } + + this.onMarkClick = function () { + this.InfoPoint.ShowDialog(); + } }; $(document).ready(function () { diff --git a/04.系统编码/App/Content/scripts/beijing/info-point.js b/04.系统编码/App/Content/scripts/beijing/info-point.js new file mode 100644 index 0000000..2f1fc40 --- /dev/null +++ b/04.系统编码/App/Content/scripts/beijing/info-point.js @@ -0,0 +1,25 @@ +var InfoPoint = function (parent) { + this.Parent = parent; + + this.Startup = function () { + $('.icon-view .icon-col').on('click', this.OnColClick.bind(this)); + $('#close-info-dialog').on('click', this.HideDialog.bind(this)); + $('#dialog-info-point-sure').on('click', this.HideDialog.bind(this)); + $('#dialog-info-point-cancel').on('click', this.HideDialog.bind(this)); + } + + this.OnColClick = function (event) { + $('.icon-view .icon-col').removeClass("active"); + + var label = $(event.target).is('img') ? $(event.target).parent('div') : $(event.target); + label.addClass("active"); + } + + this.HideDialog = function () { + $('#dialog-info-point').hide(); + } + + this.ShowDialog = function () { + $('#dialog-info-point').show(); + } +} \ No newline at end of file diff --git a/04.系统编码/App/Content/scripts/system-management/config-management/index.js b/04.系统编码/App/Content/scripts/system-management/config-management/index.js index 4bed56f..211ffff 100644 --- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js @@ -33,7 +33,7 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'Id', title: '名称', align: 'left', width: 120 }, + { field: 'Name', title: '名称', align: 'left', width: 120 }, { field: 'Value', title: '值', align: 'left', width: 150 }, { field: 'Unit', title: '单位', align: 'center', width: 100, formatter: this.formatUnit.bind(this) }, { field: 'Description', title: '描述', align: 'left', width: 200, formatter: this.formatDescription.bind(this) }, diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 62e6fd4..e2d40f0 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -753,7 +753,7 @@ .manage-dialog .modal-footer .btn { height: 28px; padding: 0 16px; - line-height: 28px; + line-height: 26px; border-radius: 3px; } diff --git a/04.系统编码/App/Content/styles/index.css b/04.系统编码/App/Content/styles/index.css index 0c271dd..e7910af 100644 --- a/04.系统编码/App/Content/styles/index.css +++ b/04.系统编码/App/Content/styles/index.css @@ -567,7 +567,8 @@ .export, .draw, -.clear-btn{ +.clear-btn, +.info-mark { /*width: 50px;*/ height: 25px; line-height: 25px; @@ -588,7 +589,8 @@ .export:hover, .draw:hover, -.clear-btn:hover{ +.clear-btn:hover, +.info-mark:hover { color: #ffffff; } @@ -598,6 +600,12 @@ bottom: auto; } +.info-mark { + top: 20px; + right: 156px; + bottom: auto; +} + .clear-btn { top: 20px; bottom: auto; @@ -924,8 +932,7 @@ } .dialog-btn-group { - width: 138px; - margin: 10px 7px 7px 0; + margin: 10px 10px 10px 0; } .dialog-btn { @@ -933,12 +940,97 @@ background: url('../images/bnt66.png') no-repeat; } +.dialog-btn-group .dialog-btn { + width: 60px; + height: 28px; + line-height: 28px; + border-radius: 3px; + border: 1px solid #d2d2d2; + background: linear-gradient(to bottom, #fefefe, #dcdcdc); +} + +.dialog-btn-group .dialog-btn:hover { + color: #3a3a3a +} + +.dialog-btn-group .dialog-btn.dialog-sure-btn { + margin-right: 7px; + color: #ffffff; + border: 0; + background: linear-gradient(to bottom, #febd52, #faa71c); +} + .dialog-clear h2 { margin: 10px 0; line-height: 30px; text-align: center; } +.dialog-info-point .dialog-content { + width: 370px; + margin-top: 0; + margin-left: -185px; + transform: translateY(-50%); +} + +.dialog-info-point .dialog-title h2 { + padding: 0; + background: none; +} + +.dialog-info-point .item { + margin: 10px; +} + +.dialog-info-point .item label { + margin-bottom: 6px; + display: block; +} + +.dialog-info-point .item .textbox { + width: 100%; + border-radius: 3px; +} + +.dialog-info-point .icon-view { + padding-top: 10px; + margin: 0 10px; + border-radius: 3px; + border: 1px solid #dddddd; +} + +.dialog-info-point .icon-col img { + width: 30px; +} + +.dialog-info-point .icon-view .icon-col { + width: calc((100% - 50px) / 4); + padding: 12px 0; + margin-left: 10px; + margin-bottom: 10px; + text-align: center; + cursor: pointer; + border-radius: 3px; + border: 1px solid #dddddd; +} + +.dialog-info-point .icon-view .icon-col.active { + border-color: #faa920; +} + +.dialog-info-point .line { + height: 1px; + margin-top: 10px; + background-color: #dddddd; + border: 0; +} + +.textbox .textbox-text { + width: 100% !important; + padding: 0 10px; + cursor: auto; +} + .load { width: 365px; height: 60px; diff --git a/04.系统编码/App/Views/Beijing/Index.cshtml b/04.系统编码/App/Views/Beijing/Index.cshtml index 24dbac5..2f61cfa 100644 --- a/04.系统编码/App/Views/Beijing/Index.cshtml +++ b/04.系统编码/App/Views/Beijing/Index.cshtml @@ -11,11 +11,12 @@
@*
- 风场粒子 -
*@ + 风场粒子 +
*@
时间标签
+ 信息点标绘... 画线... 清除... 导出图片... @@ -39,6 +40,50 @@
+
+
+
+

添加信息点

+
+ +
+ + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ + +
+
+
+
@@ -68,7 +113,7 @@

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

- +
@@ -98,6 +143,7 @@ + } \ No newline at end of file