add divider for fans, fix motherboard

4 files changed, 82 insertions, 46 deletions

diff --git a/src/assets/images/_sila/collapsed/fan.svg b/src/assets/images/_sila/collapsed/fan.svg
new file mode 100644
index 00000000..b00b459a
--- /dev/null
+++ b/src/assets/images/_sila/collapsed/fan.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.0071 14.5899C5.88063 15.1221 6.9438 15.3043 7.65225 15.3043L7.65225 9.70443C7.02871 9.57786 6.52632 9.1177 6.33946 8.51834C5.89187 8.63106 5.42752 8.80613 5.0071 9.06226C4.15196 9.58323 3.47829 10.4354 3.47829 11.8261C3.47829 13.2168 4.15196 14.0689 5.0071 14.5899ZM6.29572 7.65225H0.695659C0.695659 6.9438 0.877919 5.88063 1.41009 5.0071C1.93106 4.15196 2.7832 3.47829 4.17391 3.47829C5.56463 3.47829 6.41677 4.15196 6.93774 5.0071C7.19388 5.42754 7.36896 5.8919 7.48167 6.33951C6.88238 6.5264 6.42228 7.02876 6.29572 7.65225ZM8.34791 7.01596C8.23911 6.97751 8.12204 6.95659 8.00008 6.95659C7.86275 6.95659 7.73161 6.98312 7.61152 7.03133C7.3343 7.14262 7.11592 7.36946 7.01596 7.65225C6.97751 7.76104 6.95659 7.87812 6.95659 8.00008C6.95659 8.13735 6.9831 8.26843 7.03127 8.38849C7.14254 8.66578 7.36941 8.88422 7.65225 8.98419C7.76104 9.02264 7.87812 9.04356 8.00008 9.04356C8.18346 9.04356 8.35579 8.99625 8.50554 8.91318C8.7268 8.79044 8.89876 8.58961 8.98419 8.34791C9.02264 8.23911 9.04356 8.12204 9.04356 8.00008C9.04356 7.81664 8.99623 7.64425 8.91311 7.49447C8.79035 7.27328 8.58956 7.10138 8.34791 7.01596ZM9.586 7.28526C9.35937 6.78322 8.90135 6.40806 8.34791 6.29572V0.746159C8.96378 0.831471 9.67823 1.03288 10.2974 1.41009C11.1525 1.93106 11.8262 2.7832 11.8262 4.17391C11.8262 5.56463 11.1525 6.41677 10.2974 6.93774C10.0699 7.07632 9.82958 7.19117 9.586 7.28526ZM9.70444 8.34791C9.59208 8.9014 9.21686 9.35945 8.71476 9.58606C8.80884 9.82962 8.92369 10.0699 9.06226 10.2974C9.58323 11.1525 10.4354 11.8262 11.8261 11.8262C13.2168 11.8262 14.0689 11.1525 14.5899 10.2974C14.9671 9.67823 15.1685 8.96378 15.2538 8.34791H9.70444ZM8.34791 10.4501V16L7.65225 16C6.85343 16 5.65572 15.7997 4.64517 15.184C3.61623 14.5571 2.78264 13.4962 2.78264 11.8261C2.78264 10.1559 3.61623 9.09503 4.64517 8.46817C4.7141 8.42617 4.78391 8.38611 4.8544 8.34791H1.9281e-06L0 7.65225C0 6.85343 0.200349 5.65572 0.816001 4.64517C1.44286 3.61623 2.50376 2.78264 4.17391 2.78264C5.84407 2.78264 6.90497 3.61623 7.53183 4.64517C7.57388 4.7142 7.614 4.7841 7.65225 4.85469V0.695659V0.347832V0C8.45106 0 9.64878 0.200348 10.6593 0.816001C11.6883 1.44286 12.5219 2.50376 12.5219 4.17391C12.5219 5.84407 11.6883 6.90497 10.6593 7.53183C10.5903 7.57388 10.5204 7.614 10.4498 7.65225H15.3043H15.6522H16C16 8.45106 15.7997 9.64878 15.184 10.6593C14.5571 11.6883 13.4962 12.5219 11.8261 12.5219C10.1559 12.5219 9.09503 11.6883 8.46817 10.6593C8.42617 10.5904 8.38611 10.5206 8.34791 10.4501Z" fill="#E11717"/>
+</svg>
\ No newline at end of file
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
index a8b68791..9e5da7a5 100644
--- a/src/locales/ru-RU.json
+++ b/src/locales/ru-RU.json
@@ -833,6 +833,7 @@
   },
   "pageFans": {
     "installedFans": "Установленные вентиляторы",
+    "speed": "Показатели скорости",
     "table": {
       "name": "Имя модуля",
       "health": "Состояние",
@@ -843,6 +844,10 @@
       "minDate": "Дата минимальной",
       "max": "Максимальная",
       "maxDate": "Дата максимальной"
+    },
+    "labels": {
+      "warning": "Значение предупреждения, об/мин",
+      "shutdown": "Значение отказа, об/мин"
     }
   },
   "pageProcessors": {
diff --git a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
index 37e759bc..ccb0a0d1 100644
--- a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
+++ b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
@@ -1,55 +1,82 @@
 <template>
   <b-container fluid="xl">
     <page-title :description="$t('appPageTitle.dynamicInformation')" />
+    <table-date-picker style="margin: -2rem 0 0 -2rem" />
+    <div class="custom-divider" style="margin-top: 0">
+      <b-button
+        variant="collapse"
+        class="d-flex flex-nowrap justify-content-start"
+      >
+        <img src="@/assets/images/_sila/collapsed/fan.svg" />
+        {{ $t('pageFans.speed') }}
+      </b-button>
+      <b-row class="align-items-end p-2">
+        <b-col xs="12" md="3" class="pt-2">
+          <b-form-group :label="$t('pageFans.labels.warning')">
+            <b-form-input> </b-form-input>
+          </b-form-group>
+        </b-col>
+        <b-col xs="12" md="3" class="pt-2">
+          <b-form-group :label="$t('pageFans.labels.shutdown')">
+            <b-form-input> </b-form-input>
+          </b-form-group>
+        </b-col>
+        <b-col xs="12" md="3" class="pt-2">
+          <b-button variant="primary" style="height: 35px">
+            {{ 'Сохранить' }}
+          </b-button>
+        </b-col>
+      </b-row>
+      <chart
+        type="fans"
+        :colors="colors"
+        :data="filteredSensors"
+        :warning="fanSpeedWarninig"
+        :shutdown="fanSpeedShutdown"
+      ></chart>
 
-    <chart
-      type="fans"
-      :colors="colors"
-      :data="filteredSensors"
-      :warning="fanSpeedWarninig"
-      :shutdown="fanSpeedShutdown"
-    ></chart>
-
-    <b-table
-      v-if="items && items.length > 0"
-      responsive="md"
-      show-empty
-      table-variant="accessory"
-      hover
-      :items="items"
-      :fields="fields"
-      :empty-text="$t('global.table.emptyMessage')"
-    >
-      <template #cell(name)="{ value, index }">
-        <div
-          class="item-color"
-          :style="`background-color: ${colors[index]}`"
-        ></div>
-        {{ value }}
-      </template>
-      <template #cell(minDate)="{ value }">
-        <span style="color: rgb(12, 28, 41)">
-          {{ value.time }}
-        </span>
-        <span>
-          {{ value.date }}
-        </span>
-      </template>
-      <template #cell(maxDate)="{ value }">
-        <span style="color: rgb(12, 28, 41)">
-          {{ value.time }}
-        </span>
-        <span>
-          {{ value.date }}
-        </span>
-      </template>
-    </b-table>
+      <b-table
+        v-if="items && items.length > 0"
+        responsive="md"
+        show-empty
+        table-variant="accessory"
+        hover
+        :items="items"
+        :fields="fields"
+        :empty-text="$t('global.table.emptyMessage')"
+      >
+        <template #cell(name)="{ value, index }">
+          <div
+            class="item-color"
+            :style="`background-color: ${colors[index]}`"
+          ></div>
+          {{ value }}
+        </template>
+        <template #cell(minDate)="{ value }">
+          <span style="color: rgb(12, 28, 41)">
+            {{ value.time }}
+          </span>
+          <span>
+            {{ value.date }}
+          </span>
+        </template>
+        <template #cell(maxDate)="{ value }">
+          <span style="color: rgb(12, 28, 41)">
+            {{ value.time }}
+          </span>
+          <span>
+            {{ value.date }}
+          </span>
+        </template>
+      </b-table>
+    </div>
   </b-container>
 </template>
 
 <script>
 import PageTitle from '@/components/_sila/Global/PageTitle';
 import Chart from '@/components/_sila/Global/Chart';
+import TableDatePicker from '@/components/_sila/Global/TableDatePicker';
 
 import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
@@ -57,7 +84,7 @@ import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
 import { getItems } from '@/utilities/_sila/metricProperties';
 
 export default {
-  components: { PageTitle, Chart },
+  components: { PageTitle, Chart, TableDatePicker },
   mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin],
   data() {
     return {
diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue
index 9c92a974..628cb92f 100644
--- a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue
+++ b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue
@@ -1,9 +1,9 @@
 <template>
   <b-container fluid="xl">
     <page-title :description="$t('appPageTitle.dynamicInformation')" />
-    <div class="custom-divider" style="margin-top: -2rem">
+    <table-date-picker style="margin: -2rem 0 0 -2rem" />
+    <div class="custom-divider" style="margin-top: 0">
       <b-button
-        v-b-toggle="id"
         variant="collapse"
         class="d-flex flex-nowrap justify-content-start"
       >
@@ -78,6 +78,7 @@
 <script>
 import PageTitle from '@/components/_sila/Global/PageTitle';
 import Chart from '@/components/_sila/Global/Chart';
+import TableDatePicker from '@/components/_sila/Global/TableDatePicker';
 
 import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
@@ -85,7 +86,7 @@ import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
 import { getItems } from '@/utilities/_sila/metricProperties';
 
 export default {
-  components: { PageTitle, Chart },
+  components: { PageTitle, Chart, TableDatePicker },
   mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin],
   data() {
     return {