diff --git a/front-generator/render-params.json b/front-generator/render-params.json index b9344ca..1f42037 100644 --- a/front-generator/render-params.json +++ b/front-generator/render-params.json @@ -98,6 +98,22 @@ } ] } + ], + "network": [ + {"widget": "h2", "label": "Настройки сети"}, + { + "widget": "settings-container", + "childs": [ + {"widget": "h3", "label": "Настройки интерфейса управления"}, + {"widget": "ip-address", "label": "Интерфейс управления (/24)", "name": "netManagementIp"}, + { + "widget": "select", "label": "Режим сети", "name": "netIsL2", + "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} + ] + } ] }, "tabs": [ @@ -108,6 +124,10 @@ }, "scpc": { "modem_name": "RCSM-101", + "dangerousParamGroups": { + "buclnb": "Применение неправильных настроек может вывести из строя оборудование! Продолжить?", + "network": "Применение этих настроек может сделать модем недоступным! Продолжить?" + }, "params": { "rxtx": [ {"widget": "h2", "label": "Настройки приема/передачи"}, @@ -144,6 +164,10 @@ "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"}] }, + { + "widget": "select", "label": "Номер последовательности Голда", "name": "txGoldan", + "values": [{"label": "0", "value": "0"}, {"label": "1", "value": "1"}] + }, {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "min": 0, "step": 1} ] }, @@ -195,6 +219,10 @@ { "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"}] + }, + { + "widget": "select", "label": "Номер последовательности Голда", "name": "rxGoldan", + "values": [{"label": "0", "value": "0"}, {"label": "1", "value": "1"}] } ] } @@ -213,8 +241,14 @@ {"label": "Окном задержки", "value": "false"} ] }, - {"widget": "number", "label": "Полоса поиска, КГц ±", "name": "cincSearchBandwidth", "min": 0, "step": 1, "max": 100} - ] + {"widget": "number", "label": "Полоса поиска, КГц ±", "name": "cincSearchBandwidth", "min": 0, "step": 1, "max": 100}, + {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramCinc.cincIsPositional === true"}, + {"widget": "number", "label": "Широта станции", "name": "cincPositionStationLatitude", "v_show": "paramCinc.cincIsPositional === true", "min": -180, "step": 0.000001, "max": 180}, + {"widget": "number", "label": "Долгота станции", "name": "cincPositionStationLongitude", "v_show": "paramCinc.cincIsPositional === true", "min": -180, "step": 0.000001, "max": 180}, + {"widget": "number", "label": "Подспутниковая точка", "name": "cincPositionSatelliteLongitude", "v_show": "paramCinc.cincIsPositional === true", "min": -180, "step": 0.000001, "max": 180}, + {"widget": "h2", "label": "Задержка до спутника", "v_show": "paramCinc.cincIsPositional === false"}, + {"widget": "number", "label": "от, мс", "name": "cincDelayMin", "v_show": "paramCinc.cincIsPositional === false", "min": 0, "step": 0.1, "max": 400}, + {"widget": "number", "label": "до, мс", "name": "cincDelayMax", "v_show": "paramCinc.cincIsPositional === false", "min": 0, "step": 0.1, "max": 400}] }, {"widget": "submit", "v_show": "paramRxtx.isCinC"} ], @@ -274,21 +308,29 @@ {"widget": "number", "label": "Максимальное количество соединений", "name": "accelMaxConnections", "min": 0, "step": 1, "max": 4000} ] } + ], + "network": [ + {"widget": "h2", "label": "Настройки сети"}, + { + "widget": "settings-container", + "childs": [ + {"widget": "h3", "label": "Настройки интерфейса управления"}, + {"widget": "ip-address", "label": "Интерфейс управления (/24)", "name": "netManagementIp"}, + { + "widget": "select", "label": "Режим сети", "name": "netIsL2", + "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} + ] + } ] }, "tabs": [ - { - "name": "monitoring", - "desc": "Мониторинг" - }, - { - "name": "setup", - "desc": "Настройки" - }, - { - "name": "qos", - "desc": "QoS" - } + {"name": "monitoring", "desc": "Мониторинг"}, + {"name": "setup", "desc": "Настройки"}, + {"name": "qos", "desc": "QoS"}, + {"name": "admin", "desc": "Администрирование"} ] } } diff --git a/front-generator/template/common/admin-data.js.j2 b/front-generator/template/common/admin-data.js.j2 deleted file mode 100644 index e69de29..0000000 diff --git a/front-generator/template/common/admin-methods.js.j2 b/front-generator/template/common/admin-methods.js.j2 index b38b336..407738b 100644 --- a/front-generator/template/common/admin-methods.js.j2 +++ b/front-generator/template/common/admin-methods.js.j2 @@ -1,55 +1,3 @@ - settingsSubmitNetwork() { - if (this.submitStatus.network) { return } - let query = { - "network.managementIp": this.param.network.managementIp, - "network.managementGateway": this.param.network.managementGateway, - "network.mode": this.param.network.mode, - "network.dataIp": this.param.network.dataIp, - "network.dataMtu": this.param.network.dataMtu - } - if (confirm('Вы уверены, что хотите сохранить настройки сети? После этого модем может стать недоступным.')) { - this.submitStatus.network = true - fetch('/api/set/network', { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify(query) - }).then(async (resp) => { - this.submitStatus.network = false - this.updateNetworkSettings(await resp.json()) - }).catch((reason) => { - this.submitStatus.network = false - alert(`Ошибка при применении настроек: ${reason}`) - }) - } - }, - - settingsSubmitDebugSend() { - if (this.submitStatus.debugSend) { return } - let query = { - "debugSend.en": this.param.debugSend.en, - "debugSend.receiverIp": this.param.debugSend.receiverIp, - "debugSend.portCinC": this.param.debugSend.portCinC, - "debugSend.portData": this.param.debugSend.portData, - "debugSend.timeout": this.param.debugSend.timeout - } - this.submitStatus.debugSend = true - fetch('/api/set/debugSend', { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify(query) - }).then(async (resp) => { - this.submitStatus.debugSend = false - this.updateNetworkSettings(await resp.json()) - }).catch((reason) => { - this.submitStatus.debugSend = false - alert(`Ошибка при применении настроек: ${reason}`) - }) - }, - async settingsUploadUpdate() { if (!this.uploadFw.filename) { alert('Выберите файл для загрузки'); @@ -105,24 +53,6 @@ this.submitStatus.firmwareUpgrade = false }, - updateNetworkSettings(vals) { - this.submitStatus.network = false - this.param.network.managementIp = vals["settings"]["network.managementIp"] - this.param.network.managementGateway = vals["settings"]["network.managementGateway"] - this.param.network.mode = vals["settings"]["network.mode"] - this.param.network.dataIp = vals["settings"]["network.dataIp"] - this.param.network.dataMtu = vals["settings"]["network.dataMtu"] - }, - - updateDebugSendSettings(vals) { - this.submitStatus.debugSend = false - this.param.debugSend.en = vals["settings"]["debugSend.en"] - this.param.debugSend.receiverIp = vals["settings"]["debugSend.receiverIp"] - this.param.debugSend.portCinC = vals["settings"]["debugSend.portCinC"] - this.param.debugSend.portData = vals["settings"]["debugSend.portData"] - this.param.debugSend.timeout = vals["settings"]["debugSend.timeout"] - }, - doModemReboot() { if (this.submitStatus.modemReboot !== null) { return diff --git a/front-generator/template/common/admin.html.j2 b/front-generator/template/common/admin.html.j2 index ad3caa9..ee8fbfc 100644 --- a/front-generator/template/common/admin.html.j2 +++ b/front-generator/template/common/admin.html.j2 @@ -1,63 +1,11 @@ - {% raw %} +{% from 'common/widgets.j2' import build_widget %}
-

Настройки сети

+ {% if 'network' in params %} + {% for w in params['network'] %}{{ build_widget('network', w) | indent(12, true) }}{% endfor %} + {% endif %} + {% raw %} +

Система

-

Интерфейс управления

- - - -

Интерфейс данных

- - - -
-
-

Отладка

- - - - - - -
-
-

Управление ПО

@@ -82,6 +30,5 @@ - + {% endraw %} - {% endraw %} \ No newline at end of file diff --git a/front-generator/template/common/widgets.j2 b/front-generator/template/common/widgets.j2 index 705f2c5..78e9bbc 100644 --- a/front-generator/template/common/widgets.j2 +++ b/front-generator/template/common/widgets.j2 @@ -40,6 +40,10 @@ {% for w in widget.childs %}{{ build_widget(param_group, w) | indent(4, true) }}{% endfor %} {% endmacro %} +{% macro build_widget_ip_address(param_group, widget) %} + {{ widget.label }} + +{% endmacro %} {% macro build_widget(param_group, widget) %}{% if widget.widget == 'flex-container' %}{{ build_widget_flex_container(param_group, widget) }} {% elif widget.widget == 'settings-container' %}{{ build_widget_settings_container(param_group, widget) }} @@ -52,6 +56,7 @@ {% elif widget.widget == 'select' %}{{ build_widget_select(param_group, widget) }} {% elif widget.widget == 'modulation-modcod' %}{{ build_widget_modulation_modcod(param_group, widget) }} {% elif widget.widget == 'modulation-speed' %}{{ build_widget_modulation_speed(param_group, widget) }} +{% elif widget.widget == 'ip-address' %}{{ build_widget_ip_address(param_group, widget) }} {% else %}

Widget '{{ widget.widget }}' not defined!

{{ widget }}

{% endif %} {% endmacro %} diff --git a/static/main-scpc.html b/static/main-scpc.html index e9d13f8..5647fe1 100644 --- a/static/main-scpc.html +++ b/static/main-scpc.html @@ -47,6 +47,7 @@ Мониторинг Настройки QoS + Администрирование Выход @@ -172,6 +173,13 @@ +
@@ -276,6 +284,13 @@ +
@@ -289,6 +304,13 @@ +

Настройки позиционирования

+ + + +

Задержка до спутника

+ +

Настройки питания и опорного генератора

@@ -448,13 +470,62 @@ - +
+

Настройки сети

+
+

Настройки интерфейса управления

+ + + + +
+ + +

Система

+
+
Версия ПО{{ about.firmwareVersion }}
+ + + + + + + +
Версия ПО{{ about.firmwareVersion }}
ID модема{{ about.modemUid }}
Серийный номер{{ about.modemSn }}
MAC интерфейса управления{{ about.macManagement }}
MAC интерфейса управления{{ about.macData }}
+
+ +
+
+ +
+ +

Обновление ПО

+ + + +

Последнее обновление статистики: {{ lastUpdateTime }}