Develop #17

Merged
alisagerasimova merged 24 commits from develop into master 2026-03-30 13:22:09 +03:00
4 changed files with 21 additions and 7 deletions
Showing only changes of commit a3ce6d0ab0 - Show all commits
+11 -5
View File
@@ -67,6 +67,10 @@ async function saveResult() {
const isUsedPlatform = listOfTrips.value.some(item => item.isPlatform); const isUsedPlatform = listOfTrips.value.some(item => item.isPlatform);
const isUsedQR = listOfTrips.value.some(item => item.isQR); const isUsedQR = listOfTrips.value.some(item => item.isQR);
isModalVisible.value = true;
if (!listOfTrips.value.length) {
return
}
if (isUsedPlatform) { if (isUsedPlatform) {
let textOfCode = color let textOfCode = color
textOfCode = textOfCode.split('<<separator>>') textOfCode = textOfCode.split('<<separator>>')
@@ -102,7 +106,6 @@ async function saveResult() {
} else { } else {
finallyText.value = finallyText.value.replace("<<qr_function>>", ''); finallyText.value = finallyText.value.replace("<<qr_function>>", '');
} }
isModalVisible.value = true;
} }
function cancel() { function cancel() {
@@ -125,7 +128,10 @@ function cleanResult() {
item.variable = []; item.variable = [];
item.BgImg = 'images/ArUco-marker.jpg' item.BgImg = 'images/ArUco-marker.jpg'
}) })
listOfTrips.value = []; izitoast.info({
title: 'Поле очищено',
message: 'Поле очищено. Можно строить маршрут заново',
})
} }
// Обрабатываем нажатие Ctrl + Z // Обрабатываем нажатие Ctrl + Z
@@ -359,8 +365,9 @@ body {
.wraper { .wraper {
display: flex; display: flex;
justify-content: center; justify-content: center;
padding: 1% 0; padding-top: 20px;
//padding: 20% 0;
//TODO: рассмотреть вариант
} }
.grid { .grid {
@@ -409,7 +416,6 @@ body {
.actions { .actions {
margin: 3px 0 0 10px; margin: 3px 0 0 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 10px; gap: 10px;
+4
View File
@@ -123,6 +123,10 @@ useEventListener("keydown", handleKeydown);
border-radius: 5px; border-radius: 5px;
} }
.modal-footer a {
border-radius: 5px;
}
.modal-footer-success button { .modal-footer-success button {
background-color: var(--successColor); background-color: var(--successColor);
border: none; border: none;
+5 -1
View File
@@ -129,7 +129,7 @@ h1 {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 240px; width: 25%;
height: 100%; height: 100%;
background-image: radial-gradient(#23aae3e2, #222222); background-image: radial-gradient(#23aae3e2, #222222);
color: white; color: white;
@@ -153,6 +153,10 @@ h1 {
display: flex; display: flex;
} }
main {
text-align: justify;
}
.navigation-wrapper__footer { .navigation-wrapper__footer {
display: flex; display: flex;
gap: 10px; gap: 10px;
+1 -1
View File
@@ -1,7 +1,7 @@
import iziToast from 'iziToast'; import iziToast from 'iziToast';
iziToast.settings({ iziToast.settings({
timeout: 3000, timeout: 2500,
closeOnEscape: true, closeOnEscape: true,
closeOnClick : true, closeOnClick : true,
resetOnHover: false, resetOnHover: false,