diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Global/FormFile.vue | 6 | ||||
| -rw-r--r-- | src/layouts/LoginLayout.vue | 29 | ||||
| -rw-r--r-- | src/locales/ru-RU.json | 3 | ||||
| -rw-r--r-- | src/store/modules/HardwareStatus/ChassisStore.js | 2 | ||||
| -rw-r--r-- | src/store/modules/SecurityAndAccess/SessionsStore.js | 6 | ||||
| -rw-r--r-- | src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue | 4 | ||||
| -rw-r--r-- | src/views/Login/Login.vue | 6 |
7 files changed, 49 insertions, 7 deletions
diff --git a/src/components/Global/FormFile.vue b/src/components/Global/FormFile.vue index 18c542c3..907f3004 100644 --- a/src/components/Global/FormFile.vue +++ b/src/components/Global/FormFile.vue @@ -146,4 +146,10 @@ export default { align-items: center; justify-content: center; } + +.custom-form-file-container { + label { + margin-bottom: 0; + } +} </style> diff --git a/src/layouts/LoginLayout.vue b/src/layouts/LoginLayout.vue index ea9004a9..63330c22 100644 --- a/src/layouts/LoginLayout.vue +++ b/src/layouts/LoginLayout.vue @@ -79,4 +79,33 @@ export default { margin: 0; padding: 0; } + +@media (max-width: 992px) { + .login-container { + flex-direction: column; + + .login-aside { + width: 100%; + min-height: 40vh; + height: 40vh; + + .login-aside__picture { + width: 100%; + height: 40vh; + } + } + + .login-main { + width: 100%; + min-height: 40vh; + height: 40vh; + } + } +} + +@media (max-width: 576px) { + .login-form { + width: 90%; + } +} </style> diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 61a53843..75ff4c1b 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -924,6 +924,9 @@ } }, "pageSerialOverLan": { + "alert": { + "disconnectedAlertMessage" : "Система должна быть включена для соединения" + }, "connected": "Подключено", "disconnected": "Отключено", "openNewTab": "Открыть в новом окне", diff --git a/src/store/modules/HardwareStatus/ChassisStore.js b/src/store/modules/HardwareStatus/ChassisStore.js index 8a08e370..97930d2e 100644 --- a/src/store/modules/HardwareStatus/ChassisStore.js +++ b/src/store/modules/HardwareStatus/ChassisStore.js @@ -22,6 +22,7 @@ const ChassisStore = { PowerState, LocationIndicatorActive, AssetTag, + Model, MaxPowerWatts, MinPowerWatts, Name, @@ -39,6 +40,7 @@ const ChassisStore = { statusState: Status.State, healthRollup: Status.HealthRollup, assetTag: AssetTag, + model: Model, maxPowerWatts: MaxPowerWatts, minPowerWatts: MinPowerWatts, name: Name, diff --git a/src/store/modules/SecurityAndAccess/SessionsStore.js b/src/store/modules/SecurityAndAccess/SessionsStore.js index 37ba9fc2..54607ab6 100644 --- a/src/store/modules/SecurityAndAccess/SessionsStore.js +++ b/src/store/modules/SecurityAndAccess/SessionsStore.js @@ -25,14 +25,10 @@ const SessionsStore = { ) .then((sessionUris) => { const allConnectionsData = sessionUris.map((sessionUri) => { - //For filtering IP address to IPv4 - let filteredIPAddress = sessionUri.data?.ClientOriginIPAddress.slice( - 7 - ); return { clientID: sessionUri.data?.Oem?.OpenBMC.ClientID, username: sessionUri.data?.UserName, - ipAddress: filteredIPAddress, + ipAddress: sessionUri.data?.ClientOriginIPAddress, uri: sessionUri.data['@odata.id'], }; }); diff --git a/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue b/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue index cfb9aa84..0589aed8 100644 --- a/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue +++ b/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue @@ -5,7 +5,7 @@ > <div class="form-background"> <b-row> - <b-col sm="6" md="3"> + <b-col md="4"> <dl> <dt>{{ $t('pageInventory.systemIndicator.powerStatus') }}</dt> <dd> @@ -13,7 +13,7 @@ </dd> </dl> </b-col> - <b-col sm="6" md="3"> + <b-col md="6"> <dl> <dt> {{ $t('pageInventory.systemIndicator.identifyLed') }} diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index f01cdd52..582e19f0 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -189,4 +189,10 @@ export default { height: 36px; width: 380px; } + +@media (max-width: 576px) { + .login-button { + width: 100%; + } +} </style> |