From 767bb5250e722e261c18e0bbf83c5419e61fbd4f Mon Sep 17 00:00:00 2001
From: hhx <1284857778@qq.com>
Date: Tue, 8 Mar 2022 16:19:47 +0800
Subject: [PATCH] commit
---
04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 243712 -> 231936 bytes
.../v15/Server/sqlite3/storage.ide-wal | Bin 4157112 -> 4157112 bytes
.../App/Content/scripts/beijing/map.js | 4 +-
04.系统编码/App/Content/styles/common.css | 6 +-
.../App/Views/Beijing/Index.cshtml | 105 +++++++++---------
04.系统编码/App/Views/Menggu/Index.cshtml | 5 +-
6 files changed, 62 insertions(+), 58 deletions(-)
diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo
index 471a29e0458977444894f4b69bf0aedb0f600e88..8d1e6d8b1362dded88edacbabe3f2ae8b186f496 100644
GIT binary patch
delta 5611
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
delta 6782
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
diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
index 08bd7c814c4c4862c027f82377011a17ebd6ae2b..44095df876d11c23e1d79d46f70b1b59303628f9 100644
GIT binary patch
delta 639
zcmZ9`Pe{{Y9LMqJ_iy{T?YG~4I!m|ZzqQ$#x@?=P>9h`Y2qC+8Y#O6Fm`LEIe-u1q
zKQ}C?^$-+w@DgS;N}e@5#PSjq=s6Tmbr@L?{h=uO2o=)d^*rCh^YDEaSAGgbxJU&m
zQi;k`p%!YTDy^b6YNrmWQ76@@iyBX=!>`!vyrijL7Qer9o%fVk(<i~J93w=y%GTzk
zKAw1E6m<Pp;cjDQq#RRp4>_TgS=yU=&Px^JheI+=8!vt{k|H}ZqdC?0SM<>R)5~A^
zqm!<ic6M~4dRWL_AC6D5$SKjySD!}5q!vQjrZd?C{z3PPTlJG&T5m=pSgH7k;uB0v
zCSO|A9EzMDGVM%w+n(V)2g4U^0by#R?C<B%+kCK8(Cf6SAtH%!Vk@c3VqD}xYceSE
zl?5Yg6$xQu>#pN`Kr*^5wI8tN-|l;fwL_N&)OEfTGS13E?r|=^AagZpytD+en;%Zm
zk$tNV&jmLkMcI!?9DgEfWckv#>0sABCO`k58x(SzbMu`I&t^tDR881VBr-=Fht+Xh
zbJIueu+*$^Lng!;V}(Q{&0`OYv~!};UjuHag)OiZ>YyGx-~}ISg9d1XCTNBh@WXZp
vKoDAC2ZUfJgrN=Ep#vhY3p!ypL?H%o=z;|7fxVD~Zs>s&^zur7-|Obz=5_33
delta 573
zcmYk&Ur19?0LSrrcDH%gyl(5BJ8vyDv-QXMr_yECmQvA+qY#52GKeA{!nKMXHVe0L
znlSsb6>*d>B#r7VDL4zE0wH>6*dC%-L{G&))*pK4rA0p?qKD7x_u-p+Um-b&Gr~+v
zW@ct#R#wFnW@F2komDfH)i4KhGS{Q!zL&f&qpJ$f8h3ea;h6YZ)<(=^^x>r&V|G6B
z!mBFjU9LdBY4$nqU8J=nn(g<9zCkT$;}71_TkejMJGHy?rt{3JcXfO2o%Y<;KNao-
zdBS1!@r>+hwk1jGf+gWk9_DlNt%rDQf5VJ;TBKRCVcmPb+;i^9v?@uGNu88xGU_Cm
zB2#nymx;)SwF5H0dP*PX=Z|<!@GC<a6~AQ4tDOIefq`h^Y-*Gj!rFJyX3z*RkRl+p
zWRIsm4lKr`aH)Hyx4^`+yykQ&T?b!(uud3J5&1$Zsu;YfSxmfG)@qcWC)v>F+&B7n
zK>W`DJ@S8R{#xYX<Ir$L#P`u3c9Oh))Su?<!zL=~tM!<yEQ}YuE;6BsX@@R5$Cg4G
zP|(2*wP3&sSP33j1$9sl4X_#-VGT6FTJXX;SPvUuBQ%2#TA&r$pdB{BX4nE9&<TFn
X3SF=bx?wx)fB*zxr&tR0<Qsnjk*)20
diff --git a/04.系统编码/App/Content/scripts/beijing/map.js b/04.系统编码/App/Content/scripts/beijing/map.js
index b874666..7d6b7cf 100644
--- a/04.系统编码/App/Content/scripts/beijing/map.js
+++ b/04.系统编码/App/Content/scripts/beijing/map.js
@@ -90,7 +90,7 @@ var Map = function (parent) {
$('#draw-button').on('click', this.OnDrawButtonClick.bind(this));
$('#clear-button').on('click', this.OnClearButtonClick.bind(this));
$('#particle-switch a').on('click', this.OnParticleButtonClick.bind(this));
- $('#label-switch a').on('click', this.OnRemoveMarkersButtonClick.bind(this));
+ $('#label-switch').on('click', this.OnRemoveMarkersButtonClick.bind(this));
$('.control-btn-groups .control-item').find('.icon').on('click', this.OnItemClick.bind(this));
};
@@ -167,6 +167,7 @@ var Map = function (parent) {
this.OnRemoveMarkersButtonClick = function () {
var parent = $(event.target).parent();
parent.toggleClass('switch-on');
+ console.log(this.currentButton.tagSelected)
if (!parent.hasClass('switch-on')) {
$('.point').hide();
@@ -656,6 +657,7 @@ var Map = function (parent) {
};
this.InitCapture = function () {
+ console.log(this.currentButton.exportSelected)
Init();
$('#capture-button').on('click', function () {
var returned = Capture();
diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css
index 882f15a..88ecdcc 100644
--- a/04.系统编码/App/Content/styles/common.css
+++ b/04.系统编码/App/Content/styles/common.css
@@ -845,7 +845,7 @@
}
.control-btn-groups .control-item {
- margin-bottom: 10px;
+ margin-bottom: 6px;
display: flex;
align-items: center;
}
@@ -869,10 +869,10 @@
margin-top: 8px;
}
-.control-btn-groups .control-item span.text {
+.control-btn-groups .control-item .text {
line-height: 34px;
margin-left: 10px;
- padding: 0 10px;
+ padding: 0 6px;
border-radius: 5px;
color: #ffffff;
opacity: 0;
diff --git a/04.系统编码/App/Views/Beijing/Index.cshtml b/04.系统编码/App/Views/Beijing/Index.cshtml
index bc40e6d..a9bd9ea 100644
--- a/04.系统编码/App/Views/Beijing/Index.cshtml
+++ b/04.系统编码/App/Views/Beijing/Index.cshtml
@@ -8,63 +8,64 @@
<link href="~/Content/thirds/leaflet.draw-0.4.14/leaflet.draw.css" rel="stylesheet" />
}
-<div class="main">
- <div class="map" id="map"></div>
- @*<div class="switch particle-switch" id="particle-switch">
+ <div class="main">
+ <div class="map" id="map"></div>
+ @*<div class="switch particle-switch" id="particle-switch">
风场粒子<a href="javascript:;"></a>
</div>*@
- <div class="control-btns">
- <a id="select-point-button" class="select-point btn">鼠标选点...</a>
- <a id="mark-button" class="info-mark btn">信息点标绘...</a>
- <a id="draw-button" class="draw btn">画线...</a>
- <a id="clear-button" class="clear-btn btn">清除...</a>
- </div>
- <div class="switch switch-on label-switch" id="label-switch">
- 时间标签<a href="javascript:;"></a>
- </div>
- <a id="capture-button" class="export btn">导出图片...</a>
- <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>
- <span class="latlng"></span>
+ @*<div class="control-btns">
+ <a id="select-point-button" class="select-point btn">鼠标选点...</a>
+ <a id="mark-button" class="info-mark btn">信息点标绘...</a>
+ <a id="draw-button" class="draw btn">画线...</a>
+ <a id="clear-button" class="clear-btn btn">清除...</a>
+ </div>
+ <div class="switch switch-on label-switch" id="label-switch">
+ 时间标签<a href="javascript:;"></a>
+ </div>
+ <a id="capture-button" class="export btn">导出图片...</a>*@
+ <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>
+ <span class="latlng"></span>
- <div class="control-btn-groups">
- <div class="control-item">
- <span title="鼠标选点" class="icon" name="cursor-select" index="0">
- <img src="~/Content/images/control-select.png" />
- </span>
- <span class="text">鼠标选点...</span>
- </div>
- <div class="control-item">
- <span title="信息点标绘" class="icon" name="point-mark" index="1">
- <img src="~/Content/images/control-mark.png" />
- </span>
- <span class="text">信息点标绘...</span>
- </div>
- <div class="control-item">
- <span title="画线" class="icon" name="draw-line" index="2">
- <img src="~/Content/images/control-draw-line.png" />
- </span>
- <span class="text">画线...</span>
- </div>
- <div class="control-item control-clear-item">
- <span title="清除" class="icon" name="clear" index="3">
- <img src="~/Content/images/control-clear.png" />
- </span>
- <span class="text">清除...</span>
- </div>
- <div class="control-item control-tag-item">
- <span title="时间标签" class="icon" name="tag" index="4">
- <img src="~/Content/images/control-tag.png" />
- </span>
- <span class="text">时间标签...</span>
- </div>
- <div class="control-item">
- <span title="导出图片" class="icon" name="export" index="5">
- <img src="~/Content/images/control-export.png" />
- </span>
- <span class="text">导出图片...</span>
+ <div class="control-btn-groups">
+ <div class="control-item">
+ <span title="鼠标选点" class="icon" name="cursor-select" index="0">
+ <img src="~/Content/images/control-select.png" />
+ </span>
+ <span class="text">鼠标选点...</span>
+ </div>
+ <div class="control-item">
+ <span title="信息点标绘" class="icon" name="point-mark" index="1">
+ <img src="~/Content/images/control-mark.png" />
+ </span>
+ <span class="text">信息点标绘...</span>
+ </div>
+ <div class="control-item">
+ <span title="画线" class="icon" name="draw-line" index="2">
+ <img src="~/Content/images/control-draw-line.png" />
+ </span>
+ <span class="text">画线...</span>
+ </div>
+ <div class="control-item control-clear-item">
+ <span title="清除" class="icon" name="clear" index="3">
+ <img src="~/Content/images/control-clear.png" />
+ </span>
+ <span class="text">清除...</span>
+ </div>
+ <div class="control-item control-tag-item">
+ <span title="时间标签" class="icon" name="tag" index="4">
+ <img src="~/Content/images/control-tag.png" />
+ </span>
+ <span class="text" id="label-switch">时间标签...</span>
+ </div>
+ <div class="control-item">
+ <span title="导出图片" class="icon" name="export" index="5">
+ <img src="~/Content/images/control-export.png" />
+ </span>
+ <span class="text" id="capture-button">导出图片...</span>
+ <a href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" id="download-img-button" title="安装成功后，手动刷新本页面">安装插件...</a>
+ </div>
</div>
</div>
-</div>
<div class="right">
<div class="right-title clearfix">
diff --git a/04.系统编码/App/Views/Menggu/Index.cshtml b/04.系统编码/App/Views/Menggu/Index.cshtml
index 9e4491a..eb9a9ed 100644
--- a/04.系统编码/App/Views/Menggu/Index.cshtml
+++ b/04.系统编码/App/Views/Menggu/Index.cshtml
@@ -9,7 +9,7 @@
<div class="main">
<div class="map" id="map"></div>
- <div class="switch particle-switch" id="particle-switch" style="display:none;">
+ @*<div class="switch particle-switch" id="particle-switch" style="display:none;">
风场粒子<a href="javascript:;"></a>
</div>
<div class="switch switch-on label-switch" id="label-switch">
@@ -22,7 +22,7 @@
<a id="clear-button" class="clear-btn btn">清除...</a>
</div>
<a id="capture-button" class="export btn">导出图片...</a>
- <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>
+ <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>*@
<span class="latlng"></span>
<div class="control-btn-groups">
@@ -61,6 +61,7 @@
<img src="~/Content/images/control-export.png" />
</span>
<span class="text">导出图片...</span>
+ <a href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" id="download-img-button" title="安装成功后，手动刷新本页面">安装插件...</a>
</div>
</div>
</div>