From a7c0ad75f0b990c695d3ab1761148bf1a6da2d12 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova
Date: Thu, 20 Jun 2024 09:18:50 +0300
Subject: [PATCH] fix typo
---
assets/main.scss | 2 +-
components/calcValues.vue | 16 +++++-----------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/assets/main.scss b/assets/main.scss
index 49d8777..66ab052 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -131,7 +131,7 @@ label {
}
input {
- @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed invalid:border-pink-500 invalid:text-pink-600 focus:invalid:border-pink-500 focus:invalid:ring-pink-500;
+ @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed;
}
textarea {
diff --git a/components/calcValues.vue b/components/calcValues.vue
index 66214c1..bf7f5b0 100644
--- a/components/calcValues.vue
+++ b/components/calcValues.vue
@@ -97,11 +97,6 @@ const changeParametres = () => {
form_state.extra_section = 0
}
- form_refs.total_length.value.setCustomValidity('')
- if (form_state.extra_section && form_state.extra_section < parametric.length.min) {
- form_refs.total_length.value.setCustomValidity('Расчет невозможен')
- }
-
total_length.value = form_state.total_length
lamelles_count.value = lamelles
fence_section.value = form_state.length * 0.001
@@ -195,10 +190,9 @@ const plurals = {
Забор общей длиной {{ form_state.total_length }}{{ '\xa0' }}м,
{{ section_count }}
по
- {{ parseInt(form_state.length).toFixed(2) }}{{ '\xa0' }}мм
- и 1 дополнительная секция длиной {{ form_state.extra_section.toFixed(2) }}{{ '\xa0'
- }}мм.
+ {{ `${parseInt(form_state.length).toFixed(2)}\xa0мм` }}{{
+ form_state.extra_section ? `и 1 дополнительная секция
+ длиной ${form_state.extra_section.toFixed(2)}\xa0мм` : '' }}
Всего
@@ -207,9 +201,9 @@ const plurals = {
{{ section_count * lamelles_count }}
- {{ `длиной ${parseInt(form_state.length).toFixed(2)}\xa0мм` }}
- {{ `и ${~~(!!form_state.extra_section.toFixed(2)) * lamelles_count}` }}
+ {{ ` и ${~~(!!form_state.extra_section.toFixed(2)) * lamelles_count}` }}
{{ `длиной ${form_state.extra_section}\xa0мм` }}
.