From 32983e97b33f8fd8a66ba5886ba94e7ffc132861 Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Wed, 23 Apr 2025 15:05:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?= =?UTF-8?q?=D0=BA=20=D1=81=D0=B5=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F=20TDMA-?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front-generator/render-params.json | 13 ++++------ src/main.cpp | 2 +- static/main-tdma.html | 38 ++++++++++-------------------- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/front-generator/render-params.json b/front-generator/render-params.json index a5fef06..92bf885 100644 --- a/front-generator/render-params.json +++ b/front-generator/render-params.json @@ -1,7 +1,7 @@ { "modem_types": { "tdma": { - "modem_name": "RCSM-101 TDMA", + "modem_name": "VSAT Модем", "dangerousParamGroups": { "buclnb": "Применение неправильных настроек может вывести из строя оборудование! Продолжить?", "network": "Применение этих настроек может сделать модем недоступным! Продолжить?" @@ -22,7 +22,7 @@ "values": [{"label": "Нормальный", "value": "false"}, {"label": "Тест (CW)", "value": "true"}] }, {"widget": "number-int", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01, "v_show": "paramRxtx.txModulatorIsTest"}, - {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -40, "step": 1} + {"widget": "number", "label": "Ослабление, дБ", "name": "txAttenuation", "max": 0, "min": -90, "step": 1} ] }, { @@ -120,14 +120,9 @@ { "widget": "settings-container", "childs": [ + {"widget": "text", "label": "Пароль для входа в сеть ЦЗС", "name": "netCesPassword"}, {"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}, + {"widget": "ip-address", "label": "IP Интерфейса управления (/24)", "name": "netManagementIp"}, {"widget": "text", "label": "Имя веб-сервера", "name": "netServerName"} ] } diff --git a/src/main.cpp b/src/main.cpp index f6b4f79..7360306 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -297,7 +297,7 @@ public: } })); - s.resources.emplace_back(std::make_unique("/api/set/buclnb", this->auth, http::auth::User::SUPERUSER, [this](const auto& req, auto& rep) { + s.resources.emplace_back(std::make_unique("/api/set/buclnb", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) { if (req.method != "POST") { http::server::stockReply(http::server::bad_request, rep); return; diff --git a/static/main-tdma.html b/static/main-tdma.html index ea21a28..3910826 100644 --- a/static/main-tdma.html +++ b/static/main-tdma.html @@ -3,7 +3,7 @@ - RCSM-101 TDMA + VSAT Модем