mirror of
https://github.com/IoTManagerProject/IoTManagerWeb.git
synced 2026-03-26 15:02:21 +03:00
fixed
This commit is contained in:
@@ -11,8 +11,7 @@
|
|||||||
router.mode.hash(); // enables hash navigation method
|
router.mode.hash(); // enables hash navigation method
|
||||||
//router.mode.memory(); // enables in-memory navigation method
|
//router.mode.memory(); // enables in-memory navigation method
|
||||||
import Card from "./widgets/Card.svelte";
|
import Card from "./widgets/Card.svelte";
|
||||||
import Input from "./Input.svelte";
|
import Input from "./widgets/Input.svelte";
|
||||||
import Myinput from "./widgets/Input.svelte";
|
|
||||||
|
|
||||||
onMount(async () => {
|
onMount(async () => {
|
||||||
console.log("mounted");
|
console.log("mounted");
|
||||||
@@ -32,67 +31,54 @@
|
|||||||
return json;
|
return json;
|
||||||
};
|
};
|
||||||
|
|
||||||
function SuperDuperFunction() {
|
function wigetsUpdate() {
|
||||||
wigets = JSON.parse(document.getElementById("text1").value);
|
wigets = JSON.parse(document.getElementById("text1").value);
|
||||||
|
findNewPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
let wigets = [];
|
let wigets = [];
|
||||||
|
|
||||||
wigets = [
|
wigets = [
|
||||||
|
{
|
||||||
|
widget: "input",
|
||||||
|
type: "date",
|
||||||
|
status: "2021-10-17",
|
||||||
|
page: "Set date and time card",
|
||||||
|
order: "4",
|
||||||
|
descr: "Switch on boiler date",
|
||||||
|
topic: "/prefix/00000-00004/date1",
|
||||||
|
ws: 1,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
widget: "input",
|
widget: "input",
|
||||||
type: "time",
|
type: "time",
|
||||||
status: "12:00",
|
status: "12:00",
|
||||||
page: "Corridor",
|
page: "Set date and time card",
|
||||||
order: "1",
|
order: "1",
|
||||||
descr: "Switch on boiler time",
|
descr: "Switch on boiler time",
|
||||||
topic: "/prefix/00000-00003/temp3",
|
topic: "/prefix/00000-00001/time",
|
||||||
|
ws: 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
widget: "input",
|
widget: "input",
|
||||||
type: "number",
|
type: "number",
|
||||||
status: "30.5",
|
status: "30.5",
|
||||||
after: "°С",
|
after: "°С",
|
||||||
page: "Corridor",
|
page: "Set any number card",
|
||||||
order: "2",
|
order: "2",
|
||||||
descr: "Boiler temperature",
|
descr: "Boiler temperature",
|
||||||
topic: "/prefix/00000-00001/temp1",
|
topic: "/prefix/00000-00002/temp",
|
||||||
|
ws: 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
widget: "input",
|
widget: "input",
|
||||||
type: "text",
|
type: "text",
|
||||||
status: "Hello",
|
status: "Hello",
|
||||||
page: "Corridor",
|
page: "Set text card",
|
||||||
order: "3",
|
order: "3",
|
||||||
descr: "Message to be send",
|
descr: "Message to be send",
|
||||||
topic: "/prefix/00000-00003/temp3",
|
topic: "/prefix/00000-00003/text",
|
||||||
},
|
ws: 1,
|
||||||
{
|
|
||||||
widget: "input",
|
|
||||||
type: "date",
|
|
||||||
status: "2021.09.15",
|
|
||||||
page: "Corridor",
|
|
||||||
order: "4",
|
|
||||||
descr: "Switch on boiler date",
|
|
||||||
topic: "/prefix/00000-00002/temp2",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
widget: "input",
|
|
||||||
type: "date",
|
|
||||||
status: "2021.09.15",
|
|
||||||
page: "Living Room",
|
|
||||||
order: "4",
|
|
||||||
descr: "Switch on boiler date",
|
|
||||||
topic: "/prefix/00000-00002/temp2",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
widget: "input",
|
|
||||||
type: "date",
|
|
||||||
status: "2021.09.15",
|
|
||||||
page: "Bedroom",
|
|
||||||
order: "4",
|
|
||||||
descr: "Switch on boiler date",
|
|
||||||
topic: "/prefix/00000-00002/temp2",
|
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -159,12 +145,16 @@
|
|||||||
{#each wigets as widget, i}
|
{#each wigets as widget, i}
|
||||||
{#if widget.page === pagesName.page}
|
{#if widget.page === pagesName.page}
|
||||||
{#if widget.widget === "input"}
|
{#if widget.widget === "input"}
|
||||||
<Myinput bind:value={widget.status} widget={widget} />
|
<Input bind:value={widget.status} widget={widget} />
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
{/each}
|
{/each}
|
||||||
</Card>
|
</Card>
|
||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
|
<Card title="Редактор JSON">
|
||||||
|
<textarea on:input={wigetsUpdate} rows="10" class="widget-input-indigo w-full" id="text1">{syntaxHighlight(JSON.stringify(wigets))}</textarea>
|
||||||
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
@@ -183,7 +173,7 @@
|
|||||||
<Route path="/utilities">
|
<Route path="/utilities">
|
||||||
<div class="cards-grid">
|
<div class="cards-grid">
|
||||||
<Card title="Редактор JSON">
|
<Card title="Редактор JSON">
|
||||||
<textarea on:input={SuperDuperFunction} rows="10" class="widget-input-indigo w-full" id="text1">{syntaxHighlight(JSON.stringify(wigets))}</textarea>
|
<textarea on:input={wigetsUpdate} rows="10" class="widget-input-indigo w-full" id="text1">{syntaxHighlight(JSON.stringify(wigets))}</textarea>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</Route>
|
</Route>
|
||||||
|
|||||||
@@ -16,16 +16,16 @@
|
|||||||
<div class="md:w-1/3 lg:w-1/3 2xl:w-1/3">
|
<div class="md:w-1/3 lg:w-1/3 2xl:w-1/3">
|
||||||
<!-- on:change={WSpush(ws, topic, value)} -->
|
<!-- on:change={WSpush(ws, topic, value)} -->
|
||||||
{#if widget.type == "number"}
|
{#if widget.type == "number"}
|
||||||
<input class="widget-input-indigo text-right" step="0.1" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="number" />
|
<input class="widget-input-indigo text-right" step="0.1" on:change={WSpush(widget.ws, widget.topic, value)} bind:value type="number" />
|
||||||
{/if}
|
{/if}
|
||||||
{#if widget.type == "text"}
|
{#if widget.type == "text"}
|
||||||
<input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="text" />
|
<input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, value)} bind:value type="text" />
|
||||||
{/if}
|
{/if}
|
||||||
{#if widget.type == "date"}
|
{#if widget.type == "date"}
|
||||||
<input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="date" />
|
<input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, value)} bind:value type="date" />
|
||||||
{/if}
|
{/if}
|
||||||
{#if widget.type == "time"}
|
{#if widget.type == "time"}
|
||||||
<input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="time" />
|
<input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, value)} bind:value type="time" />
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user