From 6555c272ed6dc82b12a6c0249e2f98cdb46a01e9 Mon Sep 17 00:00:00 2001 From: hhx <1284857778@qq.com> Date: Sat, 15 Jan 2022 20:13:29 +0800 Subject: [PATCH] commit --- 04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 204800 -> 203264 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 4157112 -> 4157112 bytes .../App/Content/scripts/beijing/info-point.js | 9 ++++-- .../App/Content/scripts/beijing/map.js | 26 ++++++++++-------- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 2907deaa1f3b178f9571ba6636b55efe1c08197f..5614d2a436c117d4365ccc36907b3679300cfe91 100644 GIT binary patch delta 1991 zcmYk-ZBSHI7zc2kXP0GJ76e&XMO=|g0dYlqV^9f!9J5kHQ$$2v@m+Dn^_>Kn2Fs9; zV;wP@(HnEe4>f~(&C`@lq)j>F2hD6EN6E3t8nwo0$Qo0&{}nOL%x}(f-kx*s-E;TW zbvWxzIh(W6IqYeP4GVK1v_elP6f%1)umBPuNi4tn@=1R=1^E>#rHSD@EVB6K{tXsK zCoL3PdA2A_A1Au`k~q)fZ0iXt$B2g!Nwt|+JQa{LG!*q@hyy3sArH*4*RUi5aX1Wt zC>Rfq%|Vp6FkXQ60@P+-Hsawh3eq4Rk^%P-HV9Gx(>$Tk2nN7BNQG#aizHJ}_lT4B zA+__-GPmd}9*ivP*Ea+0=V3lP2eV*0l)zlbfnv-bhWZ64gppw8d+}-Am%FrI-h7PV zS=WZ9A&7iB(Y&`sh_f*<0Tv@Jhb2$}OJN!Kz)ZRVbtSBXRj?Y?z*<-b>tO?Igeuqs ze%K8AAQTd-?oMhcvm18D1&g>GmDLhc7#)V4pFB!)3$fQTLIh$iML*fl{Neg~jlh6L zo91P0kW-t*+DKb8VIhMBBE|A>cY*^^6gVLoV!&mNw3JyXLwtL8>_PtsnuMMq38lzA z9^(^WBDm3>jwz#QcJD-M+#GZdM0YxrAf6`EF$8h9P{KrPgXlTq^iEt!SU zWR6+-%@KjjIpTclIHP-)leF0m?GS5ao}jOYtlKe7EE|;~ve@}yKvH-Gwhf7$hc7zK zEaux_*1f-L>wLTUO7wLY-K|az?ulh1_Gl$hnb`Wl+reXn)O!Ja#~Mr1#E#={26xOP zdt$%kBH%7|nrAGge`mKl(@1Gxn`nzqHu7rDkygiAvrVgK?XXk3z?z3!8d8ju#+#)5 z#^@GpP02=b(=TLDTZptEYk$OQjVw}cOcnWE6AXV(bDVZHCRkHQM&Yk#)19DETH)Ha{kp%p?9( z6koK9iW@d{znBJEWMwY3$wzl6M|D+EszvvbT?YT5kKUU`52Uu6DrELgHJU5;+>HiU1 zTq~fFBySNX%X}+4rN_#4mDNI*Eu!UWg{mkbjbyc*GbC~(s~Lysvj}|#IZo?jwJB>m zJ+kO!6svcTOYbDsk6`x_ADvJqu2X5aEO7Hc>2xD!(owo?(Qji)JEr(@Nq>5ecPN!) zeG!$&oTW5V9SPDZlKxIgQc0b3n`DQZJ<{)^{p!R$DjlppAcxf6r&%)g5GAT*Ha=#N zO$R6_AGV@>!NoZdvVi!^Cug`QQdHmaNKZ1?iQ?*1)seyZqIEgUXWF7h<9d78fH9rtYGI5}-Ar>Sl~|IO5InK~Ze*6_H&IJUhdv%~zfjFmSp z@Qx?x6w;+rV*RsEX4Tnd#OBAUs5gwaU2F zoG8!M^AuJ59k;Vq#WYJ%1BcwI>343Am)-mDZGCl<2e1B1>f@o7$s{W8&OGS%={Ae& EKUa2W7ytkO delta 1828 zcmZXVe^69a6vy|Rx4S%Gtp%4A1eX;NfoNNl$QWS|Hd9d9$jlg|Kr1mrYBzuMLskaS z8bsJzUagtNHhM#i4#cxiU2IGN#hgSG;UZojQb-fVvUMl@VSNGwn#*I^@U$1@d}9~*jCz0B zQV_S1Oiju9Es4y%%gIimo!#1%CR?Ki!@VVkbYD}BZy03GX|B$Y$4a!|OVaz-JHVix zn*G1iD;j(@(QC<{2Ae6aele4ob*+?TFV!eyJ!?g|*OCFO_9L@wUKl3I)|OTfw@y)q zKThfn3ee)spJ57b+KcmffMJsC$@7Hzs(^XYP5k3t9Oi!tLKF`iM3bDd@?xmh-3fE$ zE_Xh7DYIB|dzQbBZaFnObHBVwe1uZpZ|*B9w@<#at`L}GMW;8?Dq9-{!N0?ZvaxXl zeEX3u#ZKzeAH0UN3S?_N>g9yi0pP23LYy3T#Zy0?Su zKF|>EYs2x;Kh)IJi5bS5QYS#m*RG`|n76-JE9t#k~m(x+s9p{(9nXi+Sm!!_W=70{}* zUV=5candL1x$iOAT!|Au6!mi}`6jZC@A%cTxSKb=k2gB% z5u$l*8kqRLY)t0H+nC5H?-eCCAA2IDb_@%1&d_M4)45O$@2S8JK6n=Q@S<+C!GDRK zJ>l zF+$*3@1j8$ugdtoGq{Z(a-ojrc4Ia-{D{NmjrYgp?Ak)U`aZokE``RmQLi|E#x{hd z3e@9Y!0Se_P8r&R=BSPlY@4nmXoU>m{W~!gR`dST^lq}%qCWn4ce%UL<*r<}xT<{9 zc2}jVbeTFKy4VKyo13O6BOX%nqBqcKR{vHshsG*?c%q|Qb=Boi)X}chsedVVo6F=1}&?ZcD!Y){<*q~)SQSdJ)uxlv* diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 2af65d7969b3263a241ed99d225dfc8b789bdf9d..db412654a532800fef6ae6eded086b2aa91cf519 100644 GIT binary patch delta 9842 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 delta 3107 zcmcJR4Nwzj8prqDY?4hjn*{QQo4Cqy>R8d4)J!r97K@q%nu_&?EJDqDc^Uuug zPIlkt|NB4Bo91&PpqVHi0!Tv%WS|tvpd7ML0hN%0D#$}M)Icq?gZ6L|)IkS08BT$Y z&1#)3LGu8`K5KAWjzBYP(uu8wyJMFV#|yl8frcyBI?Mta#ICXHDaQ(5EV zfm+)p8Bxj`j`q0pRzN)sPFL3WZ9tkPxehlZ$W0QT2d}Fy&41Om%*&al+bJoSL4g_S zk2$NXPYN;cA|Gt865a-kyq|7F!04Zkvm%9Qv`V>Ny6$&77ljw3nG;Yo&!wRQFFm0{ zU6HEqXmdQ;=Ajy4c#EVPrRGjaLwEnh=}@qp(+}htor%g$8k3QGNJtGi1txT8#pE>9 zFzlj37urMUGFe`bRu$fkZNq*BEClbC{d^AhBFDkM!8l0xkYb~-V%tFE}=X&>!k zyO6DkD8KW`^Ap_REwZO<^YL4`GnSB}{5=1b)}RENgq$5qh%NRC)AXL64sNF{c1aL( z+oo)0!=snoC9zN@F%ua~$us6ebj{b8{2x8So+BYkWw@6Wx__2)&uF8THLtb5ap&v> z9V)8;F490Tu4qpMmc^)J*czY;z*{&N9cKfmXdYScsEu7{3N=$nKTha(d@KA1gv%^3%vOFq@SJ1TX>ha!OI z)k^WP*(e+ZHa`-BIQ+g&xVs)cBsT+WkyaL5FS?uMj9H z)lM-psdhe|+pjbsGNM1hreGmmf?=g_lVQkGqJKGih-5DSU7Hs$4_zDy@kMr_-p(kl zC`^Yow`nw3J4e_e^?C5(O$z6y2P7M7c-}%uKn%rML5zC%0a`?M2Zx^=JpcEg7#0VI z30**3L@c&jVow8fxjb?KQvl3Kh@2-^CeE+*6WtUwUS6Z!`eh5xrd<_F7LWgq=X{P; zzNF&aUX)@Hykz2&C>jsc>c7?KzPnPgd^oTFw1_29ttEFr7V6upZ;}|*|EoRfNPEyM zx76j*^|P=4>9N}4+=R9$5wawjzrIgpB>dykSH!%@>F4mQa^a2!y*b^$yJ@PbSACzG z(9RQva)NRkBwH#kmZ9Kny17W}1#<2o6@BbM<&3ZeSHB>S1x!JP`GtG?W!zClhx%p0 zAh>Vr4t#|b*2pK|v;V%oWMrfL9uXhSSqVP%@c)g^^I?3^`EfnVw<{NuV#NdCpbG)F zHOTqBFf|){^Nq~v+*~*T7WfI)kyGESJUTSE!ls7^tY#eECPecf5npZ94*?Y0Xi!f( z@YLYiy6fAsY2`jjp(qw#lc>p4pHMpRIjU}Dt13iM%>7w53zwZ^53p$9qPCb+O))<<iQ3pJm0mFLJ#$^xY8n6H>1Ng;ino{221wg|<2Y50QH{0+IEGSp#< zoAwV9wAW3$6&*ZmP~&7*?E-*DI}Nog+ZFN6`mEjst=Kfl@P!PV5SPETa#YWwypQO5 zT;gK5EJwR;7}V^NookOTPW6tk87p0QW1IV1oc-9+EAvb%nyUwvDydOw3Njpb4`!%Q z@UA#aJkXVc9(7wjkH{Z03%%Ix4w2_wb_YtCtaZRIwRz;IkV!=*>$$6}22D#3t9HE7 zva0Y%!-b1Vb~B};nknu!_eYviTF~*BU{6}nkCjqmI!n{8_*$04kwzUu@*UWyHGaT2 zm_*yh=fGi5IjgBV?j0O85HQGr32jws)n`dOpZMgnHJ7{h)`-2s+VqahiLuIy#q~Ge z>m2d_<68{bU>|B3Oj_n;Md7G5fJh+H6B&q%M1e#>M8QNMMAM085X~eCC7MMvn<$Lv SNuoJK;Y1O5)Ec?}oqq$nns>7R diff --git a/04.系统编码/App/Content/scripts/beijing/info-point.js b/04.系统编码/App/Content/scripts/beijing/info-point.js index b17165f..86dfe65 100644 --- a/04.系统编码/App/Content/scripts/beijing/info-point.js +++ b/04.系统编码/App/Content/scripts/beijing/info-point.js @@ -25,7 +25,10 @@ this.ShowDialog = function (point) { this.Point = point; $('#dialog-info-point').show(); - $("#title").textbox('setValue', '') + $("#title").textbox('setValue', ''); + + $('.icon-view .icon-col').removeClass("active"); + $('.icon-view .icon-col').eq(0).addClass("active"); }; this.OnSureClick = function () { @@ -43,7 +46,9 @@ url: '/Point/Add', data: { Title: $("#title").textbox('getValue'), - Icon: $('.icon-view .active').attr('name') + Icon: $('.icon-view .active').attr('name'), + Longitude: this.Point.lng, + Latitude: this.Point.lat }, 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 976f1cb..b4fb904 100644 --- a/04.系统编码/App/Content/scripts/beijing/map.js +++ b/04.系统编码/App/Content/scripts/beijing/map.js @@ -630,7 +630,14 @@ var Map = function (parent) { dataType: 'text', url: '/Point/Query', success: function (result) { - console.log(result) + var data = JSON.parse(result); + data.forEach(function (item, index) { + var point = { + lat: item.Latitude, + lng: item.Longitude + }; + this.AddInfoPoint(point, item.Title, item.Icon, item.Id) + }.bind(this)) }.bind(this) }); }; @@ -652,22 +659,19 @@ var Map = function (parent) { }; this.AddInfoPoint = function (point, title, icon, id) { - let trans = point.lat.toString().replace('.', ''); - let label = '

{1}

'.format(trans, title, trans, icon.slice(0, 1)); + let label = '

{1}

'.format(id, title, id, icon.slice(0, 1)); L.marker([point.lat, point.lng], { icon: L.divIcon({ className: 'info-point-content', html: label }) }).addTo(this.map); - - var button = $('#close-btn{0}'.format(trans)); - button.on('click', this.RemoveInfoPoint.bind(this, trans, id)); - }; - this.RemoveInfoPoint = function (trans, id, event) { - $('.info-point{0}'.format(trans)).hide(); + var button = $('#close-btn{0}'.format(id)); + button.on('click', this.RemoveInfoPoint.bind(this, id)); + }; + this.RemoveInfoPoint = function (id, event) { $.ajax({ type: "POST", dataType: 'text', @@ -675,8 +679,8 @@ var Map = function (parent) { data: { id: id, }, - success: function (result) { - console.log(result) + success: function () { + $('.info-point{0}'.format(id)).hide(); }.bind(this) }); }