From c4d70da69a3c86f8c07ccdb0f09b755dd99b2155 Mon Sep 17 00:00:00 2001 From: Maksim Zakharov Date: Tue, 24 May 2022 10:04:19 +0300 Subject: Add global popovers. Add pages: pci, adapters, raid, drivers, virtual drivers. Fix: analytical pannel, bmc-settings popovers. fix global styles --- src/assets/images/clear-icon.svg | 3 - src/assets/images/icon-chevron-red.svg | 3 + src/assets/images/icon-clear-red.svg | 3 + src/assets/images/icon-options.svg | 3 + src/assets/images/icon-settings-red.svg | 3 + src/assets/styles/bmc/custom/_base.scss | 23 + src/assets/styles/bmc/custom/_buttons.scss | 65 ++- src/assets/styles/bmc/custom/_forms.scss | 2 +- src/assets/styles/bmc/custom/_popover.scss | 54 +- src/assets/styles/bmc/custom/_tables.scss | 49 +- src/components/AppNavigation/AppNavigation.vue | 2 +- src/components/AppNavigation/AppNavigationMixin.js | 173 +++--- src/components/Global/Popover.vue | 23 +- .../Global/SilaComponents/ApplySettingsPopover.vue | 163 ++++++ src/components/Global/SilaComponents/DataTabs.vue | 136 +++++ .../Global/SilaComponents/DateSwitch.vue | 2 +- .../SilaComponents/InventoryControlSystem.vue | 9 +- .../Global/SilaComponents/NtpPopover.vue | 4 - .../Global/SilaComponents/TwoChiocePopover.vue | 117 +++++ src/locales/ru-RU.json | 40 +- src/router/routes.js | 112 ++++ .../BMC/Configuration/BMCConfigurationControl.vue | 6 +- .../BMC/Configuration/SettingsImportPopup.vue | 6 +- src/views/BMC/Settings/SettingsPage.vue | 182 ++++++- .../Fans/StaticInformation/FansStaticPage.vue | 4 +- src/views/Login/Login.vue | 3 + .../Specification/MemoryStaticPage.vue | 12 +- .../MemoryModules/Specification/MemorySwitch.vue | 112 ---- .../Specification/PowerStaticPage.vue | 22 +- .../PowerSupplies/Specification/PowerSwitch.vue | 112 ---- .../AcceleratorSpecificationTable.vue | 6 +- .../Specification/ProcessorsSpecificationPage.vue | 77 +++ .../Specification/ProcessorsSpecificationTable.vue | 61 +-- src/views/Processors/Specification/helpers.js | 254 +++++++++ src/views/Processors/Specification/mock.js | 254 --------- .../SILA/AnalyticalPanel/AnalyticalPanelPage.vue | 281 +++++++--- src/views/SILA/AnalyticalPanel/PowerTable.vue | 82 +++ .../SILA/AnalyticalPanel/TemperatureTable.vue | 115 ++++ src/views/SILA/AnalyticalPanel/helpers.js | 200 +++++++ src/views/SILA/EventLogs/EventLogs.vue | 59 ++- .../NetworkAdapters/Dynamic/NetworkDynamicPage.vue | 140 +++++ .../NetworkAdapters/Dynamic/TemperatureTable.vue | 112 ++++ src/views/SILA/NetworkAdapters/Dynamic/helpers.js | 370 +++++++++++++ src/views/SILA/NetworkAdapters/Dynamic/index.js | 1 + .../EthernetAdapters/EthernetAdaptersPage.vue | 434 +++++++++++++++ .../NetworkAdapters/EthernetAdapters/helpers.js | 99 ++++ .../SILA/NetworkAdapters/EthernetAdapters/index.js | 1 + .../FcHbaAdapters/FcHbaAdaptersPage.vue | 231 ++++++++ .../SILA/NetworkAdapters/FcHbaAdapters/helpers.js | 42 ++ .../SILA/NetworkAdapters/FcHbaAdapters/index.js | 1 + src/views/SILA/PciDevices/PciDevicesPage.vue | 172 ++++++ src/views/SILA/PciDevices/index.js | 1 + .../DynamicInfo/DriversDynamicPage.vue | 209 ++++++++ .../DynamicInfo/TemperatureTable.vue | 126 +++++ .../SILA/PhysicalDrivers/DynamicInfo/helpers.js | 584 +++++++++++++++++++++ .../SILA/PhysicalDrivers/DynamicInfo/index.js | 1 + .../StaticInfo/DriversStaticPage.vue | 149 ++++++ src/views/SILA/PhysicalDrivers/StaticInfo/index.js | 1 + src/views/SILA/RAID/Cache/RAIDCachePage.vue | 124 +++++ src/views/SILA/RAID/Cache/index.js | 1 + .../SILA/RAID/Settings/ActionSettingsPopover.vue | 131 +++++ src/views/SILA/RAID/Settings/OptionsPopover.vue | 87 +++ src/views/SILA/RAID/Settings/RAIDSettingsPage.vue | 318 +++++++++++ src/views/SILA/RAID/Settings/TomeModal.vue | 179 +++++++ src/views/SILA/RAID/Settings/helpers.js | 62 +++ src/views/SILA/RAID/Settings/index.js | 1 + .../RAID/Specification/RAIDSpecificationPage.vue | 267 ++++++++++ src/views/SILA/RAID/Specification/index.js | 1 + .../SILA/VirtualDrivers/VirtualDriversPage.vue | 138 +++++ src/views/SILA/VirtualDrivers/index.js | 1 + .../Network/InventoryIPv4Settings.vue | 76 +-- .../Network/InventoryIPv6Settings.vue | 4 - .../ServerParametrs/ServereParametrsSection.vue | 22 - 73 files changed, 6050 insertions(+), 873 deletions(-) delete mode 100644 src/assets/images/clear-icon.svg create mode 100644 src/assets/images/icon-chevron-red.svg create mode 100644 src/assets/images/icon-clear-red.svg create mode 100644 src/assets/images/icon-options.svg create mode 100644 src/assets/images/icon-settings-red.svg create mode 100644 src/components/Global/SilaComponents/ApplySettingsPopover.vue create mode 100644 src/components/Global/SilaComponents/DataTabs.vue create mode 100644 src/components/Global/SilaComponents/TwoChiocePopover.vue delete mode 100644 src/views/MemoryModules/Specification/MemorySwitch.vue delete mode 100644 src/views/PowerSupplies/Specification/PowerSwitch.vue create mode 100644 src/views/Processors/Specification/helpers.js delete mode 100644 src/views/Processors/Specification/mock.js create mode 100644 src/views/SILA/AnalyticalPanel/PowerTable.vue create mode 100644 src/views/SILA/AnalyticalPanel/TemperatureTable.vue create mode 100644 src/views/SILA/AnalyticalPanel/helpers.js create mode 100644 src/views/SILA/NetworkAdapters/Dynamic/NetworkDynamicPage.vue create mode 100644 src/views/SILA/NetworkAdapters/Dynamic/TemperatureTable.vue create mode 100644 src/views/SILA/NetworkAdapters/Dynamic/helpers.js create mode 100644 src/views/SILA/NetworkAdapters/Dynamic/index.js create mode 100644 src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue create mode 100644 src/views/SILA/NetworkAdapters/EthernetAdapters/helpers.js create mode 100644 src/views/SILA/NetworkAdapters/EthernetAdapters/index.js create mode 100644 src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue create mode 100644 src/views/SILA/NetworkAdapters/FcHbaAdapters/helpers.js create mode 100644 src/views/SILA/NetworkAdapters/FcHbaAdapters/index.js create mode 100644 src/views/SILA/PciDevices/PciDevicesPage.vue create mode 100644 src/views/SILA/PciDevices/index.js create mode 100644 src/views/SILA/PhysicalDrivers/DynamicInfo/DriversDynamicPage.vue create mode 100644 src/views/SILA/PhysicalDrivers/DynamicInfo/TemperatureTable.vue create mode 100644 src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js create mode 100644 src/views/SILA/PhysicalDrivers/DynamicInfo/index.js create mode 100644 src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue create mode 100644 src/views/SILA/PhysicalDrivers/StaticInfo/index.js create mode 100644 src/views/SILA/RAID/Cache/RAIDCachePage.vue create mode 100644 src/views/SILA/RAID/Cache/index.js create mode 100644 src/views/SILA/RAID/Settings/ActionSettingsPopover.vue create mode 100644 src/views/SILA/RAID/Settings/OptionsPopover.vue create mode 100644 src/views/SILA/RAID/Settings/RAIDSettingsPage.vue create mode 100644 src/views/SILA/RAID/Settings/TomeModal.vue create mode 100644 src/views/SILA/RAID/Settings/helpers.js create mode 100644 src/views/SILA/RAID/Settings/index.js create mode 100644 src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue create mode 100644 src/views/SILA/RAID/Specification/index.js create mode 100644 src/views/SILA/VirtualDrivers/VirtualDriversPage.vue create mode 100644 src/views/SILA/VirtualDrivers/index.js diff --git a/src/assets/images/clear-icon.svg b/src/assets/images/clear-icon.svg deleted file mode 100644 index 2f50ed01..00000000 --- a/src/assets/images/clear-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/images/icon-chevron-red.svg b/src/assets/images/icon-chevron-red.svg new file mode 100644 index 00000000..7fcd68d4 --- /dev/null +++ b/src/assets/images/icon-chevron-red.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icon-clear-red.svg b/src/assets/images/icon-clear-red.svg new file mode 100644 index 00000000..2f50ed01 --- /dev/null +++ b/src/assets/images/icon-clear-red.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icon-options.svg b/src/assets/images/icon-options.svg new file mode 100644 index 00000000..b9ab31bb --- /dev/null +++ b/src/assets/images/icon-options.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icon-settings-red.svg b/src/assets/images/icon-settings-red.svg new file mode 100644 index 00000000..8ed9156a --- /dev/null +++ b/src/assets/images/icon-settings-red.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/styles/bmc/custom/_base.scss b/src/assets/styles/bmc/custom/_base.scss index 6009774c..0e555455 100644 --- a/src/assets/styles/bmc/custom/_base.scss +++ b/src/assets/styles/bmc/custom/_base.scss @@ -19,6 +19,17 @@ body { } } +.pointer { + cursor: pointer; +} + +.icon-edit, +.icon-options { + display: block; + margin: 2px 12px 0 auto; + cursor: pointer; +} + h3, .h3 { font-size: 1.75rem; @@ -56,8 +67,12 @@ h6, letter-spacing: 0em; text-align: left; color: $text-primary; + &.red { + color: $red-brand-primary + } &.underline { text-decoration: underline; + cursor: pointer; } &.tretiatry { color: $text-tretiatry; @@ -242,4 +257,12 @@ h6, float: right; transition: 0.3s linear; margin: $spacer/4 35px 0 auto; +} + +.icon-expand-right { + height: 1.2rem; + width: 1.2rem; + float: right; + transition: 0.3s linear; + margin: $spacer/4 5px 0 0; } \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss index e128a6db..04c612ec 100644 --- a/src/assets/styles/bmc/custom/_buttons.scss +++ b/src/assets/styles/bmc/custom/_buttons.scss @@ -1,14 +1,7 @@ .btn { - // padding-top: $spacer / 2; - // padding-right: $spacer; - // padding-bottom: $spacer / 2; - // padding-left: $spacer; display: inline-flex; align-items: center; justify-content: space-around; - svg { - // margin-right: $spacer / 4; - } &:disabled { color: gray("600"); fill: currentColor; @@ -24,6 +17,7 @@ background-color: $red-brand-primary; border-radius: 8px; border: none; + box-shadow: 1px 2px 2px -1px rgb(79 37 37 / 40%) inset; font-family: 'Inter', sans-serif; font-style: normal; font-weight: 600; @@ -55,6 +49,7 @@ color: $red-brand-primary; border-radius: 8px; border: none; + box-shadow: 1px 2px 4px -1px rgb(79 37 37 / 10%) inset; font-family: 'Inter', sans-serif; font-style: normal; font-weight: 600; @@ -79,7 +74,57 @@ } } -// Global style for all button link +.btn-unstiled { + border: none; + &:focus { + box-shadow: none; + } + &:active { + box-shadow: none; + } +} + +.btn-popover { + border: none; + color: $red-brand-primary; + height: 28px; + border-radius: 8px; + font-weight: 500; + font-size: 12px; + transition: ease-in 0.2s; + &:hover { + color: $white; + transition: ease-in 0.2s; + } + &:focus { + box-shadow: none; + } + &:active { + box-shadow: none; + } + &.selected-unit-button { + transition: ease-in 0.2s; + color: $white; + } + &.selected-choice-button { + transition: ease-in 0.2s; + color: $white; + } +} + +.btn-toogle-popover { + justify-content: flex-start; + width: 25px; + height: 16px; + padding: 0; + &:focus { + box-shadow: none; + } + &:active { + box-shadow: none; + } +} + .btn-link { // font-weight: $headings-font-weight; color: $text-primary; @@ -104,6 +149,10 @@ transform: rotate(180deg); transition: 0.3s linear; } + .icon-expand-right { + transform: rotate(180deg); + transition: 0.3s linear; + } } } diff --git a/src/assets/styles/bmc/custom/_forms.scss b/src/assets/styles/bmc/custom/_forms.scss index 7c0a0bd6..51dc0ed6 100644 --- a/src/assets/styles/bmc/custom/_forms.scss +++ b/src/assets/styles/bmc/custom/_forms.scss @@ -123,7 +123,7 @@ .custom-switch { width: 28px; height: 16px; - margin: 0 0 0 auto; + margin: -4px 0 -4px auto; } .custom-switch diff --git a/src/assets/styles/bmc/custom/_popover.scss b/src/assets/styles/bmc/custom/_popover.scss index f539ef54..a33f108f 100644 --- a/src/assets/styles/bmc/custom/_popover.scss +++ b/src/assets/styles/bmc/custom/_popover.scss @@ -6,8 +6,8 @@ box-shadow: 0px -4px 12px rgba(0, 0, 0, 0.05); border-radius: 4px; position: relative; - max-width: 389px; - width: 389px; + max-width: 400px; + width: 400px; height: auto; } @@ -20,4 +20,52 @@ .arrow { visibility: hidden; -} \ No newline at end of file +} + +.popover-heigth-100 { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 6px; + background: $white; + border: 1px solid $faint-secondary-primary-10; + box-shadow: 0px -4px 12px rgba(0, 0, 0, 0.05); + padding: 5px; + border-radius: 8px; + max-width: 100px; +} + +.popover-heigth-100 .popover-body { + padding: 0px; + +} + +.apply-reload-popover { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 6px; + background: $white; + border: 1px solid $faint-secondary-primary-10; + box-shadow: 0px -4px 12px rgba(0, 0, 0, 0.05); + padding: 5px; + border-radius: 8px; + max-width: 250px; +} + +.apply-reload-popover .popover-body { + padding: 0px; +} + +.boot-popover { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 6px; + background: $white; + border: 1px solid $faint-secondary-primary-10; + box-shadow: 0px -4px 12px rgba(0, 0, 0, 0.05); + padding: 5px; + border-radius: 8px; + max-width: 200px; +} diff --git a/src/assets/styles/bmc/custom/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss index bc3be1b2..d76d4982 100644 --- a/src/assets/styles/bmc/custom/_tables.scss +++ b/src/assets/styles/bmc/custom/_tables.scss @@ -171,6 +171,34 @@ // } } +.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 0 2rem; @@ -245,23 +273,24 @@ border-radius: 4px; } -.bootstrap-analytical-table__head_bg { - background-color: transparent !important; +.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: 10px 0 0 0; - -webkit-border-radius: 10px 0 0 0; - -moz-border-radius: 10px 0 0 0; + 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 10px 0 0; - -webkit-border-radius: 0 10px 0 0; - -moz-border-radius: 0 10px 0 0; + 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 { @@ -272,13 +301,11 @@ } .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; - &:hover { - background-color: $faint-secondary-primary-5; - } } \ No newline at end of file diff --git a/src/components/AppNavigation/AppNavigation.vue b/src/components/AppNavigation/AppNavigation.vue index 84b81ac6..1cdb7120 100644 --- a/src/components/AppNavigation/AppNavigation.vue +++ b/src/components/AppNavigation/AppNavigation.vue @@ -268,7 +268,7 @@ svg { top: $header-height; bottom: 0; left: 0; - z-index: $zindex-fixed; + z-index: 10; overflow-y: overlay; background-color: theme-color('light'); transform: translateX(-$navigation-width); diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js index 7c981ec6..c58553a2 100644 --- a/src/components/AppNavigation/AppNavigationMixin.js +++ b/src/components/AppNavigation/AppNavigationMixin.js @@ -56,50 +56,33 @@ export const AppNavigationMixin = { }, ], }, - // { - // id: 'analytical-panel', - // label: this.$t('appNavigation.analyticalPanel'), - // route: '/', - // }, - // { - // id: 'RAID', - // label: this.$t('appNavigation.raidControllers'), - // icon: 'iconChevronUp', - // children: [ - // { - // id: 'overview-info', - // label: this.$t('appNavigation.specifications'), - // route: '/logs/event-logs', - // }, - // { - // id: 'post-code-logs', - // label: this.$t('appNavigation.settings'), - // route: '/logs/post-code-logs', - // }, - // { - // id: 'post-code-logs', - // label: this.$t('appNavigation.cachRaid'), - // route: '/logs/post-code-logs', - // }, - // ], - // }, - // { - // id: 'power-supplies', - // label: this.$t('appNavigation.powerSupplies'), - // icon: 'iconChevronUp', - // children: [ - // { - // id: 'overview-info', - // label: this.$t('appNavigation.specifications'), - // route: '/logs/event-logs', - // }, - // { - // id: 'post-code-logs', - // label: this.$t('appNavigation.analyticalPanel'), - // route: '/logs/post-code-logs', - // }, - // ], - // }, + { + id: 'analytical-panel', + label: this.$t('appNavigation.analyticalPanel'), + route: '/analytical-panel', + }, + { + id: 'RAID', + label: this.$t('appNavigation.raidControllers'), + icon: 'iconChevronUp', + children: [ + { + id: 'raid-specification', + label: this.$t('appNavigation.specification'), + route: '/raid-specification', + }, + { + id: 'raid-settings', + label: this.$t('appNavigation.settings'), + route: '/raid-settings', + }, + { + id: 'raid-cache', + label: this.$t('RAID.cache'), + route: '/raid-cache', + }, + ], + }, { id: 'processors', label: this.$t('appNavigation.processors'), @@ -168,6 +151,28 @@ export const AppNavigationMixin = { }, ], }, + { + id: 'physical-drives', + label: this.$t('appNavigation.physicalDrives'), + icon: 'iconChevronUp', + children: [ + { + id: 'drivers-static', + label: this.$t('appNavigation.statisticInformation'), + route: '/drivers-static', + }, + { + id: 'drivers', + label: this.$t('appNavigation.analyticalPanel'), + route: '/drivers', + }, + ], + }, + { + id: 'virtual-drivers', + label: this.$t('appNavigation.virtualDrivers'), + route: '/virtual-drivers', + }, { id: 'motherboard', label: this.$t('appNavigation.motherboard'), @@ -185,59 +190,37 @@ export const AppNavigationMixin = { }, ], }, - // { - // id: 'physical-drives', - // label: this.$t('appNavigation.physicalDrives'), - // icon: 'iconChevronUp', - // children: [ - // { - // id: 'overview-info', - // label: this.$t('appNavigation.specifications'), - // route: '/logs/event-logs', - // }, - // { - // id: 'post-code-logs', - // label: this.$t('appNavigation.analyticalPanel'), - // route: '/logs/post-code-logs', - // }, - // ], - // }, - // { - // id: 'virtual-drives', - // label: this.$t('appNavigation.virtualDrives'), - // route: '/', - // }, - // { - // id: 'network-adapters', - // label: this.$t('appNavigation.networkAdapters'), - // icon: 'iconChevronUp', - // children: [ - // { - // id: 'overview-info', - // label: this.$t('appNavigation.ethernetAdapters'), - // route: '/logs/event-logs', - // }, - // { - // id: 'post-code-logs', - // label: this.$t('appNavigation.fcHbaAdapters'), - // route: '/logs/post-code-logs', - // }, - // { - // id: 'post-code-logs', - // label: this.$t('appNavigation.analyticalPanel'), - // route: '/logs/post-code-logs', - // }, - // ], - // }, - // { - // id: 'pci-devises', - // label: this.$t('appNavigation.pciDevises'), - // route: '/', - // }, - //old tabs + { + id: 'network-adapters', + label: this.$t('appNavigation.networkAdapters'), + icon: 'iconChevronUp', + children: [ + { + id: 'network-adapters-ethernet', + label: this.$t('appNavigation.ethernetAdapters'), + route: '/network-adapters-ethernet', + }, + { + id: 'network-adapters-fc-hba', + label: this.$t('appNavigation.fcHbaAdapters'), + route: '/network-adapters-fc-hba', + }, + { + id: 'network-adapters-pannel', + label: this.$t('appNavigation.analyticalPanel'), + route: '/network-adapters-pannel', + }, + ], + }, + { + id: 'pci-devices', + label: this.$t('appNavigation.pciDevices'), + route: '/pci-devices', + }, + ///////////////////////////old tabs { id: 'overview', - label: 'Страницы BMC webui-vue', + label: 'Обзор', route: '/Info', }, { diff --git a/src/components/Global/Popover.vue b/src/components/Global/Popover.vue index bae121c3..f0b4063f 100644 --- a/src/components/Global/Popover.vue +++ b/src/components/Global/Popover.vue @@ -1,7 +1,7 @@ diff --git a/src/components/Global/SilaComponents/InventoryControlSystem.vue b/src/components/Global/SilaComponents/InventoryControlSystem.vue index 9760f24f..de5432e1 100644 --- a/src/components/Global/SilaComponents/InventoryControlSystem.vue +++ b/src/components/Global/SilaComponents/InventoryControlSystem.vue @@ -19,10 +19,7 @@ popup="SystemDescription.ReloadServer_popup" />
- + {{ $t('SystemDescription.ConnectToDesktop') }}
@@ -151,10 +148,6 @@ a { list-style-type: none; } -.pointer { - cursor: pointer; -} - .system-control-section { position: relative; margin: 16px 2rem 2rem !important; diff --git a/src/components/Global/SilaComponents/NtpPopover.vue b/src/components/Global/SilaComponents/NtpPopover.vue index 918b1220..c94c1cc8 100644 --- a/src/components/Global/SilaComponents/NtpPopover.vue +++ b/src/components/Global/SilaComponents/NtpPopover.vue @@ -129,8 +129,4 @@ export default { .tretiatry { margin-left: 12px; } - -.underline { - cursor: pointer; -} diff --git a/src/components/Global/SilaComponents/TwoChiocePopover.vue b/src/components/Global/SilaComponents/TwoChiocePopover.vue new file mode 100644 index 00000000..c89c5a81 --- /dev/null +++ b/src/components/Global/SilaComponents/TwoChiocePopover.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 512631e6..e6753ea6 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -26,7 +26,9 @@ "reload": "Перезагрузить", "off": "Выключить", "selected": "Выбрано", - "acceptChanges": "Применить изменения" + "acceptChanges": "Применить изменения", + "events": "События", + "addTome": "Добавить том" }, "ariaLabel": { "clearSearch": "Очистить поле поиска", @@ -70,6 +72,9 @@ }, "status": { "status":"Статус", + "serverStatus": "Состояние сервера", + "inWork": "Работоспособен", + "outWorking": "Не работоспособен", "copied": "Скопировано", "disabled": "Выключено", "enabled": "Включено", @@ -105,6 +110,17 @@ "toast": { "unAuthTitle": "Недоступно", "unAuthDescription": "Действие недоступно из текущей учётной записи. Свяжитесь с Вашим системным администратором для проверки прав доступа." + }, + "units": { + "unit": "Единица:", + "amper": "Ампераж", + "volt": "Вольтаж" + }, + "applySettings": { + "apply": "Применить:", + "reload": "При перезагрузке", + "option1": "Опция 1", + "option2": "Опция 2" } }, "appHeader": { @@ -1045,6 +1061,7 @@ "testMessage": "Тестовое сообщение", "smnp": "Настройки SNMP", "smnpWarning": "Предупреждения SNMP", + "smtpWarning": "Предупреждения SMTP", "system": "Расположение системы", "contacts": "Контакты системы", "community": "Community String", @@ -1081,8 +1098,6 @@ "GetNtpFromServer": "Получать с NTP-сервера", "UseServerDatettime": "Использовать дату и время сервера", "NtpSettings": "Настройки NTP-сервера", - "Reload": "Перезагрузить", - "Off": "Выключить", "LoadingQueue": "Последовательность загрузки", "DiskParametrs": "Параметры выбранного диска", "FansDynamicInformation": "Динамические показатели", @@ -1092,23 +1107,20 @@ "offBootRom": "Выключить boot ROM", "offBootRom_popup": "ВЫключение boot ROM", "microcodeDrivers": "Микрокод накопителя", - "reloadMicrocodeDrivers": "Обновить микрокод накопителя" + "reloadMicrocodeDrivers": "Обновить микрокод накопителя", + "microcodeAdapter": "Микрокод адаптера" }, "fansPage": { "speedDescription": "Показатели скорости", "speedWarhihg": "Пороговое значение предупреждения, об/мин", "speedShutdown": "Пороговое значение отказа, об/мин", - "valueIndicators": "Значения Показателей", - "inWork": "Работоспособен", - "notWorking": "Не работоспособен" + "valueIndicators": "Значения Показателей" }, "tablesDescription": { "speedWarhihg": "Пороговое значение предупреждения, об/мин", "speedShutdown": "Пороговое значение отказа, об/мин", "valueIndicators": "Значения Показателей", "installedFans": "Установленные вентиляторы", - "inWork": "Работоспособен", - "notWorking": "Не работоспособен", "temperatureWarning": "Пороговое значениe предупреждения, С°", "nonNormalMode": "Не штатный режим, С°", "criticalMode": "Критический режим, С°", @@ -1136,6 +1148,16 @@ "microcode_popoveer": "Обновление микрокода контроллера", "lun": "Настройки LUN" }, + "adapters": { + "wwnAddres": "WWN адрес", + "settings": "Настройки и возможности", + "microcodeUpdate": "Обновить микрокод адаптера", + "microcodeUpdate_popup": "Обновление микрокода адаптера", + "propherties": "Опубликованые Свойства", + "PXE": "PXE для Ethernet-адаптеров", + "links": "Состояние линков", + "transceivers": "Приемопередатчики" +}, "countries": { "AF": "Афганистан", diff --git a/src/router/routes.js b/src/router/routes.js index 10d4c5dc..d6a2d694 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -51,9 +51,25 @@ import PowerStaticPage from '@/views/PowerSupplies/Specification'; import PowerDynamicPage from '@/views/PowerSupplies/DynamicInfo'; import SILAEventLogs from '@/views/SILA/EventLogs'; +import SILAAnalyticalPanel from '@/views/SILA/AnalyticalPanel'; + +import SILARaidSpecification from '@/views/SILA/RAID/Specification'; +import SILARaidSettins from '@/views/SILA/RAID/Settings'; +import SILARaidCache from '@/views/SILA/RAID/Cache'; + +import DriversStaticPage from '@/views/SILA/PhysicalDrivers/StaticInfo'; +import DriversDynamicPage from '@/views/SILA/PhysicalDrivers/DynamicInfo'; +import VirtualDriversPage from '@/views/SILA/VirtualDrivers/'; + import MotherboardSpecificationPage from '@/views/Motherboard/Specification'; import MotherboardDynamicPage from '@/views/Motherboard/DynamicInfo'; +import NetworkPannel from '@/views/SILA/NetworkAdapters/Dynamic'; +import EthernetAdapters from '@/views/SILA/NetworkAdapters/EthernetAdapters'; +import FcHbaAdapters from '@/views/SILA/NetworkAdapters/FcHbaAdapters'; + +import PciDevices from '@/views/SILA/PciDevices'; + import Support from '@/views/Support'; import i18n from '@/i18n'; @@ -184,6 +200,41 @@ const routes = [ description: i18n.t('appNavigation.broadcastSettings'), }, }, + { + path: '/analytical-panel', + name: 'analytical-panel', + component: SILAAnalyticalPanel, + meta: { + title: i18n.t('appNavigation.analyticalPanel'), + }, + }, + { + path: '/raid-specification', + name: 'raid-specification', + component: SILARaidSpecification, + meta: { + title: i18n.t('appNavigation.raidControllers'), + description: i18n.t('appNavigation.specification'), + }, + }, + { + path: '/raid-settings', + name: 'raid-settings', + component: SILARaidSettins, + meta: { + title: i18n.t('appNavigation.raidControllers'), + description: i18n.t('appNavigation.settings'), + }, + }, + { + path: '/raid-cache', + name: 'raid-cache', + component: SILARaidCache, + meta: { + title: i18n.t('appNavigation.raidControllers'), + description: i18n.t('RAID.cache'), + }, + }, { path: '/processors-specification', name: 'processors-specification', @@ -256,6 +307,32 @@ const routes = [ description: i18n.t('SystemDescription.FansDynamicInformation'), }, }, + { + path: '/drivers-static', + name: 'drivers-static', + component: DriversStaticPage, + meta: { + title: i18n.t('appNavigation.physicalDrives'), + description: i18n.t('appNavigation.statisticInformation'), + }, + }, + { + path: '/drivers', + name: 'drivers', + component: DriversDynamicPage, + meta: { + title: i18n.t('appNavigation.physicalDrives'), + description: i18n.t('appNavigation.dynamicInformation'), + }, + }, + { + path: '/virtual-drivers', + name: 'virtual-drivers', + component: VirtualDriversPage, + meta: { + title: i18n.t('appNavigation.virtualDrivers'), + }, + }, { path: '/motherboard-specification', name: 'motherboard-specification', @@ -274,6 +351,41 @@ const routes = [ description: i18n.t('appNavigation.analyticalPanel'), }, }, + { + path: '/network-adapters-ethernet', + name: 'network-adapters-ethernet', + component: EthernetAdapters, + meta: { + title: i18n.t('appNavigation.networkAdapters'), + description: i18n.t('appNavigation.ethernetAdapters'), + }, + }, + { + path: '/network-adapters-fc-hba', + name: 'network-adapters-fc-hba', + component: FcHbaAdapters, + meta: { + title: i18n.t('appNavigation.networkAdapters'), + description: i18n.t('appNavigation.fcHbaAdapters'), + }, + }, + { + path: '/network-adapters-pannel', + name: 'network-adapters-pannel', + component: NetworkPannel, + meta: { + title: i18n.t('appNavigation.networkAdapters'), + description: i18n.t('appNavigation.analyticalPanel'), + }, + }, + { + path: '/pci-devices', + name: 'pci-devices', + component: PciDevices, + meta: { + title: i18n.t('appNavigation.pciDevices'), + }, + }, { path: '/Info', name: 'overview', diff --git a/src/views/BMC/Configuration/BMCConfigurationControl.vue b/src/views/BMC/Configuration/BMCConfigurationControl.vue index 7f3de021..0eb8bfc9 100644 --- a/src/views/BMC/Configuration/BMCConfigurationControl.vue +++ b/src/views/BMC/Configuration/BMCConfigurationControl.vue @@ -19,7 +19,7 @@ />
{{ $t('BMC.Parametrs') }} @@ -115,8 +115,4 @@ a { label { padding-top: 5px; } - -.pointer { - cursor: pointer; -} diff --git a/src/views/BMC/Configuration/SettingsImportPopup.vue b/src/views/BMC/Configuration/SettingsImportPopup.vue index c7309ba3..748518bc 100644 --- a/src/views/BMC/Configuration/SettingsImportPopup.vue +++ b/src/views/BMC/Configuration/SettingsImportPopup.vue @@ -3,7 +3,7 @@ {{ $t(description) }} @@ -227,10 +227,6 @@ export default { justify-content: center; } -.pointer { - cursor: pointer; -} - .medium-16px { display: inline-block; height: 45px; diff --git a/src/views/BMC/Settings/SettingsPage.vue b/src/views/BMC/Settings/SettingsPage.vue index c9a0df8d..a5b6cd76 100644 --- a/src/views/BMC/Settings/SettingsPage.vue +++ b/src/views/BMC/Settings/SettingsPage.vue @@ -6,7 +6,7 @@
-
+
{{ $t('BMC.smnp') @@ -49,8 +49,8 @@ $t('global.status.status') }} @@ -83,7 +83,7 @@
-
+
{{ $t('BMC.smnpWarning') @@ -125,7 +125,79 @@
-
+
+
+ {{ + $t('BMC.smtpWarning') + }} +
+ + + +
+
+
+ +
{{ $t('BMC.syslogSettings') @@ -135,8 +207,8 @@ $t('global.status.status') }} @@ -177,15 +249,17 @@ diff --git a/src/views/Fans/StaticInformation/FansStaticPage.vue b/src/views/Fans/StaticInformation/FansStaticPage.vue index 45bd1914..85b5191f 100644 --- a/src/views/Fans/StaticInformation/FansStaticPage.vue +++ b/src/views/Fans/StaticInformation/FansStaticPage.vue @@ -21,7 +21,7 @@ src="@/assets/images/fans-page/working.svg" /> - {{ $t('fansPage.inWork') }} + {{ $t('global.status.inWork') }}
@@ -30,7 +30,7 @@ src="@/assets/images/fans-page/notWorking.svg" /> - {{ $t('fansPage.notWorking') }} + {{ $t('global.status.outWorking') }}
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 244fdcd7..f01cdd52 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -165,6 +165,9 @@ export default { }; diff --git a/src/views/PowerSupplies/Specification/PowerStaticPage.vue b/src/views/PowerSupplies/Specification/PowerStaticPage.vue index 463e9ea2..8ff1aa1b 100644 --- a/src/views/PowerSupplies/Specification/PowerStaticPage.vue +++ b/src/views/PowerSupplies/Specification/PowerStaticPage.vue @@ -8,10 +8,12 @@ {{ $t('pageInventory.powerSources') }} - import PageTitle from '@/components/Global/PageTitle'; import PageSection from '@/components/Global/PageSection'; -import PowerSwitch from './PowerSwitch'; +import DataTabs from '@/components/Global/SilaComponents/DataTabs'; export default { - components: { PageTitle, PageSection, PowerSwitch }, + components: { PageTitle, PageSection, DataTabs }, data() { return { - currentMemorySlot: 1, - memorySlots: [ + currentSourceSlot: 1, + sourceSlots: [ { id: 1, name: 'Источник 1' }, { id: 2, name: 'Источник 2' }, { id: 3, name: 'Источник 3' }, @@ -127,8 +129,8 @@ export default { }; }, methods: { - switchMemorySlot(period) { - this.currentMemorySlot = period; + switchSourceSlot(period) { + this.currentSourceSlot = period; }, }, }; diff --git a/src/views/PowerSupplies/Specification/PowerSwitch.vue b/src/views/PowerSupplies/Specification/PowerSwitch.vue deleted file mode 100644 index 824c2549..00000000 --- a/src/views/PowerSupplies/Specification/PowerSwitch.vue +++ /dev/null @@ -1,112 +0,0 @@ - - - - diff --git a/src/views/Processors/Specification/AcceleratorSpecificationTable.vue b/src/views/Processors/Specification/AcceleratorSpecificationTable.vue index 2baa7d5d..1be41ac2 100644 --- a/src/views/Processors/Specification/AcceleratorSpecificationTable.vue +++ b/src/views/Processors/Specification/AcceleratorSpecificationTable.vue @@ -20,7 +20,7 @@
- {{ $t('fansPage.inWork') }} + {{ $t('global.status.inWork') }}
@@ -29,7 +29,7 @@ src="@/assets/images/fans-page/notWorking.svg" /> - {{ $t('fansPage.notWorking') }} + {{ $t('global.status.outWorking') }}
@@ -44,7 +44,7 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin'; -import { Accelerators } from './mock'; +import { Accelerators } from './helpers'; export default { components: { IconChevron }, mixins: [BVToastMixin, TableRowExpandMixin, DataFormatterMixin], diff --git a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue index 3f9525ae..7baa7e67 100644 --- a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue +++ b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue @@ -10,6 +10,63 @@ $t('pageInventory.installedProcessors') }} +
+ + + {{ $t('pageInventory.table.processorCapabilityInfo') }} + + + + +
+
+ {{ $t('global.table.attributes') }} +
+
{{ 'Многопоточность' }}
+
{{ 'Виртуализация' }}
+
{{ 'Турбо режим' }}
+
+ + +
+
{{ 'Состояние присутсвия' }}
+
+ {{ item }} +
+
+ + +
+ +
{{ 'Включен' }}
+
+ + +
+
+ + +
+
+ + +
+
+ + +
{{ $t('pageInventory.installedAccelerator') @@ -24,6 +81,7 @@ diff --git a/src/views/Processors/Specification/ProcessorsSpecificationTable.vue b/src/views/Processors/Specification/ProcessorsSpecificationTable.vue index 6efc2e21..1d026f1b 100644 --- a/src/views/Processors/Specification/ProcessorsSpecificationTable.vue +++ b/src/views/Processors/Specification/ProcessorsSpecificationTable.vue @@ -27,7 +27,7 @@
- {{ $t('fansPage.inWork') }} + {{ $t('global.status.inWork') }}
@@ -36,7 +36,7 @@ src="@/assets/images/fans-page/notWorking.svg" /> - {{ $t('fansPage.notWorking') }} + {{ $t('global.status.outWorking') }}
@@ -44,59 +44,6 @@