From bb1c9ee270c98f8e3ddee7387d605fd64f701b57 Mon Sep 17 00:00:00 2001 From: yxw <17074267@qq.com> Date: Fri, 24 Nov 2023 18:13:20 +0800 Subject: [PATCH] fix --- css/app.css | 2 +- home.html | 103 ++++++++++++++++++++++++++-------------------------- login.html | 34 ++++++++++++++++- 3 files changed, 85 insertions(+), 54 deletions(-) diff --git a/css/app.css b/css/app.css index e55bbfb..bc48597 100644 --- a/css/app.css +++ b/css/app.css @@ -856,5 +856,5 @@ input:disabled { } .equalizer-bar:nth-child(1) span { - background: #a7dce9; + background: #333; } \ No newline at end of file diff --git a/home.html b/home.html index b147d9a..b6bb6df 100644 --- a/home.html +++ b/home.html @@ -97,11 +97,11 @@ - - - - - + + + + +
L
@@ -130,8 +130,8 @@ - - + +
R
@@ -332,11 +332,11 @@ - - - - - + + + + +
@@ -538,11 +538,11 @@ - - - - - + + + + +
@@ -740,11 +740,11 @@ - - - - - + + + + +
L
@@ -773,8 +773,8 @@ - - + +
R
@@ -1254,12 +1254,15 @@ else if (module == 'mic1') { data.mic1 = resData.content.mic1 mic1Value = data.mic1.audio.toFixed(1) + $("input[name='mic1']").attr('checked', data.mic1.signal == 'open') + Microphone1Slider(mic1Value) mic1Post = false } else if (module == 'mic2') { data.mic2 = resData.content.mic2 mic2Value = data.mic2.audio.toFixed(1) + $("input[name='mic2']").attr('checked', data.mic2.signal == 'open') Microphone2Slider(mic2Value) mic2Post = false } @@ -1303,35 +1306,35 @@ } }, error: function () { - // data = { - // lineinput: { - // signal: "analog", - // audio: -30, - // state: "open" - // }, - // mic1: { - // signal: "open", - // audio: -5, - // state: "open" - // }, - // mic2: { - // signal: "open", - // audio: 5, - // state: "open" - // }, - // output: { - // signal: "open", - // audio: 3, - // state: "open" - // } - // } + data = { + lineinput: { + signal: "analog", + audio: -30, + state: "open" + }, + mic1: { + signal: "open", + audio: -5, + state: "open" + }, + mic2: { + signal: "close", + audio: 5, + state: "open" + }, + output: { + signal: "open", + audio: 3, + state: "open" + } + } // lineinputValue = data.lineinput.audio // mic1Value = data.mic1.audio // mic2Value = data.mic2.audio // outputValue = data.output.audio - // bindData() + bindData() } }) @@ -1341,10 +1344,8 @@ function bindData() { $("input[name='lineinput']").val([`${data.lineinput.signal}`]) - $("input[name='mic1']").attr('checked', 'open') - $("input[name='mic2']").attr('checked', 'open') - // $("input[name='mic1']").attr('checked', data.mic1.signal == 'open') - // $("input[name='mic2']").attr('checked', data.mic2.signal == 'open') + $("input[name='mic1']").attr('checked', data.mic1.signal == 'open') + $("input[name='mic2']").attr('checked', data.mic2.signal == 'open') $("input[name='outputvolume-voice-close']").attr('checked', data.output.state == 'close') $("input[name='microphone2-voice-close']").attr('checked', data.mic2.state == 'close') $("input[name='microphone1-voice-close']").attr('checked', data.mic1.state == 'close') diff --git a/login.html b/login.html index 3887ec0..02d9231 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
@@ -62,6 +62,7 @@ document.addEventListener("DOMContentLoaded", function () { //初始化配置 + loadData() }) $(document).ready(function () { @@ -103,6 +104,35 @@ }) }) }) + + + function loadData() { + let url = "http://192.168.0.116/cgi-bin/test.cgi?action=system_get" + $.ajax({ + type: "GET", + url: url, + success: function (res) { + data = res.content + bindData() + }, + error: function () { + data = { + gui: "v1.0.2", + firmware: "v1.0.0", + sn: "SN-2343-123-NNDD", + hostname: "Test.Hostname" + } + bindData() + } + }) + } + + function bindData() { + $("#guiv").text(`${data.gui}`) + $("#firmwarev").text(`${data.firmware}`) + $("#sn").text(`${data.sn}`) + $("#hostName").text(`${data.hostname}`) + }