diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index ef65bf6..cd36999 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-shm b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm index 9f50272..ec2be9a 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index eb028e3..756936b 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/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