VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

еще мелкие исправления

Browse Source
This commit is contained in:
Vladislav Ostapov
2024-10-31 17:52:30 +03:00
parent 0a4ac1f32a
commit 8cb2e88ba5
2 changed files with 108 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
static/main.html
View File

@@ -133,15 +133,15 @@
</tbody>
</table>
</div>
<div>
<div v-if="isCinC === true">
<h2>Статистика режима CinC</h2>
<table>
<tbody>
<tr><th>ОСС</th><td class="value-bad">indcator</td></tr>
<tr><th>Захват коррелятора</th><td class="value-bad"><span :class="{ indicator: true }"></span> bool</td></tr>
<tr><th>Кол-во срывов коррелятора</th><td class="value-bad">indcator</td></tr>
<tr><th>Грубая/точная част. ошибка, Гц</th><td class="value-bad">indcator/indicator</td></tr>
<tr><th>Задержка в канале, мс</th><td class="value-bad">indcator</td></tr>
<tr><th>ОСС</th><td>{{ stat_cinc.occ }}</td></tr>
<tr><th>Захват коррелятора</th><td><span :class="{ indicator_bad: stat_cinc.correlator === true, indicator_good: stat_cinc.correlator === false, indicator: true }"></span></td></tr>
<tr><th>Кол-во срывов коррелятора</th><td>{{ stat_cinc.correlatorFails }}</td></tr>
<tr><th>Грубая/точная част. ошибка, Гц</th><td>{{ stat_cinc.freqErr }} / {{ stat_cinc.freqErrAcc }}</td></tr>
<tr><th>Задержка в канале, мс</th><td>{{ stat_cinc.channelDelay }}</td></tr>
</tbody>
</table>
</div>
@@ -149,9 +149,9 @@
<h2>Состояние устройства</h2>
<table>
<tbody>
<tr><th>Температура ADRV</th><td class="value-bad">indcator °C</td></tr>
<tr><th>Температура ZYNC</th><td class="value-bad">indcator °C</td></tr>
<tr><th>Температура FPGA</th><td class="value-bad">indcator °C</td></tr>
<tr><th>Температура ADRV</th><td>{{ stat_device.adrv }} °C</td></tr>
<tr><th>Температура ZYNC</th><td>{{ stat_device.zync }} °C</td></tr>
<tr><th>Температура FPGA</th><td>{{ stat_device.fpga }} °C</td></tr>
</tbody>
</table>
</div>
@@ -214,6 +214,8 @@
const app = new Vue({
el: '#app',
data: {
isCinC: null,
stat_rx: {
// индикаторы
state: '?', // общее состояние
@@ -245,7 +247,10 @@
},
stat_cinc: {
occ: '?',
correlator: null,
correlatorFails: '?',
freqErr: '?', freqErrAcc: '?',
channelDelay: '?'
},
stat_device: { // температурные датчики
adrv: 0, zync: 0, fpga: 0
@@ -258,6 +263,7 @@
methods: {
updateMainState(vals) {
this.lastUpdateTime = new Date();
this.isCinC = vals["mainState"]["isCinC"]
this.stat_rx.state = vals["mainState"]["rx.state"]
this.stat_rx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
@@ -288,6 +294,17 @@
this.stat_tx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
this.stat_tx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
this.stat_cinc.occ = vals["mainState"]["cinc.occ"]
this.stat_cinc.correlator = vals["mainState"]["cinc.correlator"]
this.stat_cinc.correlatorFails = vals["mainState"]["cinc.correlatorFails"]
this.stat_cinc.freqErr = vals["mainState"]["cinc.freqErr"]
this.stat_cinc.freqErrAcc = vals["mainState"]["cinc.freqErrAcc"]
this.stat_cinc.channelDelay = vals["mainState"]["cinc.channelDelay"]
this.stat_device.adrv = vals["mainState"]["device.adrv"]
this.stat_device.zync = vals["mainState"]["device.zync"]
this.stat_device.fpga = vals["mainState"]["device.fpga"]
this.testState = vals["mainState"]["testState"]
}
},
@@ -295,11 +312,13 @@
const doFetch = async () => {
let d = await fetch("/api/mainStatistics")
this.updateMainState(await d.json())
setTimeout(() => {
doFetch()
}, 1000)
}
doFetch().then(() => {
setInterval(() => { doFetch().then(() => {}) }, 1000);
});
doFetch().then(() => {})
document.getElementById("app").removeAttribute("hidden")
}