summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Zakharov <m.zakharov@IBS.RU>2022-07-12 09:22:20 +0300
committerMaksim Zakharov <m.zakharov@IBS.RU>2022-07-12 09:22:20 +0300
commit3f676232af56a272148cf8cff0cbcb78a3d7eb4a (patch)
tree0fe99fce083b70990e2e7f80c1e8e4124df93843
parent1a71a3d8c56d11b912b4aa3fdcb64935ac414a34 (diff)
downloadwebui-vue-3f676232af56a272148cf8cff0cbcb78a3d7eb4a.tar.xz
fix tables global styles
-rw-r--r--src/assets/styles/bmc/custom/_base.scss4
-rw-r--r--src/assets/styles/bmc/custom/_tables.scss347
-rw-r--r--src/components/Global/SilaComponents/Tables/AccessoryTable.vue19
-rw-r--r--src/components/Global/SilaComponents/Tables/AccessoryTableDrivers.vue30
-rw-r--r--src/components/Global/SilaComponents/Tables/AccessoryTablePower.vue18
-rw-r--r--src/components/Global/SilaComponents/Tables/AccessoryTableWithLabel.vue18
-rw-r--r--src/views/BMC/Configuration/BMCConfigurationTable.vue24
-rw-r--r--src/views/BMC/Firmware/FirmwarePage.vue42
-rw-r--r--src/views/BMC/Settings/SettingsPage.vue31
-rw-r--r--src/views/Fans/DynamicInformation/IndicatorsTable.vue32
-rw-r--r--src/views/Fans/StaticInformation/FansStaticPage.vue46
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue17
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue54
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableChassis.vue19
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue19
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableFans.vue19
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue19
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue19
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableSystem.vue22
-rw-r--r--src/views/MemoryModules/DynamicInfo/helpers.js14
-rw-r--r--src/views/MemoryModules/Specification/MemoryStaticPage.vue21
-rw-r--r--src/views/Motherboard/DynamicInfo/helpers.js14
-rw-r--r--src/views/Motherboard/Specification/MotherboardSpecificationPage.vue14
-rw-r--r--src/views/Operations/ConsoleSettings/ConsoleSettings.vue25
-rw-r--r--src/views/PowerSupplies/DynamicInfo/helpers.js46
-rw-r--r--src/views/PowerSupplies/Specification/PowerStaticPage.vue17
-rw-r--r--src/views/Processors/DynamicInfo/helpers.js24
-rw-r--r--src/views/Processors/Specification/AcceleratorSpecificationTable.vue63
-rw-r--r--src/views/Processors/Specification/ProcessorsSpecificationPage.vue1
-rw-r--r--src/views/Processors/Specification/ProcessorsSpecificationTable.vue63
-rw-r--r--src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue55
-rw-r--r--src/views/SILA/AnalyticalPanel/helpers.js4
-rw-r--r--src/views/SILA/NetworkAdapters/Dynamic/helpers.js14
-rw-r--r--src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue53
-rw-r--r--src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue26
-rw-r--r--src/views/SILA/PciDevices/PciDevicesPage.vue60
-rw-r--r--src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js26
-rw-r--r--src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue17
-rw-r--r--src/views/SILA/RAID/Cache/RAIDCachePage.vue17
-rw-r--r--src/views/SILA/RAID/Settings/RAIDSettingsPage.vue36
-rw-r--r--src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue42
-rw-r--r--src/views/SILA/VirtualDrivers/VirtualDriversPage.vue17
-rw-r--r--src/views/SecurityAndAccess/Certificates/Certificates.vue2
-rw-r--r--src/views/SecurityAndAccess/Sessions/Sessions.vue8
-rw-r--r--src/views/SecurityAndAccess/UserManagement/UserManagement.vue3
-rw-r--r--src/views/Settings/Network/Network.vue2
-rw-r--r--src/views/Settings/Network/TableDns.vue12
-rw-r--r--src/views/Settings/Network/TableIpv4.vue23
-rw-r--r--src/views/SystemDescription/Info/InventoryTableSystem.vue16
-rw-r--r--src/views/SystemDescription/Network/InventoryIPv4Settings.vue30
-rw-r--r--src/views/SystemDescription/Network/InventoryIPv6Settings.vue19
-rw-r--r--src/views/SystemDescription/Network/SystemNetwork.vue1
-rw-r--r--src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue22
53 files changed, 359 insertions, 1247 deletions
diff --git a/src/assets/styles/bmc/custom/_base.scss b/src/assets/styles/bmc/custom/_base.scss
index 94cbecb5..1e3abf71 100644
--- a/src/assets/styles/bmc/custom/_base.scss
+++ b/src/assets/styles/bmc/custom/_base.scss
@@ -168,7 +168,7 @@ h6,
}
.modal-body,
-.page-network dd,
+#page-network dd,
.page-inventory dd,
.custom-radio,
.regular-14px {
@@ -182,7 +182,7 @@ h6,
color: $text-secondary;
}
-.page-network dt,
+#page-network dt,
.page-inventory dt,
.semi-bold-14px {
font-family: 'Inter', sans-serif;
diff --git a/src/assets/styles/bmc/custom/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss
index 29d85306..fefa007c 100644
--- a/src/assets/styles/bmc/custom/_tables.scss
+++ b/src/assets/styles/bmc/custom/_tables.scss
@@ -4,15 +4,6 @@
border-radius: 10px;
td {
- // border-top: 1px solid gray("300");
- // border-bottom: 1px solid gray("300");
- // &:first-of-type {
- // border-left: 1px solid gray("300");
-
- // }
- // &:last-of-type {
- // border-right: 1px solid gray("300");
- // }
vertical-align: middle;
// Table action buttons
@@ -99,7 +90,6 @@
tr {
&:not(:first-child) > td[aria-colindex='1'] {
- // border-top: 1px solid gray("300");
padding-top: 0.625rem;
}
@@ -154,10 +144,6 @@
padding-left: 1rem;
}
}
-
- // .table.b-table.b-table-stacked-sm > tbody > tr > :first-child {
- // border-top-width: 1px;
- // }
}
.b-table-details > td {
@@ -176,156 +162,39 @@
color: $indicators-succes !important;
}
-.bootstrap-table__stripes tr:nth-of-type(even) {
- background-color: rgb(255 255 255);
-}
-
-.bootstrap-table__stripes_odd tr:nth-of-type(odd) {
- background-color: rgb(255 255 255);
-}
-
-.bootstrap-table__head_bg {
- border-top: none;
- display: none;
-}
-
-.bootstrap-table__column-first {
- border-right: 1px solid rgba(26, 62, 91, 0.1);
- border-top: none;
-}
-
-.bootstrap-table__column-last {
- border-top: none;
-}
-
-.bootstrap-table__td {
- border-top: 1px solid rgba(26, 62, 91, 0.1);
-}
-
.bootstrap-table__section {
position: relative;
margin: 16px 2rem 24px 2rem;
width: 90%;
}
-
-.bootstrap-rounded-table {
- border: 1px solid rgba(26, 62, 91, 0.3);
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- border-radius: 10px;
-}
-
-.bootstrap-rounded-table__column-first {
- border-right: 1px solid rgba(26, 62, 91, 0.3) !important;
- border-top: none !important;
- border-radius: 10px 0 0 0;
- -webkit-border-radius: 10px 0 0 0;
- -moz-border-radius: 10px 0 0 0;
-}
-
-.bootstrap-rounded-table__column-last {
- border-top: none !important;
- border-radius: 0 10px 0 0;
- -webkit-border-radius: 0 10px 0 0;
- -moz-border-radius: 0 10px 0 0;
-}
-
-.bootstrap-rounded-table__column-center {
- border-right: 1px solid rgba(26, 62, 91, 0.3) !important;
- border-top: none !important;
- border-radius: 0 0 0 0;
- -webkit-border-radius: 0 0 0 0;
- -moz-border-radius: 0 0 0 0;
-}
-
-.bootstrap-rounded-table__without-border {
- border-top: none !important;
- border-radius: 0 0 0 0;
- -webkit-border-radius: 0 0 0 0;
- -moz-border-radius: 0 0 0 0;
-}
-
-.bootstrap-rounded-table__head_bg {
- background-color: $faint-secondary-primary-10 !important;
- color: $text-primary !important;
-}
-
-.bootstrap-rounded-table__td {
- border-top: 1px solid rgba(26, 62, 91, 0.3) !important;
- border-radius: 0;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- -ms-border-radius: 0;
- -o-border-radius: 0;
- -khtml-border-radius: 0;
- &:hover {
- background-color: $faint-secondary-primary-5;
- }
-}
-
+// 1 //
.bootstrap-table {
border-top: none !important;
border: 1px solid rgba(26, 62, 91, 0.1);
background-color: $faint-secondary-primary-5;
}
-.bootstrap-analytical-table {
- border: 1px solid rgba(26, 62, 91, 0.3);
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
-}
-
-.bootstrap-analytical-th {
- border-bottom: 1px solid rgba(26, 62, 91, 0.3) !important;
- background-color: $white !important;
- color: $text-primary !important;
-}
-
-.bootstrap-analytical-table__column-first {
- border-top: none !important;
- border-radius: 4px 0 0 0;
- -webkit-border-radius: 4px 0 0 0;
- -moz-border-radius: 4px 0 0 0;
-}
-
-.bootstrap-analytical-table__column-last {
- border-top: none !important;
- border-radius: 0 4px 0 0;
- -webkit-border-radius: 0 4px 0 0;
- -moz-border-radius: 0 4px 0 0;
-}
-
-.bootstrap-analytical-table__column-center {
- border-top: none !important;
- border-radius: 0 0 0 0;
- -webkit-border-radius: 0 0 0 0;
- -moz-border-radius: 0 0 0 0;
-}
-
-.bootstrap-analytical-table__td {
- padding: 10px !important;
- border-radius: 0;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- -ms-border-radius: 0;
- -o-border-radius: 0;
- -khtml-border-radius: 0;
-}
-
-#table-session-logs,
-#user-management-table,
-#certificates-table {
+// style for rounded tables
+// add style for page ID
+#page-inventory table,
+#page-system-network table,
+#page-network table,
+#page-bmc-settings table,
+#page-memory-specification table,
+#page-processors table,
+// add style for class
+#main-content .table-rounded {
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
border: 1px solid rgba(26, 62, 91, 0.3);
background-color: none;
+
tr {
border-radius: 10px 10px 0 0;
-webkit-border-radius: 10px 10px 0 0;
-moz-border-radius: 10px 10px 0 0;
- //fonst-styles
+ // font styles
font-family: 'Inter', sans-serif;
font-size: 12px;
font-style: normal;
@@ -333,34 +202,206 @@
line-height: 16px;
letter-spacing: 0em;
text-align: left;
- text-transform: uppercase;
color: $text-primary;
+ &:hover {
+ background-color: $faint-secondary-primary-2-hover;
+ }
+ &.b-table-details:hover {
+ background-color: transparent;
+ }
}
+
th {
border-top: none;
border-bottom: none;
+ text-transform: uppercase;
border-left: 1px solid rgba(26, 62, 91, 0.3);
background-color: $faint-secondary-primary-10 !important;
color: $text-primary !important;
+ &:first-child {
+ border-left: none;
+ border-radius: 10px 0 0 0;
+ }
+ &:last-child {
+ border-right: none;
+ border-radius: 0 10px 0 0;
+ }
+ }
+
+ td {
+ // font styles
+ font-family: 'Inter', sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: 500;
+ line-height: 20px;
+ letter-spacing: 0em;
+ text-align: left;
+ color: $text-secondary;
+ }
+}
+.table-network__icon {
+ max-width: 20%;
+ margin: 0 5px 0 auto !important;
+}
+
+// stripes table //
+#main-content .table-stripes {
+ border-top: none !important;
+ border: 1px solid rgba(26, 62, 91, 0.1);
+ background-color: $faint-secondary-primary-5;
+ tr:nth-of-type(even) {
+ background-color: rgb(255 255 255);
+ }
+ th {
+ border-top: none;
+ display: none;
+ &:first-child {
+ border-top: none;
+ }
+ &:last-child {
+ border-top: none;
+ }
}
- th:first-child {
- border-left: none;
- border-radius: 10px 0 0 0;
+
+ td {
+ border-top: 1px solid rgba(26, 62, 91, 0.1);
+ // font styles
+ font-family: 'Inter', sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: 500;
+ line-height: 16px;
+ letter-spacing: 0em;
+ text-align: left;
+ color: $text-secondary;
+ &:first-child {
+ width: 70%;
+ }
+ &:first-child {
+ border-right: 1px solid rgba(26, 62, 91, 0.1);
+ }
+ .col > .custom-switch {
+ padding-top: 5px;
+ margin: -10px 0 0 auto;
+ }
}
- th:last-child {
- border-left: none;
- border-radius: 0 10px 0 0;
+}
+
+// table accessory //
+#main-content .table-accessory,
+#main-content .table-firmware {
+
+ th {
+ // padding: 10px 5px !important;
+ background-color: transparent !important;
+ color: $text-primary !important;
+ border-top: none !important;
+ border-bottom: 1px solid $faint-secondary-primary-10;
+ // font styles
+ font-family: 'Inter', sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: 600;
+ line-height: 16px;
+ letter-spacing: 0em;
+ text-align: left;
}
+
td {
+ padding: 5px !important;
+ border-top: none !important;
+ // font styles
+ font-family: 'Inter', sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: 300;
+ line-height: 16px;
+ letter-spacing: 0em;
+ text-align: left;
+ color: $text-secondary;
+ }
+}
+#main-content .table-accessory{
+ th {
+ padding: 10px 5px !important;
+ }
+}
+.bootstrap-table__section
+ .table.b-table
+ > thead
+ > tr
+ > [aria-sort='ascending'] {
+ background-image: url('~@/assets/images/event-logs/sort-icon-rotate.svg');
+}
+
+.bootstrap-table__section
+ .table.b-table
+ > thead
+ > tr
+ > [aria-sort='descending'],
+.table.b-table > thead > tr > [aria-sort='none'] {
+ background-image: url('~@/assets/images/event-logs/sort-icon.svg');
+}
+
+// table analytical //
+#main-content .table-analytical {
+ border: 1px solid rgba(26, 62, 91, 0.3);
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+ tr {
+ border-top: none !important;
+ border-radius: 0 0 0 0;
+ -webkit-border-radius: 0 0 0 0;
+ -moz-border-radius: 0 0 0 0;
&:hover {
background-color: $faint-secondary-primary-2-hover;
}
- //fonst-styles
+ &.b-table-details:hover {
+ background-color: transparent;
+ }
+ }
+
+ th {
+ border-top: none !important;
+ border-bottom: 1px solid rgba(26, 62, 91, 0.3) !important;
+ background-color: $white !important;
+ color: $text-primary !important;
+ // font styles
+ font-family: 'Inter', sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: 600;
+ line-height: 16px;
+ letter-spacing: 0em;
+ text-align: left;
+ text-transform: uppercase;
+ color: $text-primary;
+ &:first-child {
+ border-radius: 4px 0 0 0;
+ -webkit-border-radius: 4px 0 0 0;
+ -moz-border-radius: 4px 0 0 0;
+ }
+ &:last-child {
+ border-radius: 0 4px 0 0;
+ -webkit-border-radius: 0 4px 0 0;
+ -moz-border-radius: 0 4px 0 0;
+ }
+ }
+
+ td {
+ border-top: none !important;
+ padding: 10px !important;
+ border-radius: 0;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ // font styles
font-family: 'Inter', sans-serif;
font-size: 12px;
font-style: normal;
font-weight: 500;
- line-height: 20px;
+ line-height: 16px;
letter-spacing: 0em;
text-align: left;
color: $text-secondary;
diff --git a/src/components/Global/SilaComponents/Tables/AccessoryTable.vue b/src/components/Global/SilaComponents/Tables/AccessoryTable.vue
index 2b25d880..4cb64929 100644
--- a/src/components/Global/SilaComponents/Tables/AccessoryTable.vue
+++ b/src/components/Global/SilaComponents/Tables/AccessoryTable.vue
@@ -1,8 +1,10 @@
<template>
<section class="bootstrap-table__section">
<b-table
+ id="table-accessory"
responsive="md"
- class="bootstrap-fans-table bootstrap-fans-table__stripes"
+ class="table-accessory"
+ no-border-collapse
:items="records.items"
:fields="records.fields"
>
@@ -67,21 +69,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-fans-table__th {
- background-color: transparent !important;
- color: $text-primary !important;
- border-top: none !important;
- padding: 10px 5px !important;
- border-bottom: 1px solid $faint-secondary-primary-10;
-}
-
-.bootstrap-fans-table__td {
- padding: 5px !important;
- border-top: none !important;
-}
-</style>
-
<style lang="scss" scoped>
.fans-colors {
display: inline-block;
diff --git a/src/components/Global/SilaComponents/Tables/AccessoryTableDrivers.vue b/src/components/Global/SilaComponents/Tables/AccessoryTableDrivers.vue
index 120a03a3..1f511ffc 100644
--- a/src/components/Global/SilaComponents/Tables/AccessoryTableDrivers.vue
+++ b/src/components/Global/SilaComponents/Tables/AccessoryTableDrivers.vue
@@ -5,7 +5,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-fans-table bootstrap-fans-table__stripes"
+ class="table-accessory"
+ no-border-collapse
:items="records.items"
:fields="records.fields"
>
@@ -70,33 +71,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-fans-table__th {
- background-color: transparent !important;
- color: $text-primary !important;
- border-top: none !important;
- padding: 10px 5px !important;
- border-bottom: 1px solid $faint-secondary-primary-10;
-}
-
-.bootstrap-fans-table__td {
- padding: 5px !important;
- border-top: none !important;
-}
-
-.SMART-table-col-first {
- width: 34%;
-}
-
-.SMART-table-col-second {
- width: 32%;
-}
-
-.SMART-table-col-last {
- width: 39%;
-}
-</style>
-
<style lang="scss" scoped>
.fans-colors {
display: inline-block;
diff --git a/src/components/Global/SilaComponents/Tables/AccessoryTablePower.vue b/src/components/Global/SilaComponents/Tables/AccessoryTablePower.vue
index 6f696b82..4e957c6e 100644
--- a/src/components/Global/SilaComponents/Tables/AccessoryTablePower.vue
+++ b/src/components/Global/SilaComponents/Tables/AccessoryTablePower.vue
@@ -5,7 +5,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-fans-table bootstrap-fans-table__stripes"
+ class="table-accessory"
+ no-border-collapse
:items="records.items"
:fields="records.fields"
>
@@ -71,21 +72,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-fans-table__th {
- background-color: transparent !important;
- color: $text-primary !important;
- border-top: none !important;
- padding: 10px 5px !important;
- border-bottom: 1px solid $faint-secondary-primary-10;
-}
-
-.bootstrap-fans-table__td {
- padding: 5px !important;
- border-top: none !important;
-}
-</style>
-
<style lang="scss" scoped>
.fans-colors {
display: inline-block;
diff --git a/src/components/Global/SilaComponents/Tables/AccessoryTableWithLabel.vue b/src/components/Global/SilaComponents/Tables/AccessoryTableWithLabel.vue
index dffb7b1f..37de1c6b 100644
--- a/src/components/Global/SilaComponents/Tables/AccessoryTableWithLabel.vue
+++ b/src/components/Global/SilaComponents/Tables/AccessoryTableWithLabel.vue
@@ -5,7 +5,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-fans-table bootstrap-fans-table__stripes"
+ class="table-accessory"
+ no-border-collapse
:items="records.items"
:fields="records.fields"
>
@@ -79,21 +80,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-fans-table__th {
- background-color: transparent !important;
- color: $text-primary !important;
- border-top: none !important;
- padding: 10px 5px !important;
- border-bottom: 1px solid $faint-secondary-primary-10;
-}
-
-.bootstrap-fans-table__td {
- padding: 5px !important;
- border-top: none !important;
-}
-</style>
-
<style lang="scss" scoped>
.fans-colors {
display: inline-block;
diff --git a/src/views/BMC/Configuration/BMCConfigurationTable.vue b/src/views/BMC/Configuration/BMCConfigurationTable.vue
index 881f8e34..f7b6d951 100644
--- a/src/views/BMC/Configuration/BMCConfigurationTable.vue
+++ b/src/views/BMC/Configuration/BMCConfigurationTable.vue
@@ -3,7 +3,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:busy="isBusy"
@@ -33,18 +34,12 @@ export default {
key: 'param',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- bootstrap-rounded-table__column-first___bmc_conf`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
@@ -94,16 +89,3 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-rounded-table__column-first___bmc_conf {
- width: 50%;
-}
-
-.macAddresCol {
- height: 15px;
- display: flex;
- flex-flow: row nowrap;
- justify-content: flex-end;
- align-items: center;
-}
-</style>
diff --git a/src/views/BMC/Firmware/FirmwarePage.vue b/src/views/BMC/Firmware/FirmwarePage.vue
index cd0367fa..8ffd9db1 100644
--- a/src/views/BMC/Firmware/FirmwarePage.vue
+++ b/src/views/BMC/Firmware/FirmwarePage.vue
@@ -9,7 +9,8 @@
<b-table
responsive="md"
sort-by="id"
- class="bootstrap-fans-table bootstrap-fans-table__stripes"
+ class="table-firmware"
+ no-border-collapse
sort-icon-left
no-sort-reset
:sort-desc="sortDesc"
@@ -82,24 +83,20 @@ export default {
label: 'Устройство',
sortable: true,
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
+ thStyle: { paddingLeft: 'calc(1.2rem + 0.65em) !important' },
},
{
key: 'version',
label: 'Версия прошивки',
sortable: false,
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'date',
label: 'Дата прошивки',
sortable: true,
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
+ thStyle: { paddingLeft: '12px' },
},
],
items: [
@@ -230,37 +227,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-table__section
- .table.b-table
- > thead
- > tr
- > [aria-sort='ascending'] {
- background-image: url('../../../assets/images/event-logs/sort-icon-rotate.svg');
-}
-
-.bootstrap-table__section
- .table.b-table
- > thead
- > tr
- > [aria-sort='descending'],
-.table.b-table > thead > tr > [aria-sort='none'] {
- background-image: url('../../../assets/images/event-logs/sort-icon.svg');
-}
-
-.bootstrap-fans-table__th {
- background-color: transparent !important;
- color: $text-primary !important;
- border-top: none !important;
- padding: 10px 5px !important;
- border-bottom: 1px solid $faint-secondary-primary-10;
-}
-
-.bootstrap-fans-table__td {
- padding: 5px !important;
- border-top: none !important;
-}
-</style>
<style lang="scss" scoped>
//nav items style
.nav-item,
diff --git a/src/views/BMC/Settings/SettingsPage.vue b/src/views/BMC/Settings/SettingsPage.vue
index da18c8ab..6e9dc9ae 100644
--- a/src/views/BMC/Settings/SettingsPage.vue
+++ b/src/views/BMC/Settings/SettingsPage.vue
@@ -1,5 +1,6 @@
<template>
<b-container
+ id="page-bmc-settings"
:style="{ display: 'flex', 'flex-direction': 'column' }"
fluid="xxl pt-0 m-0"
>
@@ -85,7 +86,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="items"
:fields="fields"
>
@@ -127,7 +128,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="items2"
:fields="fields2"
>
@@ -285,19 +286,12 @@ export default {
key: 'name',
label: 'Тип предупреждения',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- bootstrap-table_smnp-table`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '70%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-last
- smnp-table-col-last`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
fields2: [
@@ -305,19 +299,12 @@ export default {
key: 'attributes',
label: 'Атрибуты',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- bootstrap-table_smnp-table`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '70%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-last
- smnp-table-col-last`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -374,14 +361,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-table_smnp-table {
- width: 70%;
-}
-.smnp-table-col-last {
- width: 30%;
-}
-</style>
<style lang="scss" scoped>
.main-container {
margin-top: 16px;
diff --git a/src/views/Fans/DynamicInformation/IndicatorsTable.vue b/src/views/Fans/DynamicInformation/IndicatorsTable.vue
index ca5b33cb..4da9a556 100644
--- a/src/views/Fans/DynamicInformation/IndicatorsTable.vue
+++ b/src/views/Fans/DynamicInformation/IndicatorsTable.vue
@@ -5,7 +5,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-fans-table bootstrap-fans-table__stripes"
+ class="table-accessory"
+ no-border-collapse
:items="filteredSensors"
:busy="isBusy"
:fields="fields"
@@ -67,50 +68,36 @@ export default {
key: 'name',
label: 'Имя модуля',
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentValue',
label: 'Текущая',
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleSpeed',
label: 'Средняя',
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'lowerCaution',
label: 'Минимальная',
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minSpeedDate',
label: 'Дата минимальной',
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'upperCaution',
label: 'Максимальная',
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxSpeedDate',
label: 'Дата максимальной',
formatter: this.dataFormatter,
- thClass: 'bootstrap-fans-table__th medium-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
};
@@ -162,21 +149,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-fans-table__th {
- background-color: transparent !important;
- color: $text-primary !important;
- border-top: none !important;
- padding: 10px 5px !important;
- border-bottom: 1px solid $faint-secondary-primary-10;
-}
-
-.bootstrap-fans-table__td {
- padding: 5px !important;
- border-top: none !important;
-}
-</style>
-
<style lang="scss" scoped>
.fans-colors {
display: inline-block;
diff --git a/src/views/Fans/StaticInformation/FansStaticPage.vue b/src/views/Fans/StaticInformation/FansStaticPage.vue
index 6fc4c17b..72bdc7e2 100644
--- a/src/views/Fans/StaticInformation/FansStaticPage.vue
+++ b/src/views/Fans/StaticInformation/FansStaticPage.vue
@@ -9,8 +9,9 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
- :items="filteredSensors"
+ class="table-rounded"
+ no-border-collapse
+ :items="items"
:busy="isBusy"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -57,37 +58,25 @@ export default {
key: 'status',
label: 'Статус',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- fans-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '25%' },
},
{
key: 'name',
label: 'Имя',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-center
- fans-table-col-second`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '25%' },
},
{
key: 'type',
label: 'Тип',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-center
- fans-table-col-third`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '25%' },
},
{
key: 'currentValue',
label: 'Текущая скорость, об/мин',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-last
- fans-table-col-third`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '25%' },
},
],
items: [
@@ -148,32 +137,11 @@ export default {
},
};
</script>
-<style lang="scss">
-.fans-table-col-first {
- width: 25%;
-}
-
-.fans-table-col-second {
- width: 25%;
-}
-
-.fans-table-col-third {
- width: 25%;
-}
-</style>
-
<style lang="scss" scoped>
.row {
margin: 0px;
}
-.fans-table-col-first__cell {
- display: flex;
- flex-flow: row nowrap;
- align-items: center;
- justify-content: flex-start;
-}
-
.status__img {
margin-right: 7px;
}
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
index 0a5e9a31..7683ef93 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
@@ -4,9 +4,9 @@
:section-small-title="$t('pageInventory.assemblies')"
>
<b-table
- class="bootstrap-rounded-table"
sort-icon-left
no-sort-reset
+ no-border-collapse
responsive="md"
:items="items"
:fields="fields"
@@ -92,9 +92,6 @@ export default {
key: 'expandRow',
label: '',
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
},
{
key: 'name',
@@ -102,18 +99,12 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'partNumber',
label: this.$t('pageInventory.table.partNumber'),
formatter: this.dataFormatter,
sortable: true,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'locationNumber',
@@ -121,18 +112,12 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'identifyLed',
label: this.$t('pageInventory.table.identifyLed'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
index 164aca71..f3cd1f05 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
@@ -4,9 +4,9 @@
:section-small-title="$t('pageInventory.bmcManager')"
>
<b-table
- class="bootstrap-rounded-table"
responsive="md"
show-empty
+ no-border-collapse
:items="items"
:fields="fields"
:fixed="true"
@@ -186,44 +186,31 @@ export default {
key: 'expandRow',
label: '',
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ tdClass: 'table-row-expand ',
},
{
key: 'id',
label: this.$t('pageInventory.table.id'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ tdClass: 'regular-12px ',
},
{
key: 'health',
label: this.$t('pageInventory.table.health'),
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'locationNumber',
label: this.$t('pageInventory.table.locationNumber'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'identifyLed',
label: this.$t('pageInventory.table.identifyLed'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
@@ -265,38 +252,3 @@ export default {
},
};
</script>
-<style lang="scss" scoped>
-// .row {
-// margin: 0px;
-// flex-wrap: nowrap;
-// }
-// .fans-table-col-first__cell {
-// display: flex;
-// flex-flow: row nowrap;
-// align-items: center;
-// justify-content: flex-start;
-// }
-
-// .status__img {
-// margin-right: 7px;
-// }
-
-// .bold-12px__caps {
-// color: $text-secondary;
-// }
-
-// .attrib-names {
-// border-bottom: 1px solid $faint-secondary-primary-10;
-// color: $text-secondary !important;
-// font-weight: 600;
-// }
-
-// .custom-switch {
-// margin: 0;
-// }
-
-// .btn-link {
-// width: 30px !important;
-// height: 20px !important;
-// }
-</style>
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
index dc6bf573..ed8787f9 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
@@ -4,9 +4,9 @@
:section-small-title="$t('pageInventory.chassis')"
>
<b-table
- class="bootstrap-rounded-table"
responsive="md"
show-empty
+ no-border-collapse
:items="chassis"
:fields="fields"
:fixed="true"
@@ -139,44 +139,31 @@ export default {
key: 'expandRow',
label: '',
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ tdClass: 'table-row-expand',
},
{
key: 'id',
label: this.$t('pageInventory.table.id'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'health',
label: this.$t('pageInventory.table.health'),
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td',
+ tdClass: 'text-nowrap',
},
{
key: 'locationNumber',
label: this.$t('pageInventory.table.locationNumber'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'identifyLed',
label: this.$t('pageInventory.table.identifyLed'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
index 86701b54..fa25919f 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
@@ -18,12 +18,12 @@
</b-col>
</b-row>
<b-table
- class="bootstrap-rounded-table"
sort-icon-left
no-sort-reset
sort-by="health"
responsive="md"
show-empty
+ no-border-collapse
:items="dimms"
:fields="fields"
:sort-desc="true"
@@ -192,44 +192,31 @@ export default {
key: 'expandRow',
label: '',
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ tdClass: 'table-row-expand',
},
{
key: 'id',
label: this.$t('pageInventory.table.id'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'health',
label: this.$t('pageInventory.table.health'),
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td',
+ tdClass: 'text-nowrap ',
},
{
key: 'locationNumber',
label: this.$t('pageInventory.table.locationNumber'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'identifyLed',
label: this.$t('pageInventory.table.identifyLed'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
searchFilter: searchFilter,
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
index 9c3773f0..d110ad3f 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
@@ -18,12 +18,12 @@
</b-col>
</b-row>
<b-table
- class="bootstrap-rounded-table"
sort-icon-left
no-sort-reset
responsive="md"
sort-by="health"
show-empty
+ no-border-collapse
:items="fans"
:fields="fields"
:sort-desc="true"
@@ -132,9 +132,7 @@ export default {
label: '',
sortable: false,
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ tdClass: 'table-row-expand',
},
{
key: 'id',
@@ -142,18 +140,13 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'health',
label: this.$t('pageInventory.table.health'),
formatter: this.dataFormatter,
sortable: true,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td',
+ tdClass: 'text-nowrap',
},
{
key: 'partNumber',
@@ -161,18 +154,12 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'serialNumber',
label: this.$t('pageInventory.table.serialNumber'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
searchFilter: searchFilter,
diff --git a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
index 52cfd8b5..35e6e14d 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
@@ -18,13 +18,13 @@
</b-col>
</b-row>
<b-table
- class="bootstrap-rounded-table"
sort-icon-left
no-sort-reset
hover
responsive="md"
sort-by="health"
show-empty
+ no-border-collapse
:items="powerSupplies"
:fields="fields"
:sort-desc="true"
@@ -150,9 +150,7 @@ export default {
label: '',
sortable: false,
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ tdClass: 'table-row-expand',
},
{
key: 'id',
@@ -160,18 +158,13 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'health',
label: this.$t('pageInventory.table.health'),
formatter: this.dataFormatter,
sortable: true,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td',
+ tdClass: 'text-nowrap',
},
{
key: 'locationNumber',
@@ -179,18 +172,12 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'identifyLed',
label: this.$t('pageInventory.table.identifyLed'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
searchFilter: searchFilter,
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
index 0c1b019f..08128da4 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
@@ -20,12 +20,12 @@
</b-col>
</b-row>
<b-table
- class="bootstrap-rounded-table"
sort-icon-left
no-sort-reset
hover
responsive="md"
show-empty
+ no-border-collapse
:items="processors"
:fields="fields"
:sort-desc="true"
@@ -186,9 +186,7 @@ export default {
label: '',
sortable: false,
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ tdClass: 'table-row-expand ',
},
{
key: 'id',
@@ -196,18 +194,13 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'health',
label: this.$t('pageInventory.table.health'),
formatter: this.dataFormatter,
sortable: true,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td',
+ tdClass: 'text-nowrap',
},
{
key: 'locationNumber',
@@ -215,9 +208,6 @@ export default {
formatter: this.dataFormatter,
sortable: true,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'identifyLed',
@@ -225,9 +215,6 @@ export default {
formatter: this.dataFormatter,
sortable: false,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
processors: [
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
index 25d5b38e..c3b7bd87 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
@@ -4,9 +4,9 @@
:section-small-title="$t('pageInventory.system')"
>
<b-table
- class="bootstrap-rounded-table"
responsive="md"
show-empty
+ no-border-collapse
:items="systems"
:fields="fields"
:fixed="true"
@@ -173,52 +173,36 @@ export default {
key: 'expandRow',
label: '',
thStyle: { width: '4%' },
- thClass: 'bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ tdClass: 'table-row-expand',
},
{
key: 'id',
label: this.$t('pageInventory.table.id'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'hardwareType',
label: this.$t('pageInventory.table.hardwareType'),
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td',
+ tdClass: 'text-nowrap ',
},
{
key: 'health',
label: this.$t('pageInventory.table.health'),
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'locationNumber',
label: this.$t('pageInventory.table.locationNumber'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'locationIndicatorActive',
label: this.$t('pageInventory.table.identifyLed'),
formatter: this.dataFormatter,
thStyle: { width: '20%' },
- thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: ' bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
diff --git a/src/views/MemoryModules/DynamicInfo/helpers.js b/src/views/MemoryModules/DynamicInfo/helpers.js
index 4df38754..3cbca867 100644
--- a/src/views/MemoryModules/DynamicInfo/helpers.js
+++ b/src/views/MemoryModules/DynamicInfo/helpers.js
@@ -427,44 +427,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentValue',
label: 'Текущее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'lowerCaution',
label: 'Минимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'upperCaution',
label: 'Максимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [],
diff --git a/src/views/MemoryModules/Specification/MemoryStaticPage.vue b/src/views/MemoryModules/Specification/MemoryStaticPage.vue
index 8a4b9c2e..5e544868 100644
--- a/src/views/MemoryModules/Specification/MemoryStaticPage.vue
+++ b/src/views/MemoryModules/Specification/MemoryStaticPage.vue
@@ -1,5 +1,6 @@
<template>
<b-container
+ id="page-memory-specification"
:style="{ display: 'flex', 'flex-direction': 'column' }"
fluid="xxl pt-0 m-0"
>
@@ -9,7 +10,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -28,7 +29,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="items_slots"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -57,7 +58,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="items_modules"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -116,18 +117,12 @@ export default {
key: 'parametr',
label: 'Статус',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- memory-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -221,12 +216,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.memory-table-col-first {
- width: 50%;
-}
-</style>
-
<style lang="scss" scoped>
.info_section {
margin-bottom: 0px;
diff --git a/src/views/Motherboard/DynamicInfo/helpers.js b/src/views/Motherboard/DynamicInfo/helpers.js
index e98f1873..890482ee 100644
--- a/src/views/Motherboard/DynamicInfo/helpers.js
+++ b/src/views/Motherboard/DynamicInfo/helpers.js
@@ -427,44 +427,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentValue',
label: 'Текущее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'lowerCaution',
label: 'Минимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'upperCaution',
label: 'Максимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [],
diff --git a/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue b/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue
index 926c231c..56586dcf 100644
--- a/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue
+++ b/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue
@@ -9,7 +9,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -47,17 +48,11 @@ export default {
key: 'parametr',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -86,8 +81,3 @@ export default {
},
};
</script>
-<style lang="scss" scoped>
-.bootstrap-rounded-table {
- margin: 16px 0;
-}
-</style>
diff --git a/src/views/Operations/ConsoleSettings/ConsoleSettings.vue b/src/views/Operations/ConsoleSettings/ConsoleSettings.vue
index 21b3ead9..ecc2150f 100644
--- a/src/views/Operations/ConsoleSettings/ConsoleSettings.vue
+++ b/src/views/Operations/ConsoleSettings/ConsoleSettings.vue
@@ -8,7 +8,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="systems"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -66,11 +67,8 @@
<script>
import PageTitle from '@/components/Global/PageTitle';
-// import BMCConfigurationTable from './BMCConfigurationTable';
-// import BMCConfigurationControl from './BMCConfigurationControl';
import PageSection from '@/components/Global/PageSection';
import BVToastMixin from '@/components/Mixins/BVToastMixin';
-// import iconChevronUp from '@carbon/icons-vue/es/chevron--up/16';
import TableRowExpandMixin, {
expandRowLabel,
} from '@/components/Mixins/TableRowExpandMixin';
@@ -79,8 +77,6 @@ import iconChevron from '@carbon/icons-vue/es/chevron--down/16';
export default {
components: {
PageTitle,
- // BMCConfigurationControl,
- // BMCConfigurationTable,
PageSection,
},
mixins: [BVToastMixin, TableRowExpandMixin],
@@ -93,18 +89,12 @@ export default {
key: 'attributes',
label: 'Атрибуты',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-last
- bootstrap-rounded-table__column-last___console`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '30%' },
},
],
iconChevron,
@@ -135,11 +125,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-rounded-table__column-last___console {
- width: 30%;
-}
-</style>
<style lang="scss" scoped>
.row {
margin: 0px;
@@ -166,8 +151,4 @@ export default {
height: 36px;
margin-right: 0.5rem;
}
-
-.bootstrap-table__section {
- width: auto;
-}
</style>
diff --git a/src/views/PowerSupplies/DynamicInfo/helpers.js b/src/views/PowerSupplies/DynamicInfo/helpers.js
index f5d2aee7..1418411a 100644
--- a/src/views/PowerSupplies/DynamicInfo/helpers.js
+++ b/src/views/PowerSupplies/DynamicInfo/helpers.js
@@ -1225,44 +1225,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentTemperature',
label: 'Текущее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minTemperature',
label: 'Минимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxTemperature',
label: 'Максимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
@@ -1327,44 +1313,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentTemperature',
label: 'Текущее, %',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, %',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minTemperature',
label: 'Минимальное, %',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxTemperature',
label: 'Максимальное, %',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
@@ -1429,44 +1401,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentTemperature',
label: 'Текущее, В',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, В',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minTemperature',
label: 'Минимальное, В',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxTemperature',
label: 'Максимальное, В',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
@@ -1531,15 +1489,11 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentPower',
label: 'Текущее, Вт',
label2: '',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
diff --git a/src/views/PowerSupplies/Specification/PowerStaticPage.vue b/src/views/PowerSupplies/Specification/PowerStaticPage.vue
index f0ffd296..10bf1457 100644
--- a/src/views/PowerSupplies/Specification/PowerStaticPage.vue
+++ b/src/views/PowerSupplies/Specification/PowerStaticPage.vue
@@ -18,7 +18,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items_slots"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -77,18 +78,12 @@ export default {
key: 'parametr',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- memory-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items_slots: [
@@ -130,12 +125,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.memory-table-col-first {
- width: 50%;
-}
-</style>
-
<style lang="scss" scoped>
.info_section {
margin-bottom: 0px;
diff --git a/src/views/Processors/DynamicInfo/helpers.js b/src/views/Processors/DynamicInfo/helpers.js
index bc62bfa0..82e23544 100644
--- a/src/views/Processors/DynamicInfo/helpers.js
+++ b/src/views/Processors/DynamicInfo/helpers.js
@@ -1225,44 +1225,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentTemperature',
label: 'Текущее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minTemperature',
label: 'Минимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxTemperature',
label: 'Максимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
@@ -1327,20 +1313,14 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentFrequency',
label: 'Текущее, Hz',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'baseFrequency',
label: 'Базовое, Hz',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
@@ -1381,15 +1361,11 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentPower',
label: 'Текущее, Вт',
label2: '',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
diff --git a/src/views/Processors/Specification/AcceleratorSpecificationTable.vue b/src/views/Processors/Specification/AcceleratorSpecificationTable.vue
index c13e13ff..bcdfdbe6 100644
--- a/src/views/Processors/Specification/AcceleratorSpecificationTable.vue
+++ b/src/views/Processors/Specification/AcceleratorSpecificationTable.vue
@@ -2,7 +2,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="accelerators"
:fields="fields"
>
@@ -54,74 +54,50 @@ export default {
{
key: 'expandRow',
label: '',
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-expand`,
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ thStyle: { width: '3%' },
sortable: false,
},
{
key: 'status',
label: 'Статус',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '15%' },
},
{
key: 'name',
label: 'Имя',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-third`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '10%' },
},
{
key: 'slot_number',
label: '№ Слота',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-fourth`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '8%' },
},
{
key: 'board_number',
label: '№ Платы',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-fourth`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '8%' },
},
{
key: 'serial_number',
label: 'Серийный номер',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '15%' },
},
{
key: 'frequency',
label: '№ Детали',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-fourth`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '8%' },
},
{
key: 'cores',
label: 'Версия прошивки',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-last
- fans-table-col-third`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '10%' },
},
],
expandRowLabel: expandRowLabel,
@@ -129,27 +105,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.fans-table-col-expand {
- width: 3%;
-}
-.fans-table-col-first {
- width: 15%;
-}
-
-.fans-table-col-second {
- width: 12%;
-}
-
-.fans-table-col-third {
- width: 10%;
-}
-
-.fans-table-col-fourth {
- width: 8%;
-}
-</style>
-
<style lang="scss" scoped>
.row {
margin: 0px;
diff --git a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue
index 02c8eb9c..50362ac2 100644
--- a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue
+++ b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue
@@ -1,5 +1,6 @@
<template>
<b-container
+ id="page-processors"
:style="{ display: 'flex', 'flex-direction': 'column' }"
fluid="xxl pt-0 m-0"
>
diff --git a/src/views/Processors/Specification/ProcessorsSpecificationTable.vue b/src/views/Processors/Specification/ProcessorsSpecificationTable.vue
index 07a4512d..31210f50 100644
--- a/src/views/Processors/Specification/ProcessorsSpecificationTable.vue
+++ b/src/views/Processors/Specification/ProcessorsSpecificationTable.vue
@@ -5,7 +5,7 @@
:sort-desc="true"
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="processors"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -159,74 +159,50 @@ export default {
{
key: 'expandRow',
label: '',
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-expand`,
- tdClass: 'table-row-expand bootstrap-rounded-table__td',
+ thStyle: { width: '3%' },
sortable: false,
},
{
key: 'status',
label: 'Статус',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '17%' },
},
{
key: 'name',
label: 'Имя',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-second`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '15%' },
},
{
key: 'model',
label: 'Модель',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-third`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '12%' },
},
{
key: 'serialNumber',
label: 'Серийный номер',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-second`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '15%' },
},
{
key: 'version',
label: 'Версия',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-fourth`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '10%' },
},
{
key: 'frequency',
label: 'Частота',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__without-border
- fans-table-col-fourth`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '10%' },
},
{
key: 'cores',
label: 'Ядра',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-last
- fans-table-col-fourth`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '10%' },
},
],
expandRowLabel: expandRowLabel,
@@ -234,27 +210,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.fans-table-col-expand {
- width: 3%;
-}
-.fans-table-col-first {
- width: 17%;
-}
-
-.fans-table-col-second {
- width: 15%;
-}
-
-.fans-table-col-third {
- width: 12%;
-}
-
-.fans-table-col-fourth {
- width: 10%;
-}
-</style>
-
<style lang="scss" scoped>
.row {
margin: 0px;
diff --git a/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue b/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue
index 045fc5ef..72e6e77e 100644
--- a/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue
+++ b/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue
@@ -9,7 +9,8 @@
<b-table
show-empty
responsive="md"
- class="bootstrap-analytical-table"
+ class="table-analytical"
+ no-border-collapse
:items="serverItems"
:fields="server_fields"
>
@@ -36,8 +37,8 @@
show-empty
:sticky-header="stickyHeader"
responsive="md"
- class="bootstrap-analytical-table"
- :no-border-collapse="true"
+ class="table-analytical"
+ no-border-collapse
:items="eventsItems"
:fields="events_fields"
>
@@ -114,11 +115,6 @@
:first-action="selectAmper"
:second-action="selectVolt"
/>
- <!-- <unit-popover
- :select-amper="selectAmper"
- :select-volt="selectVolt"
- :unit="unit"
- /> -->
<date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" />
<accessory-table :records="accessoryData.power" />
<power-table :time-scale="timeScale" />
@@ -163,18 +159,12 @@ export default {
key: 'param',
label: 'Раздел',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-analytical-th',
- class: 'bootstrap-analytical-table__column-first',
- tdClass: 'regular-12px bootstrap-analytical-table__td',
},
{
key: 'value',
label: 'Статус',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-analytical-th',
- class:
- 'bootstrap-rounded-table__column-last analytical-table__status',
- tdClass: 'regular-12px bootstrap-analytical-table__td',
+ thStyle: { width: '10%' },
},
],
events_fields: [
@@ -182,25 +172,16 @@ export default {
key: 'date',
label: 'Время',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-analytical-th',
- class: 'bootstrap-analytical-table__column-first',
- tdClass: 'regular-12px bootstrap-analytical-table__td',
},
{
key: 'type',
label: 'Тип события',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-analytical-th',
- class: 'bootstrap-analytical-table__column-center',
- tdClass: 'regular-12px bootstrap-analytical-table__td',
},
{
key: 'description',
label: 'О событии',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-analytical-th',
- class: 'bootstrap-analytical-table__column-last',
- tdClass: 'regular-12px bootstrap-analytical-table__td',
},
],
};
@@ -218,32 +199,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.analytical-table__status {
- width: 10%;
-}
-
-#popover-unit-ractive {
- padding-left: 5px;
-}
-
-#popover-unit-ampere {
- width: 89px;
- height: 28px;
- border-radius: 8px;
- font-weight: 500;
- font-size: 12px;
-}
-
-#popover-unit-volt {
- width: 89px;
- height: 28px;
- border-radius: 8px;
- font-weight: 500;
- font-size: 12px;
- // color: $red-brand-primary;
-}
-</style>
<style lang="scss" scoped>
.tables-container {
display: flex;
diff --git a/src/views/SILA/AnalyticalPanel/helpers.js b/src/views/SILA/AnalyticalPanel/helpers.js
index 8655afc3..d1ffd728 100644
--- a/src/views/SILA/AnalyticalPanel/helpers.js
+++ b/src/views/SILA/AnalyticalPanel/helpers.js
@@ -49,14 +49,10 @@ export const AccessoryData = {
{
key: 'name',
label: 'Наименование',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'power',
label: 'Текущее значение тока, А',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
diff --git a/src/views/SILA/NetworkAdapters/Dynamic/helpers.js b/src/views/SILA/NetworkAdapters/Dynamic/helpers.js
index 2be5ce24..65046d01 100644
--- a/src/views/SILA/NetworkAdapters/Dynamic/helpers.js
+++ b/src/views/SILA/NetworkAdapters/Dynamic/helpers.js
@@ -288,44 +288,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentTemperature',
label: 'Текущее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minTemperature',
label: 'Минимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxTemperature',
label: 'Максимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
diff --git a/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue b/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue
index 92f386fb..aadb6415 100644
--- a/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue
+++ b/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue
@@ -30,7 +30,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes_odd"
+ class="table-stripes"
+ no-border-collapse
:items="items"
:fields="fields"
>
@@ -55,7 +56,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes_odd"
+ class="table-stripes"
+ no-border-collapse
:items="items_2"
:fields="fields"
>
@@ -123,7 +125,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes"
+ class="table-stripes"
+ no-border-collapse
:items="items_3"
:fields="fields"
>
@@ -140,7 +143,8 @@
</div>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes_odd"
+ class="table-stripes"
+ no-border-collapse
:items="items_4"
:fields="fields"
>
@@ -163,7 +167,8 @@
</div>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes"
+ class="table-stripes"
+ no-border-collapse
:items="items_5"
:fields="fields"
>
@@ -174,7 +179,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items_6"
:fields="fields_2"
:empty-text="$t('global.table.emptyMessage')"
@@ -248,18 +254,11 @@ export default {
key: 'param',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: 'bootstrap-table__column-first',
- tdClass: 'regular-12px bootstrap-table__td',
},
{
key: 'value',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: `bootstrap-table__column-last
- bootstrap-table__server-param`,
- tdClass: 'regular-12px bootstrap-table__td',
},
],
fields_2: [
@@ -267,49 +266,31 @@ export default {
key: 'name',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'model',
label: 'Модель',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'number',
label: 'Серийный номер',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'type',
label: 'Тип устройства',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'firmware',
label: 'Прошивка',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'status',
label: 'Статус',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
};
@@ -337,16 +318,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-table__section {
- width: auto;
-}
-
-.bootstrap-table__server-param {
- width: 30%;
-}
-</style>
-
<style lang="scss" scoped>
.bold-16px {
display: block;
diff --git a/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue b/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue
index 827d195b..9ccc0509 100644
--- a/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue
+++ b/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue
@@ -30,7 +30,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes_odd"
+ class="table-stripes"
+ no-border-collapse
:items="items"
:fields="fields"
>
@@ -55,7 +56,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes_odd"
+ class="table-stripes"
+ no-border-collapse
:items="items_2"
:fields="fields"
>
@@ -94,7 +96,8 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes"
+ class="table-stripes"
+ no-border-collapse
:items="items_3"
:fields="fields"
>
@@ -151,18 +154,11 @@ export default {
key: 'param',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: 'bootstrap-table__column-first',
- tdClass: 'regular-12px bootstrap-table__td',
},
{
key: 'value',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: `bootstrap-table__column-last
- bootstrap-table__server-param`,
- tdClass: 'regular-12px bootstrap-table__td',
},
],
};
@@ -183,17 +179,7 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-table__server-param {
- width: 30%;
-}
-</style>
-
<style lang="scss" scoped>
-.bootstrap-table__section {
- width: auto;
-}
-
.bold-16px {
display: block;
margin: 25px 0 16px 0;
diff --git a/src/views/SILA/PciDevices/PciDevicesPage.vue b/src/views/SILA/PciDevices/PciDevicesPage.vue
index adf754ac..3bc45ca2 100644
--- a/src/views/SILA/PciDevices/PciDevicesPage.vue
+++ b/src/views/SILA/PciDevices/PciDevicesPage.vue
@@ -4,11 +4,15 @@
fluid="xxl pt-0 m-0"
>
<page-title />
- <page-section class="bootstrap-table__section">
+ <page-section
+ :section-title="$t('appNavigation.pciDevicesTitle')"
+ class="bootstrap-table__section"
+ >
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -41,49 +45,31 @@ export default {
key: 'status',
label: 'Статус',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'name',
label: 'Имя',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'type',
label: 'Тип устройства',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'model',
label: 'Модель',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'serial_number',
label: 'Серийный номер',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'producer',
label: 'Производитель',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -127,37 +113,3 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-table__stripes tr:nth-of-type(even) {
- background-color: rgb(255 255 255);
-}
-.bootstrap-table__head_bg {
- border-top: none;
- display: none;
-}
-
-.bootstrap-table__column-first {
- border-right: 1px solid rgba(26, 62, 91, 0.1);
- border-top: none;
-}
-
-.bootstrap-table__column-last {
- border-top: none;
-}
-
-.bootstrap-table__td {
- border-top: 1px solid rgba(26, 62, 91, 0.1);
-}
-</style>
-
-<style lang="scss" scoped>
-.bold-16px {
- display: block;
- margin: 25px 0 16px 0;
-}
-
-.pointer {
- color: $red-brand-primary;
- cursor: pointer;
-}
-</style>
diff --git a/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js b/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js
index 5bb87b84..9115f9e5 100644
--- a/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js
+++ b/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js
@@ -427,44 +427,30 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'currentTemperature',
label: 'Текущее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'middleTemperature',
label: 'Среднее, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minTemperature',
label: 'Минимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'minDate',
label: 'Дата минимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxTemperature',
label: 'Максимальное, С°',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
{
key: 'maxDate',
label: 'Дата максимального',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- tdClass: 'bootstrap-fans-table__td light-12px',
},
],
items: [
@@ -529,23 +515,17 @@ export const AccessoryData = {
{
key: 'name',
label: 'Имя модуля',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- class: 'SMART-table-col-first',
- tdClass: 'bootstrap-fans-table__td light-12px',
+ thStyle: { width: '34%' },
},
{
key: 'SMART',
label: 'Текущие значения атрибутов SMART',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- class: 'SMART-table-col-second',
- tdClass: 'bootstrap-fans-table__td light-12px',
+ thStyle: { width: '32%' },
},
{
key: 'resource',
label: 'Оставшийся ресурс для SSD, Мб',
- thClass: 'bootstrap-fans-table__th semi-bold-12px',
- class: 'SMART-table-col-last',
- tdClass: 'bootstrap-fans-table__td light-12px',
+ thStyle: { width: '39%' },
},
],
items: [
diff --git a/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue b/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue
index d53ff449..d6f31985 100644
--- a/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue
+++ b/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue
@@ -18,7 +18,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -73,18 +74,12 @@ export default {
key: 'parametr',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- memory-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -118,12 +113,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.memory-table-col-first {
- width: 50%;
-}
-</style>
-
<style lang="scss" scoped>
.info_section {
margin-bottom: 0px;
diff --git a/src/views/SILA/RAID/Cache/RAIDCachePage.vue b/src/views/SILA/RAID/Cache/RAIDCachePage.vue
index d4c049a5..54efa48f 100644
--- a/src/views/SILA/RAID/Cache/RAIDCachePage.vue
+++ b/src/views/SILA/RAID/Cache/RAIDCachePage.vue
@@ -17,7 +17,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -47,18 +48,12 @@ export default {
key: 'parametr',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- cache-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -104,12 +99,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.cache-table-col-first {
- width: 50%;
-}
-</style>
-
<style lang="scss" scoped>
.bold-16px {
display: block;
diff --git a/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue b/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue
index d6759150..19caafe0 100644
--- a/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue
+++ b/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue
@@ -28,7 +28,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -85,9 +86,11 @@
</b-button>
</div>
<b-table
+ id="table-raid-settings"
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items_2"
:fields="fields_2"
:empty-text="$t('global.table.emptyMessage')"
@@ -184,26 +187,17 @@ export default {
key: 'parametr',
label: 'Имя',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- settings-table`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '35%' },
},
{
key: 'value',
label: 'Текущее значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'action',
label: 'Действие',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
fields_2: [
@@ -211,33 +205,21 @@ export default {
key: 'name',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'type',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'size',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'action',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
};
@@ -265,12 +247,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.settings-table {
- width: 35%;
-}
-</style>
-
<style lang="scss" scoped>
.bold-16px {
display: block;
diff --git a/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue b/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue
index 737126e4..239a41e4 100644
--- a/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue
+++ b/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue
@@ -16,7 +16,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -64,7 +65,7 @@
<page-section class="bootstrap-table__section">
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes"
+ class="table-stripes"
:items="items_2"
:fields="fields_2"
>
@@ -112,17 +113,12 @@ export default {
key: 'parametr',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -168,18 +164,11 @@ export default {
key: 'param',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: 'bootstrap-table__column-first',
- tdClass: 'regular-12px bootstrap-table__td',
},
{
key: 'value',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: `bootstrap-table__column-last
- bootstrap-table__server-param`,
- tdClass: 'regular-12px bootstrap-table__td',
},
],
items_2: [
@@ -219,29 +208,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-table__stripes tr:nth-of-type(even) {
- background-color: rgb(255 255 255);
-}
-.bootstrap-table__head_bg {
- border-top: none;
- display: none;
-}
-
-.bootstrap-table__column-first {
- border-right: 1px solid rgba(26, 62, 91, 0.1);
- border-top: none;
-}
-
-.bootstrap-table__column-last {
- border-top: none;
-}
-
-.bootstrap-table__td {
- border-top: 1px solid rgba(26, 62, 91, 0.1);
-}
-</style>
-
<style lang="scss" scoped>
.bold-16px {
display: block;
diff --git a/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue b/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue
index 4292db40..73633901 100644
--- a/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue
+++ b/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue
@@ -18,7 +18,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -66,18 +67,12 @@ export default {
key: 'parametr',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- memory-table-col-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
items: [
@@ -107,12 +102,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.memory-table-col-first {
- width: 50%;
-}
-</style>
-
<style lang="scss" scoped>
.info_section {
margin-bottom: 0px;
diff --git a/src/views/SecurityAndAccess/Certificates/Certificates.vue b/src/views/SecurityAndAccess/Certificates/Certificates.vue
index 6c4757c7..8d400c67 100644
--- a/src/views/SecurityAndAccess/Certificates/Certificates.vue
+++ b/src/views/SecurityAndAccess/Certificates/Certificates.vue
@@ -55,10 +55,10 @@
<b-row>
<b-col xl="11">
<b-table
- id="certificates-table"
responsive="md"
show-empty
hover
+ class="table-rounded"
no-border-collapse
:busy="isBusy"
:fields="fields"
diff --git a/src/views/SecurityAndAccess/Sessions/Sessions.vue b/src/views/SecurityAndAccess/Sessions/Sessions.vue
index 5f96ca47..53d772ab 100644
--- a/src/views/SecurityAndAccess/Sessions/Sessions.vue
+++ b/src/views/SecurityAndAccess/Sessions/Sessions.vue
@@ -35,6 +35,7 @@
no-select-on-click
hover
show-empty
+ class="table-rounded"
no-border-collapse
sort-by="clientID"
:busy="isBusy"
@@ -289,10 +290,3 @@ export default {
},
};
</script>
-<style lang="scss">
-#table-session-logs {
- td .btn-link {
- width: auto !important;
- }
-}
-</style>
diff --git a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
index c0a67b09..024b101e 100644
--- a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
+++ b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
@@ -27,11 +27,11 @@
@batch-action="onBatchAction"
/>
<b-table
- id="user-management-table"
ref="table"
responsive="md"
selectable
show-empty
+ class="table-rounded"
no-select-on-click
hover
no-border-collapse
@@ -383,7 +383,6 @@ export default {
},
};
</script>
-
<style lang="scss" scoped>
.btn.collapsed {
svg {
diff --git a/src/views/Settings/Network/Network.vue b/src/views/Settings/Network/Network.vue
index 2d8fd61d..50442be4 100644
--- a/src/views/Settings/Network/Network.vue
+++ b/src/views/Settings/Network/Network.vue
@@ -1,5 +1,5 @@
<template>
- <b-container fluid="m-0 p-0" class="page-network">
+ <b-container id="page-network" fluid="m-0 p-0">
<page-title :description="$t('pageNetwork.pageDescription')" />
<page-section v-show="ethernetData" class="m-4">
diff --git a/src/views/Settings/Network/TableDns.vue b/src/views/Settings/Network/TableDns.vue
index 1ad8f436..c37c6e9f 100644
--- a/src/views/Settings/Network/TableDns.vue
+++ b/src/views/Settings/Network/TableDns.vue
@@ -11,10 +11,11 @@
<b-table
responsive="md"
hover
+ no-border-collapse
:fields="dnsTableFields"
:items="form.dnsStaticTableItems"
:empty-text="$t('global.table.emptyMessage')"
- class="bootstrap-rounded-table mb-0"
+ class="mb-0"
show-empty
>
<template #cell(actions)="{ item, index }">
@@ -82,18 +83,13 @@ export default {
{
key: 'address',
label: this.$t('pageNetwork.table.ipAddress'),
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'actions',
thStyle: { width: '30%' },
label: this.$t('pageNetwork.table.actions'),
- thClass:
- 'text-right semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'text-right bootstrap-rounded-table__td',
+ thClass: 'text-right',
+ tdClass: 'text-right',
},
],
};
diff --git a/src/views/Settings/Network/TableIpv4.vue b/src/views/Settings/Network/TableIpv4.vue
index 7481dc7b..6514a59c 100644
--- a/src/views/Settings/Network/TableIpv4.vue
+++ b/src/views/Settings/Network/TableIpv4.vue
@@ -16,11 +16,12 @@
<b-table
responsive="md"
hover
+ class="mb-0"
+ show-empty
+ no-border-collapse
:fields="ipv4TableFields"
:items="form.ipv4TableItems"
:empty-text="$t('global.table.emptyMessage')"
- class="bootstrap-rounded-table mb-0"
- show-empty
>
<template #cell(actions)="{ item, index }">
<table-row-action
@@ -87,41 +88,27 @@ export default {
key: 'Address',
label: this.$t('pageNetwork.table.ipAddress'),
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-first',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'Gateway',
label: this.$t('pageNetwork.table.gateway'),
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'SubnetMask',
label: this.$t('pageNetwork.table.subnet'),
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'AddressOrigin',
label: this.$t('pageNetwork.table.addressOrigin'),
thStyle: { width: '20%' },
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-center',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'actions',
label: this.$t('pageNetwork.table.actions'),
thStyle: { width: '10%' },
- thClass:
- 'text-right semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'text-right bootstrap-rounded-table__td',
+ thClass: 'text-right',
+ tdClass: 'text-right',
},
],
};
diff --git a/src/views/SystemDescription/Info/InventoryTableSystem.vue b/src/views/SystemDescription/Info/InventoryTableSystem.vue
index eef0d871..0c32d2c0 100644
--- a/src/views/SystemDescription/Info/InventoryTableSystem.vue
+++ b/src/views/SystemDescription/Info/InventoryTableSystem.vue
@@ -3,7 +3,8 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ class="table-rounded"
+ no-border-collapse
:items="items"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -30,18 +31,12 @@ export default {
key: 'param',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- bootstrap-rounded-table__column-first___system-table`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '50%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
@@ -84,8 +79,3 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-rounded-table__column-first___system-table {
- width: 50%;
-}
-</style>
diff --git a/src/views/SystemDescription/Network/InventoryIPv4Settings.vue b/src/views/SystemDescription/Network/InventoryIPv4Settings.vue
index 94845854..980aee5a 100644
--- a/src/views/SystemDescription/Network/InventoryIPv4Settings.vue
+++ b/src/views/SystemDescription/Network/InventoryIPv4Settings.vue
@@ -3,7 +3,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="systems"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -46,7 +46,7 @@
@keydown.escape="clickCancel(data)"
></b-form-input>
<b-col v-else>{{ data.value }}</b-col>
- <b-col class="system-network-table__icon-col">
+ <b-col class="table-network__icon">
<b-row v-if="systems[data.index].isEdit">
<img
src="@/assets/images/edit-ok.svg"
@@ -96,27 +96,18 @@ export default {
key: 'param',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first
- bootstrap-rounded-table__column-first___ipv-table`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '30%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-center
- bootstrap-rounded-table__ipv-table___center`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '20%' },
},
{
key: 'comment',
label: 'Комментарий',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
@@ -197,19 +188,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-rounded-table__column-first___ipv-table {
- width: 30%;
-}
-
-.bootstrap-rounded-table__ipv-table___center {
- width: 20%;
-}
-
-.system-network-table__icon-col {
- max-width: 20%;
-}
-</style>
<style lang="scss" scoped>
.row {
align-items: baseline;
diff --git a/src/views/SystemDescription/Network/InventoryIPv6Settings.vue b/src/views/SystemDescription/Network/InventoryIPv6Settings.vue
index 3f47b1fd..a8c590b1 100644
--- a/src/views/SystemDescription/Network/InventoryIPv6Settings.vue
+++ b/src/views/SystemDescription/Network/InventoryIPv6Settings.vue
@@ -3,7 +3,7 @@
<b-table
responsive="md"
show-empty
- class="bootstrap-rounded-table"
+ no-border-collapse
:items="systems"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -21,7 +21,7 @@
@keydown.escape="clickCancel(data)"
></b-form-input>
<b-col v-else>{{ data.value }}</b-col>
- <b-col class="system-network-table__icon-col">
+ <b-col class="table-network__icon">
<b-row v-if="systems[data.index].isEdit">
<img
src="@/assets/images/edit-ok.svg"
@@ -57,7 +57,7 @@
<span class="popup-text">Выключен</span>
</button>
</div>
- <b-col class="system-network-table__icon-col">
+ <b-col class="table-network__icon">
<img
:is="iconChevron"
class="pointer"
@@ -93,27 +93,18 @@ export default {
key: 'param',
label: 'Параметр',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-first___ipv-table
- bootstrap-rounded-table__column-first`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '30%' },
},
{
key: 'value',
label: 'Значение',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: `bootstrap-rounded-table__column-center
- bootstrap-rounded-table__ipv-table___center`,
- tdClass: 'regular-12px bootstrap-rounded-table__td',
+ thStyle: { width: '20%' },
},
{
key: 'comment',
label: 'Комментарий',
formatter: this.dataFormatter,
- thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
- class: 'bootstrap-rounded-table__column-last',
- tdClass: 'regular-12px bootstrap-rounded-table__td',
},
],
expandRowLabel: expandRowLabel,
diff --git a/src/views/SystemDescription/Network/SystemNetwork.vue b/src/views/SystemDescription/Network/SystemNetwork.vue
index 69ede837..19243493 100644
--- a/src/views/SystemDescription/Network/SystemNetwork.vue
+++ b/src/views/SystemDescription/Network/SystemNetwork.vue
@@ -1,5 +1,6 @@
<template>
<b-container
+ id="page-system-network"
:style="{ display: 'flex', 'flex-direction': 'column' }"
fluid="xxl pt-0 m-0"
>
diff --git a/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue b/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue
index 03cd1356..f8aebeb6 100644
--- a/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue
+++ b/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue
@@ -5,7 +5,7 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes"
+ class="table-stripes"
:items="queueItems"
:fields="fields"
>
@@ -35,7 +35,7 @@
</span>
<b-table
responsive="md"
- class="bootstrap-table bootstrap-table__stripes"
+ class="table-stripes"
:items="diskItems"
:fields="fields"
>
@@ -57,18 +57,11 @@ export default {
key: 'param',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: 'bootstrap-table__column-first',
- tdClass: 'regular-12px bootstrap-table__td',
},
{
key: 'active',
label: '',
formatter: this.dataFormatter,
- thClass: 'bootstrap-table__head_bg',
- class: `bootstrap-table__column-last
- bootstrap-table__server-param`,
- tdClass: 'regular-12px bootstrap-table__td',
},
],
iconChevron,
@@ -118,17 +111,6 @@ export default {
},
};
</script>
-<style lang="scss">
-.bootstrap-table__server-param {
- width: 30%;
-}
-
-.system-network-table__icon-col {
- max-width: 20%;
- margin: 0 5px 0 auto !important;
-}
-</style>
-
<style lang="scss" scoped>
.row {
align-items: center;