случайные id

This commit is contained in:
Dmitry Borisenko
2022-09-18 19:26:23 +02:00
parent 3c7606b14d
commit f4443d2d66
4 changed files with 19 additions and 12 deletions

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.2.9</title> <title>IoT Manager 4.3.0</title>
<link rel="icon" type="image/png" href="/favicon.ico" /> <link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css" /> <link rel="stylesheet" href="/build/bundle.css" />

View File

@@ -39,7 +39,7 @@
let updatingTimeout = 80000; let updatingTimeout = 80000;
let opened = false; let opened = false;
let preventMove = false; let preventMove = false;
let devMode = true; let devMode = false;
//****************************************************variable section**********************************************************/ //****************************************************variable section**********************************************************/
//******************************************************************************************************************************/ //******************************************************************************************************************************/
@@ -312,7 +312,7 @@
deviceList = deviceList; deviceList = deviceList;
deviceListParced = true; deviceListParced = true;
if (debug) console.log("✔", "deviceList json parced"); if (debug) console.log("✔", "deviceList parced");
onParced(); onParced();
whenDeviceListWasUpdated(); whenDeviceListWasUpdated();
connectToAllDevices(); connectToAllDevices();
@@ -335,7 +335,7 @@
errorsJson = JSON.parse(data); errorsJson = JSON.parse(data);
errorsJson = errorsJson; errorsJson = errorsJson;
errorsJsonParced = true; errorsJsonParced = true;
if (debug) console.log("✔", "errorsJson json parced"); if (debug) console.log("✔", "errorsJson parced");
onParced(); onParced();
} }
} }
@@ -346,7 +346,7 @@
settingsJson = settingsJson; settingsJson = settingsJson;
//sortingLayout(); //sortingLayout();
settingsJsonParced = true; settingsJsonParced = true;
if (debug) console.log("✔", "settingsJson json parced"); if (debug) console.log("✔", "settingsJson parced");
onParced(); onParced();
} }
} }
@@ -448,7 +448,7 @@
console.log("[1]", ws, "blob package received"); console.log("[1]", ws, "blob package received");
//как только прилетел весь блоб мы начнем его читать ридером и заодно запросим json-ы всех параметров //как только прилетел весь блоб мы начнем его читать ридером и заодно запросим json-ы всех параметров
combineLayoutsInOne(ws); combineLayoutsInOne(ws);
wsSendMsg(ws, "/statuses|"); ///params| wsSendMsg(ws, "/params|");
} }
//сборщик paramsJson сообщений //сборщик paramsJson сообщений
if (data.includes('"params":"')) { if (data.includes('"params":"')) {
@@ -470,7 +470,7 @@
let statusJson = JSON.parse(data); let statusJson = JSON.parse(data);
if (Array.isArray(statusJson.status)) { if (Array.isArray(statusJson.status)) {
updateWidgetArr(statusJson); updateWidgetArr(statusJson);
if (debug) console.log("[i] status (arr)", ws, JSON.stringify(statusJson)); if (debug) console.log("[i] status (arr)", ws);
} else { } else {
updateWidget(statusJson); updateWidget(statusJson);
if (debug) console.log("[i] status (dgt)", ws, JSON.stringify(statusJson)); if (debug) console.log("[i] status (dgt)", ws, JSON.stringify(statusJson));
@@ -643,7 +643,7 @@
async function onParced() { async function onParced() {
if (currentPageName === "/|") { if (currentPageName === "/|") {
clearParcedFlags(); clearParcedFlags();
if (debug) console.log("✔", "dashboard packet received"); if (debug) console.log("✔", "dashboard data received");
dashReady = true; dashReady = true;
} }
if (currentPageName === "/config|" && itemsJsonParced && widgetsJsonParced && configJsonParced && settingsJsonParced && scenarioJsonParced) { if (currentPageName === "/config|" && itemsJsonParced && widgetsJsonParced && configJsonParced && settingsJsonParced && scenarioJsonParced) {
@@ -677,7 +677,7 @@
function saveConfig() { function saveConfig() {
wsSendMsg(selectedWs, "/tuoyal|" + JSON.stringify(generateLayout())); wsSendMsg(selectedWs, "/tuoyal|" + JSON.stringify(generateLayout()));
del(); modify();
wsSendMsg(selectedWs, "/gifnoc|" + JSON.stringify(configJson)); wsSendMsg(selectedWs, "/gifnoc|" + JSON.stringify(configJson));
wsSendMsg(selectedWs, "/oiranecs|" + JSON.stringify(scenarioJson)); wsSendMsg(selectedWs, "/oiranecs|" + JSON.stringify(scenarioJson));
clearData(); clearData();
@@ -726,7 +726,7 @@
return input; return input;
} }
function del() { function modify() {
for (let i = 0; i < configJson.length; i++) { for (let i = 0; i < configJson.length; i++) {
let config = configJson[i]; let config = configJson[i];
delete config["show"]; delete config["show"];

View File

@@ -25,6 +25,7 @@
if (itemsJsonBind === item.num) { if (itemsJsonBind === item.num) {
delete item.num; delete item.num;
delete item.name; delete item.name;
item.id = item.id + randomInteger(0, 100);
configJson.push(item); configJson.push(item);
configJson = configJson; configJson = configJson;
itemsJsonBind = 0; itemsJsonBind = 0;
@@ -34,6 +35,12 @@
} }
} }
function randomInteger(min, max) {
// получить случайное число от (min-0.5) до (max+0.5)
let rand = min - 0.5 + Math.random() * (max - min + 1);
return Math.round(rand);
}
function deleteLineFromConfig(num) { function deleteLineFromConfig(num) {
for (let i = 0; i < configJson.length; i++) { for (let i = 0; i < configJson.length; i++) {
if (num === i) { if (num === i) {

View File

@@ -38,7 +38,7 @@
function collectDataToArr() { function collectDataToArr() {
if (prevStatus !== widget.status && !firstTime) { if (prevStatus !== widget.status && !firstTime) {
if (Array.isArray(widget.status)) { if (Array.isArray(widget.status)) {
console.log("[i]", "======================================================="); //console.log("[i]", "=======================================================");
prevStatus = widget.status; prevStatus = widget.status;
for (let i = 0; i < widget.status.length; i++) { for (let i = 0; i < widget.status.length; i++) {
@@ -54,7 +54,7 @@
if (widget.maxCount == 0 || widget.maxCount == "0") { if (widget.maxCount == 0 || widget.maxCount == "0") {
clearCart(); clearCart();
console.log("[i]", "clear cart data"); //console.log("[i]", "clear cart data");
return; return;
} }