From 1a45c089ba3485cb16c8e2bb0e5cd4a1206dbbb4 Mon Sep 17 00:00:00 2001 From: hehongxing Date: Sat, 18 Feb 2023 16:56:22 +0800 Subject: [PATCH] commit --- 04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 161792 -> 167424 bytes .../v15/Server/sqlite3/storage.ide-shm | Bin 32768 -> 32768 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 1915832 -> 2146552 bytes .../Content/scripts/beijing/realtime-panel.js | 8 ---- .../Content/scripts/menggu/realtime-panel.js | 41 +++++++++++------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index ef65bf6a9d1b939bacd3eb4eef61e83108c84795..cd3699926f274be4417564a93108f78c46296c0d 100644 GIT binary patch delta 2059 zcmY+FU2s!H6vywLq##_BN%pmP(6*g$IxdB8X^HxE*1J z(Kx<1Lm%i}$9+&otQb)l6@uhRO|3%t5UWo*;{y-ksKZDfr~(41VHw zbo|UdMm)?9QV*Y08|kXT|EBe70Ad!vJPH0oQAL&qomPI(vQAwBZ$(DP8%HN%!vjs` z%O=O(g_R2_<7{~$E0xc&kh8rwomK_AhNXtcw7F)5UI-SZ^Ny#jjDHBfC^?;5K2L^v zSr)?__oDf^*V$M|HJu%r0zt`3kCKaLU-1!jJ)fjT_9dTH`&2nqSw;dkv_6eVRlZo- zF0vkQ|O!qO7w2Eh0KZ$jmgp$fVmuQRA2&X}ajw<^lIN!;R z&#^_D%aD^N_}h*hW&svehj1xKir8sx6ill%5Ssrd7LJ;}4tcz|;p}fxc|f#G}k^_D|Wf z(Ye1S{S3;|e@T^Ba9Kt`eFGi&t+I`8{MD?S;!{+|PVm{v%X0M&IYKTDEtY6uOdSjD zWgn%kkG)dfs`&`L4M%-}sX^I`{ zJeiG_RBu3Kl~5`&Rig}*Yg~h>b7vr$a&dBS%#D?)n(F(l%+7BW^=M4P$fAtVBD{)O z`GNWCH0Ddo4_;T?ugc#jxjpwqW5MY7#uG0SRxh{J0&4|Xzy{_4JIDq(zyVaCfn1OW zoFE?*fI{E`MPLDt?%aFl-ypK|2V74zLz`?8?$eJrNIn z>WO)(m`4-(8j45!j3PQ&BdcJ$$i^7{JPKp3R<_H=_KG||J#DkKD^3^4<$r+JL!?#)tv7gx-&Avy|q5!*+y=0^hFx{58L~vp#T5? delta 1145 zcmbVLUu;ZW5I-|}Tia^4yQO-47A=uBtL4U0e?GQ%w~OtzXyQ*R5mF^-#Yb0J;p?Z@ zi+B-suXN(S-pFd=L1M#|h`1&3h!7qGK|FY%@gzL3=2V;X!P7Son0*#Y-9NOd>gz-Gm4#tN4=Ix)K!Q_#neBa+8q zKiDc`J(V#^=R9o7&y|nkO4u%7OdI8@SQj!BMv!yL_{nVh7}Bm_J&XBL)|CvIM@qG< zu9%4_?3AR+_K0V6b4wp1dqvp-)-1HVXnEXe^&4!?epe@erFyNu&1$9wQ=%auU4b=u4>=ivs3g4+rJh*fE9OVVw`@%hfEwWvkZ!EHN$Cuqm*lcHS~TB z%wT^ZSrg!uIs9BTe}466y&c+9(u3g0dW&y!7i4RZ->{GBV-U>L0p3~$Zp^x)-{7j= zikMjr2p)nElojTQ{IKZe^^)F2U?Y`8pon%YhbcCN;3nWlq{DYV?L!opSRa@2Zqsyv8GPa^_>#NYovyBKI z0iFuqL?I?|Iz>D%k1pPupX}OsuxAT}|G`9s9F#GU6MKX)HvEz&UjxpUe*&$D;EKGq z$2^{9DlwhjE`k~T39L4swoWein*-#C4N__!9+1t+rQ_`nTe7 zy4i^H;5zetG#tZv7^#VhJJ3T_FE|y*O*ekc=9kBI7Xu$uPA7Fb>9i?SMbgNW1wwLkl#qHkgi90lWNOtH zS)bi-`D4>IvtyYHzx%)XZ*$o+()aTZe(scb7iT&dk86tf6fDGdxoNhU7X?y4~XLfpHNdB6-&ddz`l%9D2yX6 l=>0guH6HN>P1-+Stc^A@)d2!hk|%N;7KX@o@UhAH+%F!Wmy7@a delta 290 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 N`fm)Y6t{M;{{jS0LxlhU delta 68 zcmV~$$rVFT006*ek8FhOs6<-|kY`HD;djQ-%=TNNuuii`ERo9O3J0a5le3GfO6{i6 Qx_fwfdHeY4^#37@J25yGYXATM diff --git a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js b/04.系统编码/App/Content/scripts/beijing/realtime-panel.js index 87dc030..8c0bb84 100644 --- a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js +++ b/04.系统编码/App/Content/scripts/beijing/realtime-panel.js @@ -503,14 +503,6 @@ } $('#lng-degree-text, #lat-degree-text').removeClass('degree-text-error'); - //if ($(event.target).val().trim() === '' || value1.val().trim() === '' || value2.val().trim() === '' || $(event.target).val() > maxNumber || $(event.target).val() < 0) { - // $('#lng-degree-text').text('请输入正确的值。'); - // $('#lat-degree-text').addClass('degree-text-error'); - // $('#lng-degree-text').text('请输入正确的值。'); - // $('#lat-degree-text').addClass('degree-text-error'); - // return; - //} - if ($(event.target).attr('id') === 'lng-degree') $('#lng-degree-text').text(this.getLngLatDegree($(event.target).val(), value1.val(), value2.val())); else if ($(event.target).attr('id') === 'lng-minute') diff --git a/04.系统编码/App/Content/scripts/menggu/realtime-panel.js b/04.系统编码/App/Content/scripts/menggu/realtime-panel.js index 86cddde..8caa067 100644 --- a/04.系统编码/App/Content/scripts/menggu/realtime-panel.js +++ b/04.系统编码/App/Content/scripts/menggu/realtime-panel.js @@ -324,24 +324,33 @@ }; this.InputChange = function () { - $('#lng-degree').on('change', this.checkInput.bind(this, $('#lng-minute'), $('#lng-second'), 180)); - $('#lng-minute').on('change', this.checkInput.bind(this, $('#lng-degree'), $('#lng-second'), 60)); - $('#lng-second').on('change', this.checkInput.bind(this, $('#lng-degree'), $('#lng-minute'), 60)); + $('#lng-degree').on('change', this.checkInput.bind(this, $('#lng-minute'), $('#lng-second'), 180, 'lng')); + $('#lng-minute').on('change', this.checkInput.bind(this, $('#lng-degree'), $('#lng-second'), 60, 'lng')); + $('#lng-second').on('change', this.checkInput.bind(this, $('#lng-degree'), $('#lng-minute'), 60, 'lng')); - $('#lat-degree').on('change', this.checkInput.bind(this, $('#lat-minute'), $('#lng-second'), 180)); - $('#lat-minute').on('change', this.checkInput.bind(this, $('#lat-degree'), $('#lng-second'), 60)); - $('#lat-second').on('change', this.checkInput.bind(this, $('#lat-degree'), $('#lng-minute'), 60)); + $('#lat-degree').on('change', this.checkInput.bind(this, $('#lat-minute'), $('#lng-second'), 180, 'lat')); + $('#lat-minute').on('change', this.checkInput.bind(this, $('#lat-degree'), $('#lng-second'), 60, 'lat')); + $('#lat-second').on('change', this.checkInput.bind(this, $('#lat-degree'), $('#lng-minute'), 60, 'lat')); }; - this.checkInput = function (value1, value2, maxNumber, event) { - $('#lng-degree-text').text(''); - $('#lng-degree-text').removeClass('degree-text-error'); - if ($(event.target).val().trim() === '' || value1.val().trim() === '' || value2.val().trim() === '' || $(event.target).val() > maxNumber || $(event.target).val() < 0) { - $('#lng-degree-text').text('请输入正确的值。'); - $('#lng-degree-text').addClass('degree-text-error'); - return; + this.checkInput = function (value1, value2, maxNumber, type, event) { + if (type === 'lng') { + $('#lng-degree-text').text(''); + if ($(event.target).val().trim() === '' || value1.val().trim() === '' || value2.val().trim() === '' || $(event.target).val() > maxNumber || $(event.target).val() < 0) { + $('#lng-degree-text').text('请输入正确的值。'); + $('#lng-degree-text').addClass('degree-text-error'); + return; + } + } else { + $('#lat-degree-text').text(''); + if ($(event.target).val().trim() === '' || value1.val().trim() === '' || value2.val().trim() === '' || $(event.target).val() > maxNumber || $(event.target).val() < 0) { + $('#lat-degree-text').text('请输入正确的值。'); + $('#lat-degree-text').addClass('degree-text-error'); + return; + } } + $('#lng-degree-text, #lat-degree-text').removeClass('degree-text-error'); if ($(event.target).attr('id') === 'lng-degree') $('#lng-degree-text').text(this.getLngLat($(event.target).val(), value1.val(), value2.val())); else if ($(event.target).attr('id') === 'lng-minute') @@ -349,10 +358,10 @@ else if ($(event.target).attr('id') === 'lng-second') $('#lng-degree-text').text(this.getLngLat(value1.val(), value2.val(), $(event.target).val())); else if ($(event.target).attr('id') === 'lat-degree') - $('#lng-degree-text').text(this.getLngLat($(event.target).val(), value1.val(), value2.val())); + $('#lat-degree-text').text(this.getLngLat($(event.target).val(), value1.val(), value2.val())); else if ($(event.target).attr('id') === 'lat-minute') - $('#lng-degree-text').text(this.getLngLat(value1.val(), $(event.target).val(), value2.val())); + $('#lat-degree-text').text(this.getLngLat(value1.val(), $(event.target).val(), value2.val())); else if ($(event.target).attr('id') === 'lat-second') - $('#lng-degree-text').text(this.getLngLat(value1.val(), value2.val(), $(event.target).val())); + $('#lat-degree-text').text(this.getLngLat(value1.val(), value2.val(), $(event.target).val())); }; }; \ No newline at end of file