фикс roll-off, фикс нечитающихся настроек сети, фикс значений на странице мониторинга, добавил авто-регулировку мощности в ШПС
This commit is contained in:
parent
1e185a987d
commit
b9a25e8734
@ -42,7 +42,7 @@
|
||||
{"widget": "number-int", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 200000, "max": 54000000, "step": 1},
|
||||
{
|
||||
"widget": "select", "label": "Roll-off", "name": "rxRolloff",
|
||||
"values": [{"label": "0.02", "value": "2"}, {"label": "0.05", "value": "5"}, {"label": "0.10", "value": "10"}, {"label": "0.15", "value": "15"}, {"label": "0.20", "value": "20"}, {"label": "0.25", "value": "25"}]
|
||||
"values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -174,7 +174,7 @@
|
||||
{"widget": "number-int", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 200000, "max": 54000000},
|
||||
{
|
||||
"widget": "select", "label": "Roll-off", "name": "txRolloff",
|
||||
"values": [{"label": "0.02", "value": "2"}, {"label": "0.05", "value": "5"}, {"label": "0.10", "value": "10"}, {"label": "0.15", "value": "15"}, {"label": "0.20", "value": "20"}, {"label": "0.25", "value": "25"}]
|
||||
"values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
|
||||
},
|
||||
{
|
||||
"widget": "select", "label": "Номер последовательности Голда", "name": "txGoldan",
|
||||
@ -235,7 +235,7 @@
|
||||
{"widget": "number-int", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 200000, "max": 54000000},
|
||||
{
|
||||
"widget": "select", "label": "Roll-off", "name": "rxRolloff",
|
||||
"values": [{"label": "0.02", "value": "2"}, {"label": "0.05", "value": "5"}, {"label": "0.10", "value": "10"}, {"label": "0.15", "value": "15"}, {"label": "0.20", "value": "20"}, {"label": "0.25", "value": "25"}]
|
||||
"values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
|
||||
},
|
||||
{
|
||||
"widget": "select", "label": "Номер последовательности Голда", "name": "rxGoldan",
|
||||
@ -322,14 +322,14 @@
|
||||
"widget": "settings-container",
|
||||
"childs": [
|
||||
{"widget": "h3", "label": "Настройки интерфейса управления"},
|
||||
{"widget": "ip-address", "label": "Интерфейс управления (/24)", "name": "netManagementIp"},
|
||||
{"widget": "ip-address", "label": "Интерфейс управления (/24)", "name": "managementIp"},
|
||||
{
|
||||
"widget": "select", "label": "Режим сети", "name": "netIsL2",
|
||||
"widget": "select", "label": "Режим сети", "name": "isL2",
|
||||
"values": [{"label": "Маршрутизатор", "value": "false"}, {"label": "Коммутатор", "value": "true"}]
|
||||
},
|
||||
{"widget": "ip-address", "label": "Интерфейс данных (/24)", "name": "netDataIp", "v_show": "paramNetwork.netIsL2 === false"},
|
||||
{"widget": "number", "label": "MTU интерфейса данных", "name": "netDataMtu", "min": 1500, "step": 1, "max": 2000},
|
||||
{"widget": "text", "label": "Имя веб-сервера", "name": "netServerName"}
|
||||
{"widget": "ip-address", "label": "Интерфейс данных (/24)", "name": "dataIp", "v_show": "paramNetwork.isL2 === false"},
|
||||
{"widget": "number", "label": "MTU интерфейса данных", "name": "dataMtu", "min": 1500, "step": 1, "max": 2000},
|
||||
{"widget": "text", "label": "Имя веб-сервера", "name": "serverName"}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -372,12 +372,22 @@
|
||||
{"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 200000, "max": 54000000},
|
||||
{
|
||||
"widget": "select", "label": "Roll-off", "name": "txRolloff",
|
||||
"values": [{"label": "0.02", "value": "2"}, {"label": "0.05", "value": "5"}, {"label": "0.10", "value": "10"}, {"label": "0.15", "value": "15"}, {"label": "0.20", "value": "20"}, {"label": "0.25", "value": "25"}]
|
||||
"values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
|
||||
},
|
||||
{"widget": "number", "label": "Коэф. расширения", "name": "txSpreadCoef", "max": 1000, "min": -1000, "step": 0.01},
|
||||
{"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -40, "step": 0.25}
|
||||
]
|
||||
},
|
||||
{
|
||||
"widget": "settings-container",
|
||||
"childs": [
|
||||
{"widget": "h3", "label": "Авто-регулировка мощности"},
|
||||
{"widget": "checkbox", "label": "Авто-регулировка мощности", "name": "aupcEn"},
|
||||
{"widget": "number", "label": "Минимальное ослабление, дБ", "name": "aupcMinAttenuation", "min": 0, "step": 0.1, "max": 10},
|
||||
{"widget": "number", "label": "Максимальное ослабление, дБ", "name": "aupcMaxAttenuation", "min": 0, "step": 0.1, "max": 10},
|
||||
{"widget": "number", "label": "Требуемое ОСШ", "name": "aupcRequiredSnr", "min": 0, "step": 0.01, "max": 10}
|
||||
]
|
||||
},
|
||||
{
|
||||
"widget": "settings-container",
|
||||
"childs": [
|
||||
@ -393,7 +403,7 @@
|
||||
{"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 200000, "max": 54000000},
|
||||
{
|
||||
"widget": "select", "label": "Roll-off", "name": "rxRolloff",
|
||||
"values": [{"label": "0.02", "value": "2"}, {"label": "0.05", "value": "5"}, {"label": "0.10", "value": "10"}, {"label": "0.15", "value": "15"}, {"label": "0.20", "value": "20"}, {"label": "0.25", "value": "25"}]
|
||||
"values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}]
|
||||
},
|
||||
{"widget": "number", "label": "Коэф. расширения", "name": "rxSpreadCoef", "max": 1000, "min": -1000, "step": 0.01}
|
||||
]
|
||||
@ -454,14 +464,14 @@
|
||||
"widget": "settings-container",
|
||||
"childs": [
|
||||
{"widget": "h3", "label": "Настройки интерфейса управления"},
|
||||
{"widget": "ip-address", "label": "Интерфейс управления (/24)", "name": "netManagementIp"},
|
||||
{"widget": "ip-address", "label": "Интерфейс управления (/24)", "name": "managementIp"},
|
||||
{
|
||||
"widget": "select", "label": "Режим сети", "name": "netIsL2",
|
||||
"widget": "select", "label": "Режим сети", "name": "isL2",
|
||||
"values": [{"label": "Маршрутизатор", "value": "false"}, {"label": "Коммутатор", "value": "true"}]
|
||||
},
|
||||
{"widget": "ip-address", "label": "Интерфейс данных (/24)", "name": "netDataIp", "v_show": "paramNetwork.netIsL2 === false"},
|
||||
{"widget": "number", "label": "MTU интерфейса данных", "name": "netDataMtu", "min": 1500, "step": 1, "max": 2000},
|
||||
{"widget": "text", "label": "Имя веб-сервера", "name": "netServerName"}
|
||||
{"widget": "ip-address", "label": "Интерфейс данных (/24)", "name": "dataIp", "v_show": "paramNetwork.isL2 === false"},
|
||||
{"widget": "number", "label": "MTU интерфейса данных", "name": "dataMtu", "min": 1500, "step": 1, "max": 2000},
|
||||
{"widget": "text", "label": "Имя веб-сервера", "name": "serverName"}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#define API_OBJECT_DEBUG_METRICS_ENABLE
|
||||
#endif
|
||||
|
||||
#if defined(MODEM_IS_SCPC)
|
||||
#if defined(MODEM_IS_SCPC) || defined(MODEM_IS_SHPS)
|
||||
#define API_STRUCT_ACM_ENABLE
|
||||
#endif
|
||||
|
||||
|
||||
@ -391,10 +391,8 @@ void api_driver::obj::TerminalState::updateCallback(proxy::CpProxy& cp) {
|
||||
fCincFreqErrAcc = cinc.freq_fine_estimate;
|
||||
fCincChannelDelay = cinc.delay_dpdi;
|
||||
#endif
|
||||
#ifdef MODEM_IS_TDMA
|
||||
fTxCenterFreq = modSet.central_freq_in_kGz;
|
||||
fTxSymSpeed = static_cast<double>(modSet.baudrate) / 1000.0;
|
||||
#endif
|
||||
}
|
||||
|
||||
nlohmann::json api_driver::obj::TerminalState::asJson() {
|
||||
@ -454,10 +452,8 @@ nlohmann::json api_driver::obj::TerminalState::asJson() {
|
||||
res["cinc"]["correlator"] = nullptr;
|
||||
}
|
||||
#endif
|
||||
#ifdef MODEM_IS_TDMA
|
||||
res["tx"]["centerFreq"] = fTxCenterFreq;
|
||||
res["tx"]["symSpeed"] = fTxSymSpeed;
|
||||
#endif
|
||||
|
||||
return res;
|
||||
}
|
||||
@ -680,8 +676,8 @@ void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::j
|
||||
|
||||
#ifdef API_STRUCT_ACM_ENABLE
|
||||
// ACM
|
||||
#ifndef MODEM_IS_SHPS
|
||||
// в ШПС этих настроек нет
|
||||
#ifdef MODEM_IS_SCPC
|
||||
// эти настройки только в SCPC
|
||||
acm.period_pack_acm = data.value("dvbServicePacketPeriod", acm.period_pack_acm);
|
||||
acm.enable_acm = data.value("dvbIsAcm", acm.enable_acm);
|
||||
acm.min_modcod_acm = buildModcodFromJson(data, acm.min_modcod_acm, "dvbAcmMin", acmIsFrameSizeNormal, acmIsPilots);
|
||||
@ -867,8 +863,8 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
|
||||
|
||||
#ifdef API_STRUCT_ACM_ENABLE
|
||||
// ACM
|
||||
#ifndef MODEM_IS_SHPS
|
||||
// в ШПС этих настроек нет
|
||||
#ifdef MODEM_IS_SCPC
|
||||
// эти настройки только в SCPC
|
||||
rxtx["dvbServicePacketPeriod"] = acm.period_pack_acm;
|
||||
rxtx["dvbIsAcm"] = acm.enable_acm;
|
||||
|
||||
|
||||
@ -172,10 +172,8 @@ namespace api_driver::obj {
|
||||
int32_t fCincFreqErrAcc{};
|
||||
float fCincChannelDelay{};
|
||||
#endif
|
||||
#ifdef MODEM_IS_TDMA
|
||||
double fTxCenterFreq;
|
||||
double fTxSymSpeed;
|
||||
#endif
|
||||
|
||||
TerminalState();
|
||||
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -140,17 +140,27 @@
|
||||
<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><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.txSpreadCoef" min="-1000" max="1000" step="0.01"/></label>
|
||||
<label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" min="-40" step="0.25"/></label>
|
||||
</div>
|
||||
<div class="settings-set-container">
|
||||
<h3>Авто-регулировка мощности</h3>
|
||||
<label>
|
||||
<span>Авто-регулировка мощности</span>
|
||||
<span class="toggle-input"><input type="checkbox" v-model="paramRxtx.aupcEn" /><span class="slider"></span></span>
|
||||
</label>
|
||||
<label><span>Минимальное ослабление, дБ</span><input type="number" v-model="paramRxtx.aupcMinAttenuation" max="10" step="0.1"/></label>
|
||||
<label><span>Максимальное ослабление, дБ</span><input type="number" v-model="paramRxtx.aupcMaxAttenuation" max="10" step="0.1"/></label>
|
||||
<label><span>Требуемое ОСШ</span><input type="number" v-model="paramRxtx.aupcRequiredSnr" max="10" step="0.01"/></label>
|
||||
</div>
|
||||
<div class="settings-set-container">
|
||||
<h3>Настройки приемника</h3>
|
||||
<label>
|
||||
@ -173,12 +183,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><span>Коэф. расширения</span><input type="number" v-model="paramRxtx.rxSpreadCoef" min="-1000" max="1000" step="0.01"/></label>
|
||||
@ -237,23 +247,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>
|
||||
@ -342,15 +352,19 @@
|
||||
txIsTestInput: false,
|
||||
txCentralFreq: 950000,
|
||||
txBaudrate: 200000,
|
||||
txRolloff: 2,
|
||||
txRolloff: 20,
|
||||
txSpreadCoef: -1000,
|
||||
txAttenuation: -40,
|
||||
aupcEn: false,
|
||||
aupcMinAttenuation: 0,
|
||||
aupcMaxAttenuation: 0,
|
||||
aupcRequiredSnr: 0,
|
||||
rxAgcEn: false,
|
||||
rxManualGain: -40,
|
||||
rxSpectrumInversion: false,
|
||||
rxCentralFreq: 950000,
|
||||
rxBaudrate: 200000,
|
||||
rxRolloff: 2,
|
||||
rxRolloff: 20,
|
||||
rxSpreadCoef: -1000,
|
||||
},
|
||||
paramBuclnb: {
|
||||
@ -362,11 +376,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'
|
||||
|
||||
@ -491,6 +505,10 @@
|
||||
"txRolloff": this.paramRxtx.txRolloff,
|
||||
"txSpreadCoef": this.paramRxtx.txSpreadCoef,
|
||||
"txAttenuation": this.paramRxtx.txAttenuation,
|
||||
"aupcEn": this.paramRxtx.aupcEn,
|
||||
"aupcMinAttenuation": this.paramRxtx.aupcMinAttenuation,
|
||||
"aupcMaxAttenuation": this.paramRxtx.aupcMaxAttenuation,
|
||||
"aupcRequiredSnr": this.paramRxtx.aupcRequiredSnr,
|
||||
"rxAgcEn": this.paramRxtx.rxAgcEn,
|
||||
"rxManualGain": this.paramRxtx.rxManualGain,
|
||||
"rxSpectrumInversion": this.paramRxtx.rxSpectrumInversion,
|
||||
@ -530,11 +548,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
|
||||
@ -555,6 +573,10 @@
|
||||
this.paramRxtx.txRolloff = vals["settings"]["rxtx"]["txRolloff"]
|
||||
this.paramRxtx.txSpreadCoef = vals["settings"]["rxtx"]["txSpreadCoef"]
|
||||
this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
|
||||
this.paramRxtx.aupcEn = vals["settings"]["rxtx"]["aupcEn"]
|
||||
this.paramRxtx.aupcMinAttenuation = vals["settings"]["rxtx"]["aupcMinAttenuation"]
|
||||
this.paramRxtx.aupcMaxAttenuation = vals["settings"]["rxtx"]["aupcMaxAttenuation"]
|
||||
this.paramRxtx.aupcRequiredSnr = vals["settings"]["rxtx"]["aupcRequiredSnr"]
|
||||
this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"]
|
||||
this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]
|
||||
this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxtx"]["rxSpectrumInversion"]
|
||||
@ -574,11 +596,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'
|
||||
|
||||
|
||||
@ -158,12 +158,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>
|
||||
</div>
|
||||
@ -340,7 +340,7 @@
|
||||
rxSpectrumInversion: false,
|
||||
rxCentralFreq: 0,
|
||||
rxBaudrate: 0,
|
||||
rxRolloff: 2,
|
||||
rxRolloff: 20,
|
||||
},
|
||||
paramBuclnb: {
|
||||
bucRefClk10M: false,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user