From 4c1ce6031b4393304d06398b29720d1dab18539c Mon Sep 17 00:00:00 2001
From: Vladislav Ostapov <Vlados.ost.31@yandex.ru>
Date: Fri, 8 Nov 2024 18:08:47 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B2?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=83=D1=8E=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?=
 =?UTF-8?q?=D1=8E=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D1=82=D0=B8=D0=BF=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20QoS,=20=D0=BE=D1=81=D1=82=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=BE=D1=81=D1=8C=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B5=D0=B5=20?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=81=D0=BE=D1=85=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=80=D1=83=D1=82=D0=B8=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/main.html | 116 +++++++++++++++++++++++++----------------------
 1 file changed, 62 insertions(+), 54 deletions(-)

diff --git a/static/main.html b/static/main.html
index 9a16a11..96bf1cf 100644
--- a/static/main.html
+++ b/static/main.html
@@ -432,63 +432,71 @@
                     <span class="toggle-input"><input type="checkbox" v-model="qos.en" /><span class="slider"></span></span>
                 </label>
             </div>
-            <h3>Классы CD</h3>
-            <button class="action-button" @click="qosAddClass('cd')">Добавить класс CD</button>
-            <details v-for="(rule, index) in qos.cd" :key="index" class="settings-set-container">
-                <summary >#{{ index }} CIR={{ rule.cir }}кбит, PIR={{ rule.pir }}кбит {{ rule.description }}</summary>
-                <label>
-                    <span>CIR</span>
-                    <input v-model="rule.cir" type="number"/>
-                </label>
-                <label>
-                    <span>PIR</span>
-                    <input v-model="rule.pir" type="number"/>
-                </label>
-                <label>
-                    <span>Описание</span>
-                    <input v-model="rule.description"/>
-                </label>
+            <template>
+                <div v-for="classesGroup in ['rt1', 'rt2', 'rt3', 'cd']">
+                    <h3>Классы {{ classesGroup.toUpperCase() }}</h3>
+                    <button class="action-button" @click="qosAddClass(classesGroup)">Добавить класс {{ classesGroup.toUpperCase() }}</button>
+                    <details v-for="(rule, index) in qos[classesGroup]" :key="index" class="settings-set-container">
+                        <summary v-if="classesGroup === 'cd'">#{{ index }} CIR={{ rule.cir }}кбит, PIR={{ rule.pir }}кбит {{ rule.description }}</summary>
+                        <summary v-if="classesGroup !== 'cd'">#{{ index }} CBR={{ rule.cir }}кбит {{ rule.description }}</summary>
+                        <label>
+                            <span v-if="classesGroup === 'cd'">CIR</span> <span v-if="classesGroup !== 'cd'">CBR</span>
+                            <input v-model="rule.cir" type="number"/>
+                        </label>
+                        <label v-if="classesGroup === 'cd'">
+                            <span>PIR</span>
+                            <input v-model="rule.pir" type="number"/>
+                        </label>
+                        <label>
+                            <span>Описание</span>
+                            <input v-model="rule.description"/>
+                        </label>
 
-                <h3>Фильтры ({{ rule.filters.length }})</h3>
-                <div>
-                    <button class="action-button" @click="qosClassAddRule('cd', index)">Добавить правило</button>
-                </div>
-                <details v-for="(filter, filterIndex) in rule.filters" :key="filterIndex" class="settings-set-container">
-                    <summary><span>#{{ filterIndex }} {{ qosGenerateRuleDescription(filter) }}</span> <button class="dangerous-button" @click="qosDelFilter('cd', index, filterIndex)">Del</button></summary>
-                    <label>
-                        <span>VLAN ID</span>
-                        <input v-model="filter.vlan" type="text">
-                    </label>
-                    <label>
-                        <span>Протокол L3</span>
-                        <input v-model="filter.proto" type="text">
-                    </label>
-                    <label>
-                        <span>Порт источника</span>
-                        <input v-model="filter.sport" type="text">
-                    </label>
-                    <label>
-                        <span>Порт назначения</span>
-                        <input v-model="filter.dport" type="text">
-                    </label>
-                    <label>
-                        <span>IP источника</span>
-                        <input v-model="filter.ip_src" type="text">
-                    </label>
-                    <label>
-                        <span>IP назначения</span>
-                        <input v-model="filter.ip_dest" type="text">
-                    </label>
-                    <label>
-                        <span>Метка IP.DSCP</span>
-                        <input v-model="filter.dscp" type="text">
-                    </label>
-                </details>
+                        <h3>Фильтры ({{ rule.filters.length }})</h3>
+                        <div>
+                            <button class="action-button" @click="qosClassAddRule(classesGroup, index)">Добавить правило</button>
+                        </div>
+                        <details v-for="(filter, filterIndex) in rule.filters" :key="filterIndex" class="settings-set-container">
+                            <summary><span>#{{ filterIndex }} {{ qosGenerateRuleDescription(filter) }}</span> <button class="dangerous-button" @click="qosDelFilter(classesGroup, index, filterIndex)">Del</button></summary>
+                            <label>
+                                <span>VLAN ID</span>
+                                <input v-model="filter.vlan" type="text">
+                            </label>
+                            <label>
+                                <span>Протокол L3</span>
+                                <input v-model="filter.proto" type="text">
+                            </label>
+                            <label>
+                                <span>Порт источника</span>
+                                <input v-model="filter.sport" type="text">
+                            </label>
+                            <label>
+                                <span>Порт назначения</span>
+                                <input v-model="filter.dport" type="text">
+                            </label>
+                            <label>
+                                <span>IP источника</span>
+                                <input v-model="filter.ip_src" type="text">
+                            </label>
+                            <label>
+                                <span>IP назначения</span>
+                                <input v-model="filter.ip_dest" type="text">
+                            </label>
+                            <label>
+                                <span>Метка IP.DSCP</span>
+                                <input v-model="filter.dscp" type="text">
+                            </label>
+                        </details>
 
-                <div>
-                    <button class="dangerous-button" @click="qosDelClass('cd', index)">Удалить класс QoS</button>
+                        <div>
+                            <button class="dangerous-button" @click="qosDelClass(classesGroup, index)">Удалить класс QoS</button>
+                        </div>
+                    </details>
                 </div>
-            </details>
+            </template>
+
+
+
             <button class="action-button" @click="settingsSubmitQoS()">Применить <span class="submit-spinner" v-show="submitStatus.qos"></span></button>
 
             <p>