flask_inference_api_g

Sleeping

App Files Files Community

DmitrMakeev commited on Mar 14

Commit

bf9b840

verified ·

1 Parent(s): 1c86ac2

Update calculate.html

Browse files

Files changed (1) hide show

calculate.html +18 -16

calculate.html CHANGED Viewed

@@ -6,10 +6,12 @@
     <title>Расчёт удобрений с азотом</title>
     <style>
         body { font-family: Arial, sans-serif; margin: 20px; }
-        input { padding: 8px; margin: 5px; width: 200px; }
         button { padding: 8px 12px; cursor: pointer; margin-top: 10px; }
         .result { margin-top: 20px; }
-        .fertilizer-group { margin-bottom: 15px; }
     </style>
 </head>
 <body>
@@ -19,31 +21,31 @@
         <h3>Введите состав удобрений (%):</h3>
         <div class="fertilizer-group">
             <label>Ca в Ca(NO₃)₂·4H₂O:</label>
-            <input type="number" id="ca_content_ca" value="19.3" step="0.1"><br>
             <label>N в Ca(NO₃)₂·4H₂O:</label>
             <input type="number" id="ca_content_n" value="14.9" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>P в KH₂PO₄:</label>
-            <input type="number" id="kh2po4_content_p" value="21.8" step="0.1"><br>
             <label>K в KH₂PO₄:</label>
             <input type="number" id="kh2po4_content_k" value="27.4" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>K в KNO₃:</label>
-            <input type="number" id="kno3_content_k" value="38" step="0.1"><br>
             <label>N в KNO₃:</label>
             <input type="number" id="kno3_content_n" value="13.5" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>Mg в MgSO₄·7H₂O:</label>
-            <input type="number" id="mgso4_content_mg" value="10.14" step="0.1"><br>
             <label>S в MgSO₄·7H₂O:</label>
             <input type="number" id="mgso4_content_s" value="13.5" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>K в K₂SO₄:</label>
-            <input type="number" id="k2so4_content_k" value="41.5" step="0.1"><br>
             <label>S в K₂SO₄:</label>
             <input type="number" id="k2so4_content_s" value="18" step="0.1">
         </div>
@@ -128,7 +130,7 @@
             const caNO3FromCa = ca / caContentCa;
             const nFromCaNO3Min = caNO3FromCa * caContentN;
-            // 6. NH₄NO₃ и дополнительный Ca(NO₃)₂ для N
             const nRemaining = nitrogen - nFromKNO3 - nFromCaNO3Min;
             const nFromNH4NO3 = nRemaining * nRatio;
             const nFromCaNO3Extra = nRemaining * (1 - nRatio);
@@ -144,19 +146,19 @@
             const totalMg = (mgso4 * mgso4ContentMg).toFixed(2);
             const totalS = (mgso4 * mgso4ContentS + k2so4 * k2so4ContentS).toFixed(2);
-            // Вывод результата
-            const resultText = `
-                <h3>Необходимые удобрения (г/1000 л):</h3>
-                <p>Ca(NO₃)₂·4H₂O: ${caNO3Total.toFixed(2)} (N: ${(caNO3Total * caContentN).toFixed(2)}, Ca: ${totalCa})</p>
-                <p>NH₄NO₃: ${nh4no3.toFixed(2)} (N: ${(nh4no3 * nh4no3ContentN).toFixed(2)})</p>
-                <p>KH₂PO₄: ${kh2po4.toFixed(2)} (P: ${totalP}, K: ${kFromKH2PO4.toFixed(2)})</p>
-                <p>KNO₃: ${kno3.toFixed(2)} (N: ${nFromKNO3.toFixed(2)}, K: ${(kno3 * kno3ContentK).toFixed(2)})</p>
                 <p>MgSO₄·7H₂O: ${mgso4.toFixed(2)} (Mg: ${totalMg}, S: ${sFromMgSO4.toFixed(2)})</p>
                 <p>K₂SO₄: ${k2so4.toFixed(2)} (K: ${kFromK2SO4.toFixed(2)}, S: ${(k2so4 * k2so4ContentS).toFixed(2)})</p>
                 <h3>Итоговые концентрации (мг/л):</h3>
                 <p>N: ${totalN}, P: ${totalP}, K: ${totalK}, Ca: ${totalCa}, Mg: ${totalMg}, S: ${totalS}</p>
             `;
-            document.getElementById("result").innerHTML = resultText;
         }
     </script>
 </body>

     <title>Расчёт удобрений с азотом</title>
     <style>
         body { font-family: Arial, sans-serif; margin: 20px; }
+        input { padding: 8px; margin: 5px; width: 100px; }
         button { padding: 8px 12px; cursor: pointer; margin-top: 10px; }
         .result { margin-top: 20px; }
+        .fertilizer-group { margin-bottom: 15px; display: flex; align-items: center; }
+        .fertilizer-group label { margin-right: 10px; }
+        .fertilizer-group input { margin-right: 20px; }
     </style>
 </head>
 <body>
         <h3>Введите состав удобрений (%):</h3>
         <div class="fertilizer-group">
             <label>Ca в Ca(NO₃)₂·4H₂O:</label>
+            <input type="number" id="ca_content_ca" value="19.3" step="0.1">
             <label>N в Ca(NO₃)₂·4H₂O:</label>
             <input type="number" id="ca_content_n" value="14.9" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>P в KH₂PO₄:</label>
+            <input type="number" id="kh2po4_content_p" value="21.8" step="0.1">
             <label>K в KH₂PO₄:</label>
             <input type="number" id="kh2po4_content_k" value="27.4" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>K в KNO₃:</label>
+            <input type="number" id="kno3_content_k" value="38" step="0.1">
             <label>N в KNO₃:</label>
             <input type="number" id="kno3_content_n" value="13.5" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>Mg в MgSO₄·7H₂O:</label>
+            <input type="number" id="mgso4_content_mg" value="10.14" step="0.1">
             <label>S в MgSO₄·7H₂O:</label>
             <input type="number" id="mgso4_content_s" value="13.5" step="0.1">
         </div>
         <div class="fertilizer-group">
             <label>K в K₂SO₄:</label>
+            <input type="number" id="k2so4_content_k" value="41.5" step="0.1">
             <label>S в K₂SO₄:</label>
             <input type="number" id="k2so4_content_s" value="18" step="0.1">
         </div>
             const caNO3FromCa = ca / caContentCa;
             const nFromCaNO3Min = caNO3FromCa * caContentN;
+            // 6. Распределение остатка N между NH₄NO₃ и Ca(NO₃)₂
             const nRemaining = nitrogen - nFromKNO3 - nFromCaNO3Min;
             const nFromNH4NO3 = nRemaining * nRatio;
             const nFromCaNO3Extra = nRemaining * (1 - nRatio);
             const totalMg = (mgso4 * mgso4ContentMg).toFixed(2);
             const totalS = (mgso4 * mgso4ContentS + k2so4 * k2so4ContentS).toFixed(2);
+            // Отображение результатов
+            const result = `
+                <h3>Результат расчёта (г/1000 л):</h3>
                 <p>MgSO₄·7H₂O: ${mgso4.toFixed(2)} (Mg: ${totalMg}, S: ${sFromMgSO4.toFixed(2)})</p>
                 <p>K₂SO₄: ${k2so4.toFixed(2)} (K: ${kFromK2SO4.toFixed(2)}, S: ${(k2so4 * k2so4ContentS).toFixed(2)})</p>
+                <p>KH₂PO₄: ${kh2po4.toFixed(2)} (P: ${totalP}, K: ${kFromKH2PO4.toFixed(2)})</p>
+                <p>KNO₃: ${kno3.toFixed(2)} (N: ${nFromKNO3.toFixed(2)}, K: ${(kno3 * kno3ContentK).toFixed(2)})</p>
+                <p>Ca(NO₃)₂·4H₂O: ${caNO3Total.toFixed(2)} (N: ${(caNO3Total * caContentN).toFixed(2)}, Ca: ${totalCa})</p>
+                <p>NH₄NO₃: ${nh4no3.toFixed(2)} (N: ${(nh4no3 * nh4no3ContentN).toFixed(2)})</p>
                 <h3>Итоговые концентрации (мг/л):</h3>
                 <p>N: ${totalN}, P: ${totalP}, K: ${totalK}, Ca: ${totalCa}, Mg: ${totalMg}, S: ${totalS}</p>
             `;
+            document.getElementById("result").innerHTML = result;
         }
     </script>
 </body>