From ff01827eca7c0cdc7c1b4242483b766035587ad6 Mon Sep 17 00:00:00 2001
From: Maksim Zakharov <m.zakharov@IBS.RU>
Date: Tue, 16 Aug 2022 12:55:15 +0300
Subject: add second table to Fans, fix dynamic pages layouts

---
 src/views/_sila/Fans/Dynamic/FanSpeed.vue        | 229 ---------------------
 src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue     | 246 ++++++++++++++++++++++
 src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue  | 248 +++++++++++++++++++++++
 src/views/_sila/Fans/Dynamic/FansDynamicPage.vue |   8 +-
 4 files changed, 499 insertions(+), 232 deletions(-)
 delete mode 100644 src/views/_sila/Fans/Dynamic/FanSpeed.vue
 create mode 100644 src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue
 create mode 100644 src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue

(limited to 'src/views/_sila/Fans/Dynamic')

diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
deleted file mode 100644
index 6d76afe1..00000000
--- a/src/views/_sila/Fans/Dynamic/FanSpeed.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <div>
-    <b-col class="d-flex flex-nowrap align-items-center page-divider">
-      <img src="@/assets/images/_sila/collapsed/fan.svg" />
-      {{ $t('pageFans.speed') }}
-    </b-col>
-    <!--    <b-row class="align-items-end limit-container">
-      <b-col xs="12" sm="6" md="4" class="pt-2">
-        <b-form-group :label="$t('pageFans.labels.warning')">
-          <b-form-input v-model="warning" type="number" :min="0" :max="3150">
-          </b-form-input>
-        </b-form-group>
-      </b-col>
-      <b-col xs="12" sm="6" md="4" class="pt-2">
-        <b-form-group :label="$t('pageFans.labels.shutdown')">
-          <b-form-input
-            v-model="shutdown"
-            :min="warning"
-            :max="4000"
-            type="number"
-          ></b-form-input>
-        </b-form-group>
-      </b-col>
-      <b-col xs="12" sm="6" md="4" class="pt-2">
-        <b-button variant="primary" style="height: 35px">
-          {{ $t('global.action.save') }}
-        </b-button>
-      </b-col>
-    </b-row>-->
-    <chart
-      type="fans"
-      :colors="colors"
-      :time-scale="timeScale"
-      :data="filteredSensors"
-      :warning="warning"
-      :shutdown="shutdown"
-    ></chart>
-
-    <b-table
-      responsive="md"
-      show-empty
-      table-variant="accessory"
-      hover
-      :items="items"
-      :fields="fields"
-      :empty-text="$t('global.table.emptyMessage')"
-      :bisy="isBusy"
-    >
-      <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>
-      <template #cell(pwm)="{ value }">
-        <span>
-          {{ `${value}%` }}
-        </span>
-      </template>
-    </b-table>
-  </div>
-</template>
-<script>
-import Chart from '@/components/_sila/Global/Chart';
-
-import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
-import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
-import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
-
-import { getItems } from '@/utilities/_sila/metricProperties';
-
-export default {
-  components: { Chart },
-  mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin],
-  props: {
-    timeScale: {
-      type: String,
-      default: 'hour',
-    },
-  },
-  data() {
-    return {
-      warning: 2450,
-      shutdown: 3150,
-      isBusy: true,
-      fields: [
-        {
-          key: 'name',
-          label: this.$t('pageFans.table.name'),
-        },
-        {
-          key: 'current',
-          label: this.$t('pageFans.table.current'),
-        },
-        {
-          key: 'middle',
-          label: this.$t('pageFans.table.middle'),
-        },
-        {
-          key: 'pwm',
-          label: this.$t('pageFans.table.pwm'),
-        },
-        {
-          key: 'min',
-          label: this.$t('pageFans.table.min'),
-        },
-        {
-          key: 'minDate',
-          label: this.$t('pageFans.table.minDate'),
-        },
-        {
-          key: 'max',
-          label: this.$t('pageFans.table.max'),
-        },
-        {
-          key: 'maxDate',
-          label: this.$t('pageFans.table.maxDate'),
-        },
-      ],
-    };
-  },
-
-  computed: {
-    items() {
-      const allArr = getItems(this.filteredSensors);
-
-      let pwmArr = allArr.filter((item) => {
-        return item.name.toLowerCase().includes('pwm');
-      });
-
-      let cpuArr = allArr.filter((item) => {
-        return !item.name.toLowerCase().includes('pwm');
-      });
-
-      return cpuArr.map((cpu) => {
-        let pwm = pwmArr.find((pwm) => pwm.name === this.getPwmByCpu(cpu.name))
-          .middle;
-        return {
-          pwm,
-          ...cpu,
-        };
-      });
-    },
-
-    allSensors() {
-      return this.timeScale === 'hour'
-        ? this.$store.getters['fan/fansLastHour']
-        : this.$store.getters['fan/fans'];
-    },
-
-    filteredSensors() {
-      return this.getFilteredTableData(this.allSensors, this.activeFilters);
-    },
-
-    colors() {
-      return this.$randomColor({
-        count: this.items?.length,
-        hue: 'random',
-        luminosity: 'random',
-      });
-    },
-  },
-
-  watch: {
-    timeScale() {
-      this.loadData();
-    },
-  },
-
-  created() {
-    this.loadData();
-  },
-
-  methods: {
-    getPwmByCpu(cpu) {
-      switch (cpu) {
-        case 'System_Fan_1':
-          return 'Pwm_1';
-        case 'System_Fan_2':
-          return 'Pwm_5';
-        case 'System_Fan_3':
-          return 'Pwm_6';
-        case 'CPU1_Fan':
-          return 'Pwm_7';
-        case 'CPU2_Fan':
-          return 'Pwm_8';
-        default:
-          return null;
-      }
-    },
-
-    onOpened(state) {
-      if (state) {
-        this.loadData();
-      }
-    },
-
-    loadData() {
-      let payload = { lastHour: false };
-      if (this.timeScale === 'hour') {
-        payload = { lastHour: true };
-      }
-
-      this.startLoader();
-      this.$store.dispatch('fan/getFansDynamic', payload).finally(() => {
-        this.endLoader();
-        this.isBusy = false;
-      });
-    },
-  },
-};
-</script>
diff --git a/src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue b/src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue
new file mode 100644
index 00000000..10f6c9c5
--- /dev/null
+++ b/src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue
@@ -0,0 +1,246 @@
+<template>
+  <collapse
+    id="collapse_FansCpu"
+    :title="$t('pageFans.speed')"
+    @opened="onOpened"
+  >
+    <template #image>
+      <img src="@/assets/images/_sila/collapsed/fan.svg" />
+    </template>
+    <page-section>
+      <!-- <b-row class="align-items-end limit-container">
+        <b-col xs="12" md="6" xl="3" class="pt-4">
+          <b-form-group :label="$t('pageFans.labels.warning')">
+            <b-form-input
+              v-model="warning"
+              type="number"
+              :min="0"
+              :max="shutdown"
+            >
+            </b-form-input>
+          </b-form-group>
+        </b-col>
+        <b-col xs="12" md="6" xl="3" class="pt-4">
+          <b-form-group :label="$t('pageFans.labels.shutdown')">
+            <b-form-input
+              v-model="shutdown"
+              :min="warning"
+              :max="10000"
+              type="number"
+            ></b-form-input>
+          </b-form-group>
+        </b-col>
+        <b-col xs="12" md="6" xl="3" class="pt-4">
+          <b-button variant="primary" style="height: 35px">
+            {{ $t('global.action.save') }}
+          </b-button>
+        </b-col>
+      </b-row> -->
+      <chart
+        type="fans"
+        :colors="colors"
+        :time-scale="timeScale"
+        :data="filteredForChart"
+        :warning="warning"
+        :shutdown="shutdown"
+      ></chart>
+
+      <b-table
+        responsive="md"
+        show-empty
+        table-variant="accessory"
+        hover
+        :items="items"
+        :fields="fields"
+        :empty-text="$t('global.table.emptyMessage')"
+        :bisy="isBusy"
+      >
+        <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>
+        <template #cell(pwm)="{ value }">
+          <span>
+            {{ `${value}%` }}
+          </span>
+        </template>
+      </b-table>
+    </page-section>
+  </collapse>
+</template>
+<script>
+import Chart from '@/components/_sila/Global/Chart';
+import PageSection from '@/components/Global/PageSection';
+
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
+import Collapse from '@/components/_sila/Global/Collapse';
+
+import { getItems } from '@/utilities/_sila/metricProperties';
+import { fanFilter } from '@/utilities/_sila/psuFilter';
+
+export default {
+  components: { PageSection, Chart, Collapse },
+  mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin],
+  props: {
+    timeScale: {
+      type: String,
+      default: 'hour',
+    },
+  },
+  data() {
+    return {
+      warning: 7500,
+      shutdown: 8500,
+      isBusy: true,
+      fields: [
+        {
+          key: 'name',
+          label: this.$t('pageFans.table.name'),
+        },
+        {
+          key: 'current',
+          label: this.$t('pageFans.table.current'),
+        },
+        {
+          key: 'middle',
+          label: this.$t('pageFans.table.middle'),
+        },
+        {
+          key: 'pwm',
+          label: this.$t('pageFans.table.pwm'),
+        },
+        {
+          key: 'min',
+          label: this.$t('pageFans.table.min'),
+        },
+        {
+          key: 'minDate',
+          label: this.$t('pageFans.table.minDate'),
+        },
+        {
+          key: 'max',
+          label: this.$t('pageFans.table.max'),
+        },
+        {
+          key: 'maxDate',
+          label: this.$t('pageFans.table.maxDate'),
+        },
+      ],
+    };
+  },
+
+  computed: {
+    items() {
+      const allArr = getItems(this.filteredSensors);
+
+      let pwmArr = allArr.filter((item) => {
+        return item.name.toLowerCase().includes('pwm');
+      });
+
+      let cpuArr = allArr.filter((item) => {
+        return !item.name.toLowerCase().includes('pwm');
+      });
+
+      return cpuArr.map((cpu) => {
+        let pwm = pwmArr.find((pwm) => pwm.name === this.getPwmByCpu(cpu.name))
+          .middle;
+        return {
+          pwm,
+          ...cpu,
+        };
+      });
+    },
+
+    allSensors() {
+      return this.timeScale === 'hour'
+        ? this.$store.getters['fan/fansLastHour']
+        : this.$store.getters['fan/fans'];
+    },
+
+    preFiltered() {
+      return fanFilter(this.allSensors, 'CPU').concat(
+        fanFilter(this.allSensors, 'pwm')
+      );
+    },
+
+    filteredForChart() {
+      return fanFilter(this.allSensors, 'CPU');
+    },
+
+    filteredSensors() {
+      return this.getFilteredTableData(this.preFiltered, this.activeFilters);
+    },
+
+    colors() {
+      return this.$randomColor({
+        count: this.items?.length,
+        hue: 'random',
+        luminosity: 'random',
+      });
+    },
+  },
+
+  watch: {
+    timeScale() {
+      this.loadData();
+    },
+  },
+
+  created() {
+    this.loadData();
+  },
+
+  methods: {
+    getPwmByCpu(cpu) {
+      switch (cpu) {
+        case 'CPU1_Fan':
+          return 'Pwm_7';
+        case 'CPU2_Fan':
+          return 'Pwm_8';
+        default:
+          return null;
+      }
+    },
+
+    onOpened(state) {
+      if (state) {
+        this.loadData();
+      }
+    },
+
+    loadData() {
+      let payload = { lastHour: false };
+      if (this.timeScale === 'hour') {
+        payload = { lastHour: true };
+      }
+
+      this.startLoader();
+      this.$store.dispatch('fan/getFansDynamic', payload).finally(() => {
+        this.endLoader();
+        this.isBusy = false;
+      });
+    },
+  },
+};
+</script>
diff --git a/src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue b/src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue
new file mode 100644
index 00000000..06f4dd14
--- /dev/null
+++ b/src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue
@@ -0,0 +1,248 @@
+<template>
+  <collapse
+    id="collapse_FansSystem"
+    :title="$t('pageFans.speedSystem')"
+    @opened="onOpened"
+  >
+    <template #image>
+      <img src="@/assets/images/_sila/collapsed/fan.svg" />
+    </template>
+    <page-section>
+      <!-- <b-row class="align-items-end limit-container">
+        <b-col xs="12" md="6" xl="3" class="pt-4">
+          <b-form-group :label="$t('pageFans.labels.warning')">
+            <b-form-input
+              v-model="warning"
+              type="number"
+              :min="0"
+              :max="shutdown"
+            >
+            </b-form-input>
+          </b-form-group>
+        </b-col>
+        <b-col xs="12" md="6" xl="3" class="pt-4">
+          <b-form-group :label="$t('pageFans.labels.shutdown')">
+            <b-form-input
+              v-model="shutdown"
+              :min="warning"
+              :max="10000"
+              type="number"
+            ></b-form-input>
+          </b-form-group>
+        </b-col>
+        <b-col xs="12" md="6" xl="3" class="pt-4">
+          <b-button variant="primary" style="height: 35px">
+            {{ $t('global.action.save') }}
+          </b-button>
+        </b-col>
+      </b-row> -->
+      <chart
+        type="fans"
+        :colors="colors"
+        :time-scale="timeScale"
+        :data="filteredForChart"
+        :warning="warning"
+        :shutdown="shutdown"
+      ></chart>
+
+      <b-table
+        responsive="md"
+        show-empty
+        table-variant="accessory"
+        hover
+        :items="items"
+        :fields="fields"
+        :empty-text="$t('global.table.emptyMessage')"
+        :bisy="isBusy"
+      >
+        <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>
+        <template #cell(pwm)="{ value }">
+          <span>
+            {{ `${value}%` }}
+          </span>
+        </template>
+      </b-table>
+    </page-section>
+  </collapse>
+</template>
+<script>
+import Chart from '@/components/_sila/Global/Chart';
+import PageSection from '@/components/Global/PageSection';
+
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
+import Collapse from '@/components/_sila/Global/Collapse';
+
+import { getItems } from '@/utilities/_sila/metricProperties';
+import { fanFilter } from '@/utilities/_sila/psuFilter';
+
+export default {
+  components: { PageSection, Chart, Collapse },
+  mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin],
+  props: {
+    timeScale: {
+      type: String,
+      default: 'hour',
+    },
+  },
+  data() {
+    return {
+      warning: 8900,
+      shutdown: 9500,
+      isBusy: true,
+      fields: [
+        {
+          key: 'name',
+          label: this.$t('pageFans.table.name'),
+        },
+        {
+          key: 'current',
+          label: this.$t('pageFans.table.current'),
+        },
+        {
+          key: 'middle',
+          label: this.$t('pageFans.table.middle'),
+        },
+        {
+          key: 'pwm',
+          label: this.$t('pageFans.table.pwm'),
+        },
+        {
+          key: 'min',
+          label: this.$t('pageFans.table.min'),
+        },
+        {
+          key: 'minDate',
+          label: this.$t('pageFans.table.minDate'),
+        },
+        {
+          key: 'max',
+          label: this.$t('pageFans.table.max'),
+        },
+        {
+          key: 'maxDate',
+          label: this.$t('pageFans.table.maxDate'),
+        },
+      ],
+    };
+  },
+
+  computed: {
+    items() {
+      const allArr = getItems(this.filteredSensors);
+
+      let pwmArr = allArr.filter((item) => {
+        return item.name.toLowerCase().includes('pwm');
+      });
+
+      let cpuArr = allArr.filter((item) => {
+        return !item.name.toLowerCase().includes('pwm');
+      });
+
+      return cpuArr.map((cpu) => {
+        let pwm = pwmArr.find((pwm) => pwm.name === this.getPwmByCpu(cpu.name))
+          .middle;
+        return {
+          pwm,
+          ...cpu,
+        };
+      });
+    },
+
+    allSensors() {
+      return this.timeScale === 'hour'
+        ? this.$store.getters['fan/fansLastHour']
+        : this.$store.getters['fan/fans'];
+    },
+
+    preFiltered() {
+      return fanFilter(this.allSensors, 'System').concat(
+        fanFilter(this.allSensors, 'pwm')
+      );
+    },
+
+    filteredForChart() {
+      return fanFilter(this.allSensors, 'System');
+    },
+
+    filteredSensors() {
+      return this.getFilteredTableData(this.preFiltered, this.activeFilters);
+    },
+
+    colors() {
+      return this.$randomColor({
+        count: this.items?.length,
+        hue: 'random',
+        luminosity: 'random',
+      });
+    },
+  },
+
+  watch: {
+    timeScale() {
+      this.loadData();
+    },
+  },
+
+  created() {
+    this.loadData();
+  },
+
+  methods: {
+    getPwmByCpu(cpu) {
+      switch (cpu) {
+        case 'System_Fan_1':
+          return 'Pwm_1';
+        case 'System_Fan_2':
+          return 'Pwm_5';
+        case 'System_Fan_3':
+          return 'Pwm_6';
+        default:
+          return null;
+      }
+    },
+
+    onOpened(state) {
+      if (state) {
+        this.loadData();
+      }
+    },
+
+    loadData() {
+      let payload = { lastHour: false };
+      if (this.timeScale === 'hour') {
+        payload = { lastHour: true };
+      }
+
+      this.startLoader();
+      this.$store.dispatch('fan/getFansDynamic', payload).finally(() => {
+        this.endLoader();
+        this.isBusy = false;
+      });
+    },
+  },
+};
+</script>
diff --git a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
index dda22dfb..3b5b0030 100644
--- a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
+++ b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
@@ -2,7 +2,8 @@
   <b-container fluid="xl">
     <page-title :description="$t('appPageTitle.dynamicInformation')" />
     <table-date-picker :time-scale="timeScale" @changePeriod="onChangePeriod" />
-    <fan-speed :time-scale="timeScale"></fan-speed>
+    <fan-speed-cpu :time-scale="timeScale"></fan-speed-cpu>
+    <fan-speed-system :time-scale="timeScale"></fan-speed-system>
   </b-container>
 </template>
 
@@ -14,10 +15,11 @@ import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
 
-import FanSpeed from './FanSpeed';
+import FanSpeedCpu from './FanSpeedCpu';
+import FanSpeedSystem from './FanSpeedSystem';
 
 export default {
-  components: { FanSpeed, PageTitle, TableDatePicker },
+  components: { FanSpeedCpu, FanSpeedSystem, PageTitle, TableDatePicker },
   mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin],
   data() {
     return {
-- 
cgit v1.2.3