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

фикс roll-off, фикс нечитающихся настроек сети, фикс значений на странице мониторинга, добавил авто-регулировку мощности в ШПС

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-06-05 11:15:13 +03:00
parent 1e185a987d
commit b9a25e8734
7 changed files with 129 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
static/main-scpc.html
View File

@@ -169,12 +169,12 @@
<label>
<span>Roll-off</span>
<select v-model="paramRxtx.txRolloff">
<option :value="2">0.02</option>
<option :value="5">0.05</option>
<option :value="10">0.10</option>
<option :value="15">0.15</option>
<option :value="20">0.20</option>
<option :value="25">0.25</option>
<option :value="20">0.02</option>
<option :value="50">0.05</option>
<option :value="100">0.10</option>
<option :value="150">0.15</option>
<option :value="200">0.20</option>
<option :value="250">0.25</option>
</select>
</label>
<label>
@@ -304,12 +304,12 @@
<label>
<span>Roll-off</span>
<select v-model="paramRxtx.rxRolloff">
<option :value="2">0.02</option>
<option :value="5">0.05</option>
<option :value="10">0.10</option>
<option :value="15">0.15</option>
<option :value="20">0.20</option>
<option :value="25">0.25</option>
<option :value="20">0.02</option>
<option :value="50">0.05</option>
<option :value="100">0.10</option>
<option :value="150">0.15</option>
<option :value="200">0.20</option>
<option :value="250">0.25</option>
</select>
</label>
<label>
@@ -495,23 +495,23 @@
<h3>Настройки интерфейса управления</h3>
<label>
<span>Интерфейс управления (/24)</span>
<input v-model="paramNetwork.netManagementIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
<input v-model="paramNetwork.managementIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
</label>
<label>
<span>Режим сети</span>
<select v-model="paramNetwork.netIsL2">
<select v-model="paramNetwork.isL2">
<option :value="false">Маршрутизатор</option>
<option :value="true">Коммутатор</option>
</select>
</label>
<label v-show="paramNetwork.netIsL2 === false">
<label v-show="paramNetwork.isL2 === false">
<span>Интерфейс данных (/24)</span>
<input v-model="paramNetwork.netDataIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
<input v-model="paramNetwork.dataIp" required type="text" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
</label>
<label><span>MTU интерфейса данных</span><input type="number" v-model="paramNetwork.netDataMtu" min="1500" max="2000" step="1"/></label>
<label><span>MTU интерфейса данных</span><input type="number" v-model="paramNetwork.dataMtu" min="1500" max="2000" step="1"/></label>
<label>
<span>Имя веб-сервера</span>
<input v-model="paramNetwork.netServerName" type="text">
<input v-model="paramNetwork.serverName" type="text">
</label>
</div>
<button class="action-button" @click="settingsSubmitNetwork()">Сохранить <span class="submit-spinner" v-show="submitStatus.network"></span></button>
@@ -602,7 +602,7 @@
txIsTestInput: false,
txCentralFreq: 0,
txBaudrate: 0,
txRolloff: 2,
txRolloff: 20,
txGoldan: 0,
txAttenuation: -40,
dvbServicePacketPeriod: 0,
@@ -625,7 +625,7 @@
rxSpectrumInversion: false,
rxCentralFreq: 0,
rxBaudrate: 0,
rxRolloff: 2,
rxRolloff: 20,
rxGoldan: 0,
},
paramDpdi: {
@@ -646,11 +646,11 @@
bucLnbAutoStart: false,
},
paramNetwork: {
netManagementIp: null,
netIsL2: false,
netDataIp: null,
netDataMtu: 1500,
netServerName: null,
managementIp: null,
isL2: false,
dataIp: null,
dataMtu: 1500,
serverName: null,
},
// ========== include end from 'common/all-params-data.js.j2'
@@ -866,11 +866,11 @@
{ if (!confirm("Применение этих настроек может сделать модем недоступным! Продолжить?")) return }
let query = {
"netManagementIp": this.paramNetwork.netManagementIp,
"netIsL2": this.paramNetwork.netIsL2,
"netDataIp": this.paramNetwork.netDataIp,
"netDataMtu": this.paramNetwork.netDataMtu,
"netServerName": this.paramNetwork.netServerName,
"managementIp": this.paramNetwork.managementIp,
"isL2": this.paramNetwork.isL2,
"dataIp": this.paramNetwork.dataIp,
"dataMtu": this.paramNetwork.dataMtu,
"serverName": this.paramNetwork.serverName,
}
this.submitStatus.network = true
@@ -936,11 +936,11 @@
},
updateNetworkSettings(vals) {
this.submitStatus.network = false
this.paramNetwork.netManagementIp = vals["settings"]["network"]["netManagementIp"]
this.paramNetwork.netIsL2 = vals["settings"]["network"]["netIsL2"]
this.paramNetwork.netDataIp = vals["settings"]["network"]["netDataIp"]
this.paramNetwork.netDataMtu = vals["settings"]["network"]["netDataMtu"]
this.paramNetwork.netServerName = vals["settings"]["network"]["netServerName"]
this.paramNetwork.managementIp = vals["settings"]["network"]["managementIp"]
this.paramNetwork.isL2 = vals["settings"]["network"]["isL2"]
this.paramNetwork.dataIp = vals["settings"]["network"]["dataIp"]
this.paramNetwork.dataMtu = vals["settings"]["network"]["dataMtu"]
this.paramNetwork.serverName = vals["settings"]["network"]["serverName"]
},
// ========== include end from 'common/all-params-methods.js.j2'