Compare commits
7 Commits
master
...
revert-5c2
| Author | SHA1 | Date | |
|---|---|---|---|
| 5a39aec654 | |||
| 524e37b440 | |||
| 567bf4faee | |||
| 85dc848e76 | |||
| 9c671249c3 | |||
| 5032b17254 | |||
| 6f9b7a51b4 |
@@ -10,8 +10,7 @@
|
||||
<link rel="stylesheet" type="text/css" href="./lib/css/jsgrid.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="./lib/css/jsgrid-theme.css"/>
|
||||
<script type="text/javascript" src="./lib/js/jsgrid.js"></script>
|
||||
<script type="text/javascript" src="./lib/js/grid.locale-de.js"></script>
|
||||
<script type="text/javascript" src="./lib/js/grid.locale-ru.js"></script>
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="../../css/adapter.css"/>
|
||||
@@ -876,11 +875,9 @@
|
||||
});
|
||||
|
||||
|
||||
if (systemLang === 'de') {
|
||||
translate_de();
|
||||
} else if (systemLang === 'ru') {
|
||||
translate_ru();
|
||||
}
|
||||
if (systemLang === 'cn') {
|
||||
translate_cn();
|
||||
}
|
||||
|
||||
if (typeof localStorage !== 'undefined') {
|
||||
activePage = localStorage['modbuspage'];
|
||||
|
||||
118
admin/lib/css/my.css
Normal file
118
admin/lib/css/my.css
Normal file
@@ -0,0 +1,118 @@
|
||||
.dialog-config {
|
||||
overflow: hidden !important;
|
||||
}
|
||||
|
||||
.ui-tabs-panel {
|
||||
height: calc(100% - 70px);
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
.table_header {
|
||||
background-color: blue;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.bind {
|
||||
width: 150px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.ui-jqgrid-titlebar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.ui-jqgrid-bdiv {
|
||||
overflow-x: hidden !important;
|
||||
}
|
||||
|
||||
.ui-button-text-only .ui-button-text {
|
||||
padding: .3em !important;
|
||||
}
|
||||
|
||||
.modbus-tab {
|
||||
/*overflow: hidden;*/
|
||||
position: relative;
|
||||
height: calc(100% - 20px);
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.modbus-grid {
|
||||
height: 100% !important;
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.jsgrid-grid-body {
|
||||
height: calc(100% - 58px) !important;
|
||||
}
|
||||
|
||||
.jsgrid-table {
|
||||
width: 100% !important;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.jsgrid-insert-mode-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/*.jsgrid-edit-row input {
|
||||
padding: 0;
|
||||
}*/
|
||||
.jsgrid-table td {
|
||||
padding: 0.2em 0.2em !important;
|
||||
}
|
||||
|
||||
.table_head_btn {
|
||||
display: inline-flex;
|
||||
text-align: center;
|
||||
font-size: 1.1em;
|
||||
position: absolute;
|
||||
z-index: 99;
|
||||
right: 5px;
|
||||
top: -27px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.back_image {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
z-index: 0;
|
||||
opacity: 0.3;
|
||||
}
|
||||
|
||||
.logo {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 1;
|
||||
color: rgb(0, 153, 153);
|
||||
font-weight: bolder;
|
||||
font-size: 39px;
|
||||
padding: 9px;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
tr td {
|
||||
padding-left: 10px;
|
||||
}
|
||||
#adapter-container {
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
-webkit-user-drag: none;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
#export-dlg .select-dropdown {
|
||||
display: none;
|
||||
}
|
||||
#export-dlg .dropdown-content {
|
||||
display: none;
|
||||
}
|
||||
#export-dlg .caret {
|
||||
display: none;
|
||||
}
|
||||
10
admin/lib/js/grid.locale-cn.js
Normal file
10
admin/lib/js/grid.locale-cn.js
Normal file
@@ -0,0 +1,10 @@
|
||||
function translate_cn() {
|
||||
window.jsGrid.Grid.prototype.noDataContent = "暂无数据";
|
||||
window.jsGrid.Grid.prototype.deleteConfirm = "确认删除吗?";
|
||||
window.jsGrid.Grid.prototype.pagerFormat = "分页 = {first} {prev} {pages} {next} {last} {pageIndex} of {pageCount}";
|
||||
window.jsGrid.Grid.prototype.pagePrevText = "上一页.";
|
||||
window.jsGrid.Grid.prototype.pageNextText = "下一页";
|
||||
window.jsGrid.Grid.prototype.pageFirstText = "首页";
|
||||
window.jsGrid.Grid.prototype.pageLastText = "尾页";
|
||||
window.jsGrid.Grid.prototype.loadMessage = "加载中...";
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
function translate_de() {
|
||||
window.jsGrid.Grid.prototype.noDataContent = "Nicht gefunden";
|
||||
window.jsGrid.Grid.prototype.deleteConfirm = "Sind Sie sicher?";
|
||||
window.jsGrid.Grid.prototype.pagerFormat = "Seiten = {first} {prev} {pages} {next} {last} {pageIndex} of {pageCount}";
|
||||
window.jsGrid.Grid.prototype.pagePrevText = "Vorh.";
|
||||
window.jsGrid.Grid.prototype.pageNextText = "Nexte";
|
||||
window.jsGrid.Grid.prototype.pageFirstText = "Erste";
|
||||
window.jsGrid.Grid.prototype.pageLastText = "Letzte";
|
||||
window.jsGrid.Grid.prototype.loadMessage = "Bitte; warten...";
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
function translate_ru() {
|
||||
window.jsGrid.Grid.prototype.noDataContent = "Не найдено";
|
||||
window.jsGrid.Grid.prototype.deleteConfirm = "Вы уверены?";
|
||||
window.jsGrid.Grid.prototype.pagerFormat = "Страницы = {first} {prev} {pages} {next} {last} {pageIndex} of {pageCount}";
|
||||
window.jsGrid.Grid.prototype.pagePrevText = "Пред.";
|
||||
window.jsGrid.Grid.prototype.pageNextText = "След";
|
||||
window.jsGrid.Grid.prototype.pageFirstText = "Первая";
|
||||
window.jsGrid.Grid.prototype.pageLastText = "Последняя";
|
||||
window.jsGrid.Grid.prototype.loadMessage = "Подождите...";
|
||||
}
|
||||
|
||||
@@ -2,10 +2,107 @@
|
||||
"common": {
|
||||
"name": "modbus",
|
||||
"version": "2.0.7",
|
||||
"news": {
|
||||
"2.0.7": {
|
||||
"en": "The server mode was fixed",
|
||||
"de": "Der Servermodus wurde behoben",
|
||||
"ru": "Режим сервера был исправлен",
|
||||
"pt": "O modo do servidor foi corrigido",
|
||||
"nl": "De servermodus is opgelost",
|
||||
"fr": "Le mode serveur a été corrigé",
|
||||
"it": "La modalità server è stata riparata",
|
||||
"es": "El modo del servidor fue arreglado",
|
||||
"pl": "Tryb serwera został naprawiony"
|
||||
},
|
||||
"2.0.6": {
|
||||
"en": "rtu-tcp master mode was fixed",
|
||||
"de": "rtu-tcp Master-Modus wurde behoben",
|
||||
"ru": "Исправлен master режим rtu-tcp",
|
||||
"pt": "modo mestre rtu-tcp foi corrigido",
|
||||
"nl": "De rtu-tcp-mastermodus was opgelost",
|
||||
"fr": "Le mode master de rtu-tcp a été corrigé",
|
||||
"it": "la modalità master rtu-tcp è stata riparata",
|
||||
"es": "El modo master rtu-tcp fue arreglado",
|
||||
"pl": "Naprawiono tryb master rtu-tcp"
|
||||
},
|
||||
"2.0.3": {
|
||||
"en": "Fixed the rounding of numbers",
|
||||
"de": "Die Rundung von Zahlen wurde korrigiert",
|
||||
"ru": "Исправлено округление чисел",
|
||||
"pt": "Corrigido o arredondamento de números",
|
||||
"nl": "Vaste afronding van nummers",
|
||||
"fr": "Correction de l'arrondissement des nombres",
|
||||
"it": "Risolto l'arrotondamento dei numeri",
|
||||
"es": "Se corrigió el redondeo de números",
|
||||
"pl": "Naprawiono zaokrąglanie liczb"
|
||||
},
|
||||
"2.0.2": {
|
||||
"en": "The error with blocks reading was fixed\nThe block reading for discrete values was implemented",
|
||||
"de": "Der Fehler beim Lesen der Blöcke wurde behoben\nDas Blocklesen für diskrete Werte wurde implementiert",
|
||||
"ru": "Исправлена ошибка с чтением блоков\nБыло реализовано считывание блока для дискретных значений",
|
||||
"pt": "O erro com a leitura dos blocos foi corrigido\nA leitura de bloco para valores discretos foi implementada",
|
||||
"nl": "De fout met het lezen van blokken was opgelost\nDe blokwaarde voor discrete waarden is geïmplementeerd",
|
||||
"fr": "L'erreur avec la lecture des blocs a été corrigée\nLa lecture du bloc pour les valeurs discrètes a été implémentée",
|
||||
"it": "L'errore con la lettura dei blocchi è stato corretto\nÈ stata implementata la lettura dei blocchi per i valori discreti",
|
||||
"es": "El error con la lectura de bloques fue arreglado\nSe implementó la lectura de bloques para valores discretos",
|
||||
"pl": "Naprawiono błąd z odczytem bloków\nWprowadzono odczyt blokowy dla wartości dyskretnych"
|
||||
},
|
||||
"2.0.1": {
|
||||
"en": "Added the support of multiple device IDs",
|
||||
"de": "Die Unterstützung mehrerer Geräte-IDs wurde hinzugefügt",
|
||||
"ru": "Добавлена поддержка нескольких идентификаторов устройств",
|
||||
"pt": "Adicionado o suporte de vários IDs de dispositivos",
|
||||
"nl": "De ondersteuning van meerdere apparaat-ID's toegevoegd",
|
||||
"fr": "Ajout de la prise en charge de plusieurs ID de périphérique",
|
||||
"it": "Aggiunto il supporto di più ID dispositivo",
|
||||
"es": "Se agregó la compatibilidad con múltiples ID de dispositivo",
|
||||
"pl": "Dodano obsługę wielu identyfikatorów urządzeń"
|
||||
},
|
||||
"1.1.1": {
|
||||
"en": "Optimize reconnect handling",
|
||||
"de": "Optimieren Sie die Verbindungswiederherstellung",
|
||||
"ru": "Оптимизировать переподключение обработки",
|
||||
"pt": "Otimizar o manuseio de reconexão",
|
||||
"nl": "Optimaliseer de verbinding opnieuw verbinden",
|
||||
"fr": "Optimisez la gestion de la reconnexion",
|
||||
"it": "Ottimizza la gestione della riconnessione",
|
||||
"es": "Optimizar el manejo de reconexión",
|
||||
"pl": "Zoptymalizuj obsługę ponownego połączenia"
|
||||
},
|
||||
"1.1.0": {
|
||||
"en": "Upgrade Serialport Library, Little endian strings added",
|
||||
"de": "Upgrade Serialport Library, Little Endian Strings hinzugefügt",
|
||||
"ru": "Обновление библиотеки Serialport, добавлены небольшие строки endian",
|
||||
"pt": "Upgrade Serialport Library, Little endian strings adicionado",
|
||||
"nl": "Upgrade Serialport-bibliotheek, Little endian strings toegevoegd",
|
||||
"fr": "Mettre à niveau la bibliothèque Serialport, ajouter des chaînes little endian",
|
||||
"it": "Esegui l'upgrade della libreria Serialport, aggiungendo piccoli stringhe endian",
|
||||
"es": "Actualizar Serialport Library, pequeñas cadenas de endian agregadas",
|
||||
"pl": "Zaktualizuj Bibliotekę Serialport, dodano małe łańcuchy endian"
|
||||
},
|
||||
"1.0.2": {
|
||||
"en": "Fixed read of coils",
|
||||
"de": "Das Lesen von Coils wurde korrigiert",
|
||||
"ru": "Исправлено считывание coils",
|
||||
"pt": "Leitura fixa de coils",
|
||||
"nl": "Vast lezen van coils",
|
||||
"fr": "Lecture fixe des coils",
|
||||
"it": "Risolto il problema della lettura delle coils",
|
||||
"es": "Lectura fija de coils",
|
||||
"pl": "Naprawiono odczyt coils"
|
||||
}
|
||||
},
|
||||
"title": "ModBus",
|
||||
"desc": {
|
||||
"en": "ModBus connection Slave or Master",
|
||||
"de": "云控 Modbus"
|
||||
"de": "ModBus Verbindung Slave oder Master",
|
||||
"ru": "ModBus соединение Slave или Master",
|
||||
"pt": "Conexão ModBus Escravo ou Mestre",
|
||||
"nl": "ModBus-verbinding Slave of Master",
|
||||
"fr": "Connexion ModBus Esclave ou Maître",
|
||||
"it": "Connessione ModBus Slave o Master",
|
||||
"es": "Conexión ModBus Slave o Master",
|
||||
"pl": "Połączenie ModBus Slave lub Master"
|
||||
},
|
||||
"authors": [
|
||||
"bluefox <dogafox@gmail.com>"
|
||||
|
||||
Reference in New Issue
Block a user