2 files changed, 74 insertions, 46 deletions
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 {