Skip to content

Commit 3e3804d

Browse files
committed
[fix]Repair the temperature display
1 parent 3acd546 commit 3e3804d

2 files changed

Lines changed: 33 additions & 14 deletions

File tree

js/settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ function checkUpdate() {
6969
// 检查document.getElementById("frontversion")是否一致
7070
if ($("#frontversion").text() != frontversion) {
7171
versioninfo += "前端版本有更新,版本号:" + frontversion + "<br>";
72+
$("#flushFront-button").attr("disabled", false);
7273
}
7374
if ($("#backendversion").text() == "Docker") {
7475
versioninfo += "当前为Docker环境,无法检查后端更新<br>";
75-
$("#flushFront-button").attr("disabled", false);
7676
} else if ($("#backendversion").text() != backendversion) {
7777
versioninfo += "后端版本有更新,版本号:" + backendversion + "<br>";
7878
}

js/temperature.js

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ function getTp() {
9696
return
9797
}
9898
if (data.code == 0) {
99-
cputp = data.cpu_temperature / 1000
100-
w24gtp = data.w24g_temperature / 1000
101-
w5gtp = data.w5g_temperature / 1000
99+
cputp = data.cpu
100+
w24gtp = data.w24g
101+
w5gtp = data.w5g
102102
var table = document.querySelector("table");
103103
var tbody = document.getElementById("tp-list");
104104
tbody.innerHTML = "";
@@ -108,24 +108,43 @@ function getTp() {
108108
td_cputp.textContent = cputp + "°C";
109109
tr.appendChild(td_cputp);
110110

111-
var td_fanspeed = document.createElement("td");
112-
td_fanspeed.textContent = data.fanspeed
113-
tr.appendChild(td_fanspeed);
111+
if (data.fanspeed == -233) {
112+
var td_fanspeed = document.createElement("td");
113+
td_fanspeed.textContent = "不支持";
114+
tr.appendChild(td_fanspeed);
115+
}else{
116+
var td_fanspeed = document.createElement("td");
117+
td_fanspeed.textContent = w24gtp + "rpm";
118+
tr.appendChild(td_fanspeed);
119+
}
114120

115-
var td_24gtp = document.createElement("td");
116-
td_24gtp.textContent = w24gtp + "°C";
117-
tr.appendChild(td_24gtp);
121+
if (w24gtp == -233) {
122+
var td_w24gtp = document.createElement("td");
123+
td_w24gtp.textContent = "不支持";
124+
tr.appendChild(td_w24gtp);
125+
w24gtp = 0
126+
}else{
127+
var td_w24gtp = document.createElement("td");
128+
td_w24gtp.textContent = w24gtp + "°C";
129+
tr.appendChild(td_w24gtp);
130+
}
118131

119-
var td_24gtp = document.createElement("td");
120-
td_24gtp.textContent = w5gtp + "°C";
121-
tr.appendChild(td_24gtp);
132+
if (w5gtp == -233) {
133+
var td_w5gtp = document.createElement("td");
134+
td_w5gtp.textContent = "不支持";
135+
tr.appendChild(td_w5gtp);
136+
w24gtp = 0
137+
}else{
138+
var td_w5gtp = document.createElement("td");
139+
td_w5gtp.textContent = w5gtp + "°C";
140+
tr.appendChild(td_w5gtp);
141+
}
122142

123143
//将内容行添加到表格内容区域中
124144
tbody.appendChild(tr);
125145

126146
table.appendChild(tbody);
127147
addData(cputp_data, cputp)
128-
addData(cputp_data, cputp)
129148
addData(w24gtp_data, w24gtp)
130149
addData(w5gtp_data, w5gtp)
131150
drawTpChart();

0 commit comments

Comments
 (0)