diff --git a/control.html b/control.html index 9d2e5e8..a640fa1 100644 --- a/control.html +++ b/control.html @@ -23,7 +23,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
diff --git a/css/app.css b/css/app.css index bc48597..9794375 100644 --- a/css/app.css +++ b/css/app.css @@ -92,7 +92,7 @@ input[type="number"]{ .nav>div { border-left: 2px solid black; - padding: 10px 25px; + /* padding: 10px 25px; */ } .nav>div.last { @@ -120,6 +120,7 @@ input[type="number"]{ .nav a { text-decoration: none; color: #fff; + padding: 10px 25px; display: block; } diff --git a/ducking.html b/ducking.html index 27016a1..0e9c5c3 100644 --- a/ducking.html +++ b/ducking.html @@ -24,7 +24,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
@@ -440,6 +440,34 @@ releaseSlider($("#releaseslidervalue").val()) }) + + $("#threshold .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#ducklevel .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#attack .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#release .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) }) diff --git a/eq.html b/eq.html index a53022b..8dd29de 100644 --- a/eq.html +++ b/eq.html @@ -24,7 +24,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
@@ -768,6 +768,76 @@ changeInputValue('mic2state', $value) }) + $("#mic140Hz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic1150Hz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic1500Hz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic12kHz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic110kHz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic240Hz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic2150Hz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic2500Hz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic22kHz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#mic210kHz .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + $("#mic140slidervalue").change(function () { mic140Post = false mic140HzSlider($("#mic140slidervalue").val()) @@ -1399,7 +1469,7 @@ if (module == 'mic1500') { mic1500Value = data.mic1.band3.toFixed(1) mic1500HzSlider(mic1500Value) - mic1150Post = false + mic1500Post = false } if (module == 'mic12k') { mic12kValue = data.mic1.band4.toFixed(1) diff --git a/filter.html b/filter.html index 014102b..1461398 100644 --- a/filter.html +++ b/filter.html @@ -24,7 +24,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
diff --git a/fs.html b/fs.html index 2b5ac5a..38d5cbe 100644 --- a/fs.html +++ b/fs.html @@ -24,7 +24,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
diff --git a/home.html b/home.html index d9321db..c51e2da 100644 --- a/home.html +++ b/home.html @@ -27,7 +27,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
@@ -1224,6 +1224,35 @@ outputPost = false OutputVolumeSlider($("#outputsliderValue").val()) }) + + $("#lineinput .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#microphone1 .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#microphone2 .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + + $("#outputvolume .volume-slider input").keydown(function () { + if (event.keyCode == 37 || event.keyCode == 38 || event.keyCode == 39 || event.keyCode == 40) { + event.returnValue = false; + return + } + }) + }) @@ -1283,8 +1312,6 @@ }) } - - function loadData() { let url = "http://192.168.0.116/cgi-bin/test.cgi?action=home_get" $.ajax({ @@ -1394,7 +1421,12 @@ $bar.attr('style', `height:${barHeight}`) // console.log('slider', input.val()) let number = ((input.val() * (84 / 100)) - 72).toFixed(1) - $value.val(`${number}`); + if (number == '-0.0') { + $value.val(0.0); + } + else { + $value.val(`${number}`); + } //调用接口提交数据 if (number == -0) { number = 0 @@ -1413,6 +1445,7 @@ let element = $("#microphone1") let input = $("#microphone1 .volume-slider input") let value = (parseFloat(number) + 72) / (84 / 100) + input.val(value) // input.attr('value', value) // console.log(number, value, input.val()) @@ -1441,7 +1474,12 @@ $bar.attr('style', `height:${barHeight}`) let number = ((input.val() * (84 / 100)) - 72).toFixed(1) - $value.val(`${number}`); + if (number == '-0.0') { + $value.val(0.0); + } + else { + $value.val(`${number}`); + } //调用接口提交数据 if (number == -0) { number = 0 @@ -1490,7 +1528,12 @@ $bar.attr('style', `height:${barHeight}`) let number = ((input.val() * (84 / 100)) - 72).toFixed(1) - $value.val(`${number}`); + if (number == '-0.0') { + $value.val(0.0); + } + else { + $value.val(`${number}`); + } //调用接口提交数据 if (number == -0) { number = 0 @@ -1504,7 +1547,6 @@ } } - function OutputVolumeSlider(number) { let element = $('#outputvolume') @@ -1540,7 +1582,12 @@ $bar.attr('style', `height:${barHeight}`) let number = ((input.val() * (84 / 100)) - 72).toFixed(1) - $value.val(`${number}`); + if (number == '-0.0') { + $value.val(0.0); + } + else { + $value.val(`${number}`); + } //调用接口提交数据 if (number == -0) { number = 0 diff --git a/login.html b/login.html index 02d9231..54cfb88 100644 --- a/login.html +++ b/login.html @@ -37,9 +37,9 @@
-
GUI V1.0.0 +
GUI V1.0.0
-
FIRMWARE V1.0.0
+
FIRMWARE V1.0.0
@@ -92,7 +92,7 @@ //contentType: "application/json; charset=utf-8", success: function (res) { if (res.success) { - alert('登录成功') + alert('Login successful') window.location.href="/home.html" } else { diff --git a/network.html b/network.html index 60f0129..5e9ec1f 100644 --- a/network.html +++ b/network.html @@ -23,7 +23,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
diff --git a/security.html b/security.html index 9350e33..3f09db5 100644 --- a/security.html +++ b/security.html @@ -23,7 +23,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK
diff --git a/system.html b/system.html index fad55ae..35575d3 100644 --- a/system.html +++ b/system.html @@ -23,7 +23,7 @@ HOME
FILTER
-
FS
+
FS
EQ
DUCKING
NETWORK