Initial commit
This commit is contained in:
Your Name
+225
@@ -0,0 +1,225 @@
|
||||
From bad3f13ab79df82e8acb63d13537ba8f9d7ccd92 Mon Sep 17 00:00:00 2001
|
||||
From: "Chen.Zhao" <zhao.chen@luxshare-ict.com>
|
||||
Date: Thu, 7 Nov 2024 14:30:33 +0800
|
||||
Subject: [PATCH] Modify webui style to luxshare style
|
||||
|
||||
---
|
||||
src/assets/images/logo-lux-header.svg | 120 +++++++++++++++++++++++++
|
||||
src/assets/images/logo-lux-login.svg | 47 ++++++++++
|
||||
src/components/AppHeader/AppHeader.vue | 3 +-
|
||||
src/layouts/LoginLayout.vue | 4 +-
|
||||
4 files changed, 171 insertions(+), 3 deletions(-)
|
||||
create mode 100755 src/assets/images/logo-lux-header.svg
|
||||
create mode 100755 src/assets/images/logo-lux-login.svg
|
||||
|
||||
diff --git a/src/assets/images/logo-lux-header.svg b/src/assets/images/logo-lux-header.svg
|
||||
new file mode 100755
|
||||
index 0000000..b971b9a
|
||||
--- /dev/null
|
||||
+++ b/src/assets/images/logo-lux-header.svg
|
||||
@@ -0,0 +1,120 @@
|
||||
+<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
+<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
|
||||
+ viewBox="0 0 200 56" style="enable-background:new 0 0 200 56;" xml:space="preserve">
|
||||
|
||||
+<style type="text/css">
|
||||
|
||||
+ .st0{clip-path:url(#SVGID_2_);}
|
||||
|
||||
+ .st1{fill:#FFFFFF;}
|
||||
|
||||
+ .st2{fill:#C1C1C2;}
|
||||
|
||||
+</style>
|
||||
|
||||
+<g>
|
||||
|
||||
+ <defs>
|
||||
|
||||
+ <rect id="SVGID_1_" width="200" height="55.6"/>
|
||||
|
||||
+ </defs>
|
||||
|
||||
+ <clipPath id="SVGID_2_">
|
||||
|
||||
+ <use xlink:href="#SVGID_1_" style="overflow:visible;"/>
|
||||
|
||||
+ </clipPath>
|
||||
|
||||
+ <g class="st0">
|
||||
|
||||
+ <path class="st1" d="M0,31.4h2.5v11.4h5.9v2.1H0V31.4z"/>
|
||||
|
||||
+ <path class="st1" d="M10.7,31.4h2.5V40c0,0.4,0.1,0.8,0.2,1.2c0.1,0.3,0.4,0.6,0.6,0.9c0.3,0.2,0.6,0.4,1,0.6
|
||||
|
||||
+ c0.4,0.1,0.8,0.2,1.3,0.2c0.4,0,0.9-0.1,1.3-0.2c0.4-0.1,0.7-0.3,1-0.6c0.3-0.2,0.5-0.6,0.6-0.9c0.2-0.4,0.2-0.8,0.2-1.2v-8.6h2.5
|
||||
|
||||
+ V40c0,0.7-0.1,1.4-0.4,2.1c-0.3,0.6-0.6,1.2-1.1,1.6c-0.5,0.5-1.1,0.8-1.8,1c-0.7,0.3-1.5,0.4-2.3,0.4c-0.8,0-1.5-0.1-2.3-0.4
|
||||
|
||||
+ c-0.6-0.2-1.2-0.6-1.8-1c-0.5-0.4-0.9-1-1.1-1.6c-0.3-0.7-0.4-1.4-0.4-2.1L10.7,31.4z"/>
|
||||
|
||||
+ <path class="st1" d="M38.4,41.4c0.3,0.3,0.6,0.5,1,0.7c0.3,0.2,0.7,0.4,1.1,0.5c0.4,0.1,0.9,0.2,1.4,0.2c0.3,0,0.5,0,0.7-0.1
|
||||
|
||||
+ c0.2-0.1,0.4-0.2,0.6-0.3c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.5,0.2-0.7c0-0.3-0.1-0.6-0.3-0.8c-0.2-0.3-0.5-0.5-0.7-0.6
|
||||
|
||||
+ c-0.3-0.2-0.7-0.4-1-0.5c-0.4-0.2-0.8-0.3-1.2-0.5c-0.4-0.2-0.8-0.4-1.2-0.6c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.6-0.6-0.7-1
|
||||
|
||||
+ c-0.2-0.4-0.3-0.9-0.3-1.4c0-0.5,0.1-1.1,0.4-1.6c0.2-0.5,0.6-0.9,1-1.3c0.4-0.4,0.9-0.6,1.5-0.8c0.6-0.2,1.2-0.3,1.8-0.3
|
||||
|
||||
+ c0.6,0,1.2,0.1,1.8,0.2c0.4,0.1,0.9,0.3,1.3,0.5c0.4,0.2,0.7,0.4,1,0.7l-1.1,2c-0.3-0.2-0.6-0.4-0.9-0.6c-0.3-0.2-0.6-0.3-1-0.4
|
||||
|
||||
+ c-0.4-0.1-0.8-0.2-1.2-0.2c-0.3,0-0.5,0-0.8,0.1c-0.2,0.1-0.5,0.2-0.7,0.3c-0.2,0.1-0.3,0.3-0.4,0.5c-0.1,0.2-0.2,0.4-0.2,0.6
|
||||
|
||||
+ c0,0.3,0.1,0.6,0.3,0.8c0.2,0.2,0.5,0.4,0.7,0.6c0.3,0.2,0.7,0.4,1,0.5l1.2,0.5c0.4,0.2,0.8,0.4,1.2,0.6c0.4,0.2,0.7,0.5,1,0.8
|
||||
|
||||
+ c0.3,0.3,0.6,0.7,0.7,1c0.2,0.4,0.3,0.9,0.3,1.4c0,0.5-0.1,1-0.3,1.5c-0.2,0.5-0.5,0.9-0.9,1.3c-0.4,0.4-0.9,0.7-1.4,0.9
|
||||
|
||||
+ c-0.6,0.2-1.3,0.3-1.9,0.3c-0.4,0-0.7,0-1.1-0.1c-0.3-0.1-0.6-0.1-0.9-0.2c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.5-0.2-0.7-0.3
|
||||
|
||||
+ c-0.4-0.3-0.9-0.6-1.2-0.9L38.4,41.4z"/>
|
||||
|
||||
+ <path class="st1" d="M49.4,31.4h2.5v5.7h6.3v-5.7h2.5v13.5h-2.5v-5.7h-6.3v5.7h-2.5V31.4z"/>
|
||||
|
||||
+ <path class="st1" d="M78.1,31.4h4.4c0.4,0,0.7,0,1,0c0.3,0,0.5,0,0.7,0.1c0.2,0,0.4,0.1,0.6,0.1c0.2,0,0.3,0.1,0.5,0.2
|
||||
|
||||
+ c0.7,0.3,1.3,0.8,1.6,1.4c0.4,0.7,0.6,1.5,0.6,2.3c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1.1c-0.2,0.3-0.4,0.6-0.7,0.9
|
||||
|
||||
+ c-0.3,0.3-0.6,0.5-1,0.6v0l0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.2l0.2,0.3l2.8,5h-2.8l-2.7-5h-2.4v5h-2.5L78.1,31.4z M82.9,37.7
|
||||
|
||||
+ c0.6,0,1.1-0.2,1.6-0.6c0.2-0.2,0.4-0.5,0.5-0.7c0.1-0.3,0.1-0.6,0.1-0.8c0-0.3,0-0.6-0.1-0.9c-0.1-0.3-0.2-0.5-0.4-0.7
|
||||
|
||||
+ c-0.2-0.2-0.5-0.3-0.8-0.4c-0.4-0.1-0.8-0.2-1.2-0.1h-1.9v4.2H82.9z"/>
|
||||
|
||||
+ <path class="st1" d="M91.4,31.4h8.2v2.1h-5.7V37h4.6v2.1h-4.6v3.6h6v2.1h-8.5V31.4z"/>
|
||||
|
||||
+ <path class="st1" d="M35.6,44.9L31.2,38l4.2-6.6h-2.9l-2.8,4.4L27,31.4h-2.9l4.2,6.6L24,44.9h2.9l2.9-4.6l2.9,4.6H35.6z"/>
|
||||
|
||||
+ <path class="st1" d="M72.9,44.9h2.6l-4.9-13.5H68l-4.9,13.5h2.6l1.2-3.4h4.7L72.9,44.9z M67.7,39.4l1.6-4.4l1.6,4.4H67.7z"/>
|
||||
|
||||
+ <path class="st1" d="M153.3,7.1c0,0.4-0.1,0.9-0.4,1.2c-0.2,0.4-0.6,0.7-1,0.8c-0.4,0.2-0.9,0.2-1.3,0.1c-0.4-0.1-0.8-0.3-1.1-0.6
|
||||
|
||||
+ c-0.3-0.3-0.5-0.7-0.6-1.1c-0.1-0.4,0-0.9,0.1-1.3c0.2-0.4,0.5-0.8,0.8-1c0.4-0.2,0.8-0.4,1.2-0.4c0.3,0,0.6,0.1,0.9,0.2
|
||||
|
||||
+ c0.3,0.1,0.5,0.3,0.7,0.5c0.2,0.2,0.4,0.5,0.5,0.7C153.3,6.6,153.3,6.8,153.3,7.1z"/>
|
||||
|
||||
+ <path class="st1" d="M106.4,10.6c-0.4,0-0.9,0.1-1.2,0.4c-0.4,0.2-0.7,0.6-0.8,1c-0.2,0.4-0.2,0.9-0.1,1.3s0.3,0.8,0.6,1.1
|
||||
|
||||
+ c0.3,0.3,0.7,0.5,1.1,0.6c0.4,0.1,0.9,0,1.3-0.1c0.4-0.2,0.8-0.5,1-0.8c0.2-0.4,0.4-0.8,0.4-1.2c0-0.6-0.2-1.2-0.7-1.6
|
||||
|
||||
+ C107.6,10.8,107,10.6,106.4,10.6z M106.4,14c-0.2,0-0.5-0.1-0.7-0.2c-0.2-0.1-0.4-0.3-0.4-0.5s-0.1-0.5-0.1-0.7
|
||||
|
||||
+ c0-0.2,0.2-0.4,0.3-0.6s0.4-0.3,0.6-0.3c0.2,0,0.5,0,0.7,0.1c0.2,0.1,0.4,0.2,0.5,0.4c0.1,0.2,0.2,0.4,0.2,0.7
|
||||
|
||||
+ c0,0.3-0.1,0.6-0.4,0.8C107,13.9,106.7,14,106.4,14z"/>
|
||||
|
||||
+ <path class="st1" d="M197.8,25.8c-0.4,0-0.9,0.1-1.2,0.4c-0.4,0.2-0.7,0.6-0.8,1c-0.2,0.4-0.2,0.9-0.1,1.3
|
||||
|
||||
+ c0.1,0.4,0.3,0.8,0.6,1.1c0.3,0.3,0.7,0.5,1.1,0.6c0.4,0.1,0.9,0,1.3-0.1c0.4-0.2,0.8-0.5,1-0.8c0.2-0.4,0.4-0.8,0.4-1.2
|
||||
|
||||
+ c0-0.3-0.1-0.6-0.2-0.9c-0.1-0.3-0.3-0.5-0.5-0.7c-0.2-0.2-0.5-0.4-0.7-0.5C198.4,25.8,198.1,25.8,197.8,25.8z M197.8,29.2
|
||||
|
||||
+ c-0.2,0-0.5-0.1-0.7-0.2c-0.2-0.1-0.4-0.3-0.4-0.5c-0.1-0.2-0.1-0.5-0.1-0.7c0-0.2,0.2-0.4,0.3-0.6c0.2-0.2,0.4-0.3,0.6-0.3
|
||||
|
||||
+ s0.5,0,0.7,0.1c0.2,0.1,0.4,0.2,0.5,0.4c0.1,0.2,0.2,0.4,0.2,0.7c0,0.3-0.1,0.6-0.4,0.8C198.4,29.1,198.1,29.2,197.8,29.2
|
||||
|
||||
+ L197.8,29.2z"/>
|
||||
|
||||
+ <path class="st1" d="M132.9,26.8h-4.5v-4.5h4.5V26.8z"/>
|
||||
|
||||
+ <path class="st1" d="M104.3,24.2H89.1v0.6h15.3V24.2z"/>
|
||||
|
||||
+ <path class="st1" d="M106.6,14.8H106v9.7l-7,6.9l-0.2,0.2l0.4,0.4l7.4-7.3l0.2-0.2l-0.2-0.2V14.8z"/>
|
||||
|
||||
+ <path class="st1" d="M108.1,13.2l-0.3,0.6L130,25l0.2,0.1l0.3-0.6l-22.3-11.3L108.1,13.2z"/>
|
||||
|
||||
+ <path class="st1" d="M180.7,19.3l-0.2-0.1l-0.3,0.6l16.1,7.8l0.2,0.1l0.3-0.6L180.7,19.3z"/>
|
||||
|
||||
+ <path class="st1" d="M151,6.7l-20.2,17.1l0.4,0.5l20.2-17.1L151,6.7z"/>
|
||||
|
||||
+ <path class="st1" d="M149.1,6.7h-9.5v0.6h9.5V6.7z"/>
|
||||
|
||||
+ <path class="st1" d="M178.2,19.4H153V20h25.3V19.4z"/>
|
||||
|
||||
+ <path class="st1" d="M151.4,9.1h-0.6v8.4h0.6V9.1z"/>
|
||||
|
||||
+ <path class="st1" d="M179.7,3.2h-0.6v16.5h0.6V3.2z"/>
|
||||
|
||||
+ <path class="st2" d="M105,31.3h2.6v13.6H105V31.3z"/>
|
||||
|
||||
+ <path class="st2" d="M111.2,38.1c0-0.9,0.2-1.9,0.5-2.7c0.3-0.8,0.9-1.6,1.5-2.2c0.6-0.6,1.4-1.1,2.2-1.5c0.9-0.4,1.9-0.5,2.8-0.5
|
||||
|
||||
+ c0.4,0,0.8,0,1.2,0.1c0.3,0,0.7,0.1,1,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.2,0.1,0.5,0.2,0.7,0.3c0.5,0.3,0.9,0.6,1.3,0.9l-1.2,1.8
|
||||
|
||||
+ c-0.3-0.3-0.7-0.5-1.1-0.7c-0.4-0.2-0.8-0.4-1.2-0.5c-0.5-0.2-1-0.2-1.5-0.2c-0.7,0-1.3,0.1-1.9,0.4c-0.5,0.2-1,0.6-1.5,1
|
||||
|
||||
+ c-0.4,0.4-0.7,0.9-0.9,1.5c-0.2,0.6-0.3,1.2-0.3,1.8c0,0.6,0.1,1.3,0.3,1.8c0.2,0.6,0.5,1.1,0.9,1.5c0.4,0.4,0.9,0.8,1.5,1.1
|
||||
|
||||
+ c0.6,0.3,1.3,0.4,1.9,0.4c0.3,0,0.6,0,0.9-0.1c0.3,0,0.5-0.1,0.8-0.2c0.2-0.1,0.5-0.2,0.7-0.3c0.2-0.1,0.4-0.2,0.6-0.3
|
||||
|
||||
+ c0.4-0.2,0.8-0.5,1.1-0.8l1.3,1.8c-0.4,0.4-0.9,0.8-1.4,1.1c-0.2,0.2-0.5,0.3-0.8,0.4c-0.3,0.1-0.6,0.3-0.9,0.4
|
||||
|
||||
+ c-0.4,0.1-0.7,0.2-1.1,0.3c-0.4,0.1-0.8,0.1-1.3,0.1c-0.7,0-1.3-0.1-2-0.2c-0.6-0.2-1.2-0.4-1.7-0.7c-0.5-0.3-1-0.7-1.4-1.1
|
||||
|
||||
+ c-0.4-0.4-0.8-0.9-1.1-1.4c-0.3-0.5-0.5-1.1-0.7-1.7C111.2,39.3,111.2,38.7,111.2,38.1z"/>
|
||||
|
||||
+ <path class="st2" d="M129.3,33.5h-4.5v-2.1h11.5v2.1h-4.5v11.4h-2.5L129.3,33.5z"/>
|
||||
|
||||
+ <path class="st1" d="M139.8,7.1c0,0.4-0.1,0.9-0.4,1.2c-0.2,0.4-0.6,0.7-1,0.8c-0.4,0.2-0.9,0.2-1.3,0.1c-0.4-0.1-0.8-0.3-1.1-0.6
|
||||
|
||||
+ c-0.3-0.3-0.5-0.7-0.6-1.1c-0.1-0.4,0-0.9,0.1-1.3c0.2-0.4,0.5-0.8,0.8-1c0.4-0.2,0.8-0.4,1.2-0.4c0.3,0,0.6,0.1,0.9,0.2
|
||||
|
||||
+ c0.3,0.1,0.5,0.3,0.7,0.5c0.2,0.2,0.4,0.5,0.5,0.7C139.8,6.6,139.8,6.8,139.8,7.1z"/>
|
||||
|
||||
+ <path class="st1" d="M89.3,26.8h-4.5v-4.5h4.5V26.8z M86,25.6h2.1v-2.1H86V25.6z"/>
|
||||
|
||||
+ <path class="st1" d="M153.3,21.8h-4.5v-4.5h4.5V21.8z M150,20.7h2.1v-2.1H150L150,20.7z"/>
|
||||
|
||||
+ <path class="st1" d="M108.6,24.5c0,0.4-0.1,0.9-0.4,1.2c-0.2,0.4-0.6,0.7-1,0.8c-0.4,0.2-0.9,0.2-1.3,0.1
|
||||
|
||||
+ c-0.4-0.1-0.8-0.3-1.1-0.6c-0.3-0.3-0.5-0.7-0.6-1.1c-0.1-0.4,0-0.9,0.1-1.3s0.5-0.8,0.8-1c0.4-0.2,0.8-0.4,1.2-0.4
|
||||
|
||||
+ c0.3,0,0.6,0.1,0.9,0.2c0.3,0.1,0.5,0.3,0.7,0.5c0.2,0.2,0.4,0.5,0.5,0.7C108.5,23.9,108.6,24.2,108.6,24.5z"/>
|
||||
|
||||
+ <path class="st1" d="M181.6,21.9h-4.5v-4.5h4.5V21.9z"/>
|
||||
|
||||
+ <path class="st1" d="M181.6,4.5h-4.5V0h4.5V4.5z M178.3,3.3h2.1V1.2h-2.1V3.3z"/>
|
||||
|
||||
+ <path class="st1" d="M2,50.1l-0.9,0.3l0.1,0.1c0.4,0.9,0.8,2,1.3,3.4l0.1,0.1l0.9-0.3l-0.1-0.1c-0.4-1.2-0.9-2.3-1.3-3.4L2,50.1z"
|
||||
|
||||
+ />
|
||||
|
||||
+ <path class="st1" d="M6.8,50.5l0.1-0.1L5.9,50l0,0.1c-0.5,1.4-1.1,2.8-1.7,4.1H0v0.8h7.9v-0.8H5.2C5.8,52.9,6.3,51.7,6.8,50.5z"/>
|
||||
|
||||
+ <path class="st1" d="M7.7,49.1h-3l0-0.1c-0.1-0.1-0.1-0.3-0.2-0.5c-0.1-0.3-0.2-0.6-0.3-0.8l0-0.1l-0.9,0.2l0.1,0.1
|
||||
|
||||
+ c0.2,0.4,0.3,0.8,0.4,1.2H0.2V50h7.5V49.1z"/>
|
||||
|
||||
+ <path class="st1" d="M11.9,53.4v-0.2l-0.2,0.1l-0.8,0.6v-3.6H9.1v0.9h0.9V54c0,0.1,0,0.3-0.1,0.4c0,0.1-0.1,0.2-0.2,0.3l-0.1,0.1
|
||||
|
||||
+ l0.7,0.7l0.1-0.1c0.1-0.1,0.1-0.1,0.1-0.2c0.1-0.1,0.2-0.2,0.3-0.3c0.4-0.3,0.7-0.5,1.1-0.8l0.1-0.1L12.1,54
|
||||
|
||||
+ C12,53.8,11.9,53.6,11.9,53.4z"/>
|
||||
|
||||
+ <path class="st1" d="M10.5,49.7l0.1,0.1l0.7-0.6l-0.1-0.1c-0.2-0.3-0.6-0.7-1.3-1.3l-0.1-0.1l-0.7,0.6l0.1,0.1
|
||||
|
||||
+ C9.8,48.9,10.2,49.3,10.5,49.7z"/>
|
||||
|
||||
+ <path class="st1" d="M16.6,52.9l-0.2-0.1v0.2c0,0.4-0.1,0.9-0.1,1.3c0,0,0,0,0,0c0,0,0,0,0,0h0c-0.2-0.4-0.3-0.9-0.3-1.3
|
||||
|
||||
+ c0-0.4-0.1-1.1-0.1-2.2V48h-4.6v0.9h1.4v2.2h-1.5v0.9h1.5v3.7h0.9v-3.7h1.5c0,0.2,0,0.3,0,0.4c0,0.4,0,0.8,0.1,1.3
|
||||
|
||||
+ c0,0.5,0.2,1,0.5,1.4c0.7,0.8,1.3,0.8,1.6-0.1c0-0.3,0.1-0.8,0.2-1.6v-0.1h-0.1C17,53.1,16.8,53,16.6,52.9z M13.4,51.1v-2.2h1.5
|
||||
|
||||
+ V51L13.4,51.1z"/>
|
||||
|
||||
+ <path class="st1" d="M24.2,50.1h1.9v-0.7h-1.9V49h2.1v-0.8h-2.1v-0.7h-0.8v0.7h-1.9v0.1l-0.5-0.2l-0.1,0.1
|
||||
|
||||
+ c-0.1,0.4-0.3,0.8-0.4,1.1v-1.8h-0.9v2.1c-0.2-0.5-0.3-0.9-0.4-1c-0.1-0.2-0.1-0.3-0.1-0.4l0-0.1l-0.7,0.2l0.1,0.1
|
||||
|
||||
+ c0.2,0.4,0.3,0.9,0.4,1.3c0,0.2,0.1,0.3,0.1,0.3l0,0.1l0.7-0.3v0.4h-1.3v0.8h1.1c-0.3,0.8-0.7,1.6-1.2,2.3l-0.1,0.1l0,0.1
|
||||
|
||||
+ c0.1,0.2,0.1,0.3,0.2,0.4l0.1,0.3l0.1,0.3l0.2-0.2c0.3-0.5,0.6-1,0.9-1.5v2.7h0.8v-2.9l0.7,0.8l0.1,0.1l0.5-0.5v2.5h0.8v-1.4h2.6
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
From 2fb344cc9990a192d3b6c826b4f4325f5d4fcffe Mon Sep 17 00:00:00 2001
|
||||
From: "Chen.Zhao" <zhao.chen@luxshare-ict.com>
|
||||
Date: Mon, 25 Nov 2024 17:40:47 +0800
|
||||
Subject: [PATCH] Remove Reset server settings only in WEBUI do factory reset
|
||||
|
||||
---
|
||||
src/views/Operations/FactoryReset/FactoryReset.vue | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/views/Operations/FactoryReset/FactoryReset.vue b/src/views/Operations/FactoryReset/FactoryReset.vue
|
||||
index 897348f..6334f12 100644
|
||||
--- a/src/views/Operations/FactoryReset/FactoryReset.vue
|
||||
+++ b/src/views/Operations/FactoryReset/FactoryReset.vue
|
||||
@@ -12,6 +12,7 @@
|
||||
v-model="resetOption"
|
||||
stacked
|
||||
>
|
||||
+ <!-- comment out the "reset bios options"
|
||||
<b-form-radio
|
||||
class="mb-1"
|
||||
value="resetBios"
|
||||
@@ -23,6 +24,7 @@
|
||||
<b-form-text id="reset-bios" class="ml-4 mb-3">
|
||||
{{ $t('pageFactoryReset.form.resetBiosOptionHelperText') }}
|
||||
</b-form-text>
|
||||
+ -->
|
||||
|
||||
<b-form-radio
|
||||
class="mb-1"
|
||||
@@ -67,7 +69,7 @@ export default {
|
||||
mixins: [LoadingBarMixin, BVToastMixin],
|
||||
data() {
|
||||
return {
|
||||
- resetOption: 'resetBios',
|
||||
+ resetOption: 'resetToDefaults',
|
||||
};
|
||||
},
|
||||
created() {
|
||||
--
|
||||
2.25.1
|
||||
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
From a84af7701f9b8c9804a1d3be96810218f676748a Mon Sep 17 00:00:00 2001
|
||||
From: "Chen.Zhao" <zhao.chen@luxshare-ict.com>
|
||||
Date: Wed, 11 Dec 2024 10:28:29 +0800
|
||||
Subject: [PATCH] Remove inventory page for mobile project.
|
||||
|
||||
---
|
||||
src/components/AppNavigation/AppNavigationMixin.js | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js
|
||||
index b33b24b..342eafd 100644
|
||||
--- a/src/components/AppNavigation/AppNavigationMixin.js
|
||||
+++ b/src/components/AppNavigation/AppNavigationMixin.js
|
||||
@@ -55,11 +55,13 @@ const AppNavigationMixin = {
|
||||
label: this.$t('appNavigation.hardwareStatus'),
|
||||
icon: 'iconHealth',
|
||||
children: [
|
||||
+ /* Comment out unnecessary inventory, justin 202411
|
||||
{
|
||||
id: 'inventory',
|
||||
label: this.$t('appNavigation.inventory'),
|
||||
route: '/hardware-status/inventory',
|
||||
},
|
||||
+ */
|
||||
{
|
||||
id: 'sensors',
|
||||
label: this.$t('appNavigation.sensors'),
|
||||
--
|
||||
2.25.1
|
||||
|
||||
+1965
File diff suppressed because it is too large
Load Diff
+37
@@ -0,0 +1,37 @@
|
||||
From 37d094c623c292605442cdbfd74930e785d29820 Mon Sep 17 00:00:00 2001
|
||||
From: wangjue <jue.wang2@luxshare-ict.com>
|
||||
Date: Tue, 24 Dec 2024 17:02:46 +0800
|
||||
Subject: [PATCH] Sync webui sensor status with ipmi
|
||||
|
||||
Signed-off-by: wangjue <jue.wang2@luxshare-ict.com>
|
||||
---
|
||||
src/views/HardwareStatus/Sensors/Sensors.vue | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/views/HardwareStatus/Sensors/Sensors.vue b/src/views/HardwareStatus/Sensors/Sensors.vue
|
||||
index c4663a9..038e5a4 100644
|
||||
--- a/src/views/HardwareStatus/Sensors/Sensors.vue
|
||||
+++ b/src/views/HardwareStatus/Sensors/Sensors.vue
|
||||
@@ -196,11 +196,14 @@ export default {
|
||||
{
|
||||
key: 'status',
|
||||
label: this.$t('pageSensors.table.status'),
|
||||
- values: [
|
||||
- this.$t('global.action.ok'),
|
||||
- this.$t('global.action.warning'),
|
||||
- this.$t('global.action.critical'),
|
||||
- ],
|
||||
+ values: ['OK', 'Warning', 'Critical', 'NonRecoverable', 'ns'],
|
||||
+ valueLabel: {
|
||||
+ OK: this.$t('global.action.ok'),
|
||||
+ Warning: this.$t('global.action.warning'),
|
||||
+ Critical: this.$t('global.action.critical'),
|
||||
+ NonRecoverable: this.$t('global.action.NonRecoverable'),
|
||||
+ ns: 'ns',
|
||||
+ },
|
||||
},
|
||||
],
|
||||
activeFilters: [],
|
||||
--
|
||||
2.34.1
|
||||
|
||||
+168
@@ -0,0 +1,168 @@
|
||||
From 65237e34ee6efb0b9e2c49d2eeac19a7a8659474 Mon Sep 17 00:00:00 2001
|
||||
From: roly <Rolyli.Li@luxshare-ict.com>
|
||||
Date: Wed, 6 Nov 2024 10:56:49 +0800
|
||||
Subject: [PATCH] Webui Firmware page support cpld verison
|
||||
|
||||
---
|
||||
src/locales/en-US.json | 1 +
|
||||
src/store/modules/Operations/FirmwareStore.js | 13 ++++++
|
||||
src/views/Operations/Firmware/Firmware.vue | 8 ++++
|
||||
.../Operations/Firmware/FirmwareCardsCPLD.vue | 40 +++++++++++++++++++
|
||||
4 files changed, 62 insertions(+)
|
||||
create mode 100755 src/views/Operations/Firmware/FirmwareCardsCPLD.vue
|
||||
|
||||
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
|
||||
index 18bb7c6..dd944aa 100644
|
||||
--- a/src/locales/en-US.json
|
||||
+++ b/src/locales/en-US.json
|
||||
@@ -333,6 +333,7 @@
|
||||
"sectionTitleBmcCardsCombined": "BMC and server",
|
||||
"sectionTitleHostCards": "Host",
|
||||
"sectionTitleUpdateFirmware": "Update firmware",
|
||||
+ "sectionTitleCPLDCards": "CPLD",
|
||||
"alert": {
|
||||
"operationInProgress": "Server power operation in progress.",
|
||||
"serverMustBePoweredOffTo": "Server must be powered off to:",
|
||||
diff --git a/src/store/modules/Operations/FirmwareStore.js b/src/store/modules/Operations/FirmwareStore.js
|
||||
index afc12e9..a90e1a5 100644
|
||||
--- a/src/store/modules/Operations/FirmwareStore.js
|
||||
+++ b/src/store/modules/Operations/FirmwareStore.js
|
||||
@@ -6,6 +6,7 @@ const FirmwareStore = {
|
||||
state: {
|
||||
bmcFirmware: [],
|
||||
hostFirmware: [],
|
||||
+ cpldFirmware: [],
|
||||
bmcActiveFirmwareId: null,
|
||||
hostActiveFirmwareId: null,
|
||||
applyTime: null,
|
||||
@@ -35,12 +36,18 @@ const FirmwareStore = {
|
||||
(firmware) => firmware.id !== state.hostActiveFirmwareId
|
||||
);
|
||||
},
|
||||
+ cpldFirmware: (state) => {
|
||||
+ return state.cpldFirmware.find(
|
||||
+ (firmware) => firmware.id === 'cpld_active'
|
||||
+ );
|
||||
+ },
|
||||
},
|
||||
mutations: {
|
||||
setActiveBmcFirmwareId: (state, id) => (state.bmcActiveFirmwareId = id),
|
||||
setActiveHostFirmwareId: (state, id) => (state.hostActiveFirmwareId = id),
|
||||
setBmcFirmware: (state, firmware) => (state.bmcFirmware = firmware),
|
||||
setHostFirmware: (state, firmware) => (state.hostFirmware = firmware),
|
||||
+ setCPLDFirmware: (state, firmware) => (state.cpldFirmware = firmware),
|
||||
setApplyTime: (state, applyTime) => (state.applyTime = applyTime),
|
||||
setHttpPushUri: (state, httpPushUri) => (state.httpPushUri = httpPushUri),
|
||||
setTftpUploadAvailable: (state, tftpAvailable) =>
|
||||
@@ -82,6 +89,7 @@ const FirmwareStore = {
|
||||
.then((response) => {
|
||||
const bmcFirmware = [];
|
||||
const hostFirmware = [];
|
||||
+ const cpldFirmware = [];
|
||||
response.forEach(({ data }) => {
|
||||
const firmwareType = data?.RelatedItem?.[0]?.['@odata.id']
|
||||
.split('/')
|
||||
@@ -97,9 +105,14 @@ const FirmwareStore = {
|
||||
} else if (firmwareType === 'Bios') {
|
||||
hostFirmware.push(item);
|
||||
}
|
||||
+
|
||||
+ if (item.id === 'cpld_active') {
|
||||
+ cpldFirmware.push(item);
|
||||
+ }
|
||||
});
|
||||
commit('setBmcFirmware', bmcFirmware);
|
||||
commit('setHostFirmware', hostFirmware);
|
||||
+ commit('setCPLDFirmware', cpldFirmware);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.log(error);
|
||||
diff --git a/src/views/Operations/Firmware/Firmware.vue b/src/views/Operations/Firmware/Firmware.vue
|
||||
index a2acb9b..25fe0bb 100644
|
||||
--- a/src/views/Operations/Firmware/Firmware.vue
|
||||
+++ b/src/views/Operations/Firmware/Firmware.vue
|
||||
@@ -14,6 +14,9 @@
|
||||
|
||||
<!-- Host Firmware -->
|
||||
<host-cards v-if="!isSingleFileUploadEnabled" />
|
||||
+
|
||||
+ <!-- CPLD Firmware -->
|
||||
+ <cpld-cards v-if="cpld" />
|
||||
</b-col>
|
||||
</b-row>
|
||||
|
||||
@@ -41,6 +44,7 @@ import FormUpdate from './FirmwareFormUpdate';
|
||||
import HostCards from './FirmwareCardsHost';
|
||||
import PageSection from '@/components/Global/PageSection';
|
||||
import PageTitle from '@/components/Global/PageTitle';
|
||||
+import CpldCards from './FirmwareCardsCPLD';
|
||||
|
||||
import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
|
||||
|
||||
@@ -53,6 +57,7 @@ export default {
|
||||
HostCards,
|
||||
PageSection,
|
||||
PageTitle,
|
||||
+ CpldCards,
|
||||
},
|
||||
mixins: [LoadingBarMixin],
|
||||
beforeRouteLeave(to, from, next) {
|
||||
@@ -82,6 +87,9 @@ export default {
|
||||
}
|
||||
return this.loading || this.isOperationInProgress;
|
||||
},
|
||||
+ cpld() {
|
||||
+ return this.$store.getters['firmware/cpldFirmware'];
|
||||
+ },
|
||||
},
|
||||
created() {
|
||||
this.startLoader();
|
||||
diff --git a/src/views/Operations/Firmware/FirmwareCardsCPLD.vue b/src/views/Operations/Firmware/FirmwareCardsCPLD.vue
|
||||
new file mode 100755
|
||||
index 0000000..baaec3e
|
||||
--- /dev/null
|
||||
+++ b/src/views/Operations/Firmware/FirmwareCardsCPLD.vue
|
||||
@@ -0,0 +1,40 @@
|
||||
+<template>
|
||||
+ <page-section :section-title="$t('pageFirmware.sectionTitleCPLDCards')">
|
||||
+ <b-card-group deck>
|
||||
+ <!-- Running image -->
|
||||
+ <b-card>
|
||||
+ <template #header>
|
||||
+ <p class="font-weight-bold m-0">
|
||||
+ {{ $t('pageFirmware.cardTitleRunning') }}
|
||||
+ </p>
|
||||
+ </template>
|
||||
+ <dl class="mb-0">
|
||||
+ <dt>{{ $t('pageFirmware.cardBodyVersion') }}</dt>
|
||||
+ <dd class="mb-0">{{ runningVersion }}</dd>
|
||||
+ </dl>
|
||||
+ </b-card>
|
||||
+ </b-card-group>
|
||||
+ </page-section>
|
||||
+</template>
|
||||
+
|
||||
+<script>
|
||||
+import PageSection from '@/components/Global/PageSection';
|
||||
+
|
||||
+export default {
|
||||
+ components: { PageSection },
|
||||
+ computed: {
|
||||
+ running() {
|
||||
+ return this.$store.getters['firmware/cpldFirmware'];
|
||||
+ },
|
||||
+ runningVersion() {
|
||||
+ return this.running?.version || '--';
|
||||
+ },
|
||||
+ },
|
||||
+};
|
||||
+</script>
|
||||
+
|
||||
+<style lang="scss" scoped>
|
||||
+.page-section {
|
||||
+ margin-top: -$spacer * 1.5;
|
||||
+}
|
||||
+</style>
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Executable
+64
@@ -0,0 +1,64 @@
|
||||
From e5c775ba5f3882cda23e068e9118756ada6bce36 Mon Sep 17 00:00:00 2001
|
||||
From: roly <Rolyli.Li@luxshare-ict.com>
|
||||
Date: Fri, 15 Nov 2024 14:02:18 +0800
|
||||
Subject: [PATCH] Webui add bmc release date info
|
||||
|
||||
---
|
||||
src/locales/en-US.json | 1 +
|
||||
src/store/modules/Operations/FirmwareStore.js | 1 +
|
||||
src/views/Operations/Firmware/FirmwareCardsBmc.vue | 8 ++++++++
|
||||
3 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
|
||||
index b695955..aacb848 100644
|
||||
--- a/src/locales/en-US.json
|
||||
+++ b/src/locales/en-US.json
|
||||
@@ -327,6 +327,7 @@
|
||||
"pageFirmware": {
|
||||
"cardActionSwitchToRunning": "Switch to running",
|
||||
"cardBodyVersion": "Version",
|
||||
+ "cardBodyReleaseDate": "Release Date",
|
||||
"cardTitleBackup": "Backup image",
|
||||
"cardTitleRunning": "Running image",
|
||||
"cardTitleMBCpld": "Mother Board CPLD",
|
||||
diff --git a/src/store/modules/Operations/FirmwareStore.js b/src/store/modules/Operations/FirmwareStore.js
|
||||
index f03b425..001eaf6 100644
|
||||
--- a/src/store/modules/Operations/FirmwareStore.js
|
||||
+++ b/src/store/modules/Operations/FirmwareStore.js
|
||||
@@ -107,6 +107,7 @@ const FirmwareStore = {
|
||||
id: data?.Id,
|
||||
location: data?.['@odata.id'],
|
||||
status: data?.Status?.Health,
|
||||
+ reldate: data?.ReleaseDate,
|
||||
};
|
||||
if (firmwareType === 'bmc') {
|
||||
bmcFirmware.push(item);
|
||||
diff --git a/src/views/Operations/Firmware/FirmwareCardsBmc.vue b/src/views/Operations/Firmware/FirmwareCardsBmc.vue
|
||||
index d79a876..8765f77 100644
|
||||
--- a/src/views/Operations/Firmware/FirmwareCardsBmc.vue
|
||||
+++ b/src/views/Operations/Firmware/FirmwareCardsBmc.vue
|
||||
@@ -13,6 +13,11 @@
|
||||
<dt>{{ $t('pageFirmware.cardBodyVersion') }}</dt>
|
||||
<dd class="mb-0">{{ runningVersion }}</dd>
|
||||
</dl>
|
||||
+ <br />
|
||||
+ <dl class="mb-0">
|
||||
+ <dt>{{ $t('pageFirmware.cardBodyReleaseDate') }}</dt>
|
||||
+ <dd class="mb-0">{{ releaseDate }}</dd>
|
||||
+ </dl>
|
||||
</b-card>
|
||||
|
||||
<!-- Backup image -->
|
||||
@@ -95,6 +100,9 @@ export default {
|
||||
runningVersion() {
|
||||
return this.running?.version || '--';
|
||||
},
|
||||
+ releaseDate() {
|
||||
+ return this.running?.reldate || '--';
|
||||
+ },
|
||||
backupVersion() {
|
||||
return this.backup?.version || '--';
|
||||
},
|
||||
--
|
||||
2.25.1
|
||||
|
||||
+133
@@ -0,0 +1,133 @@
|
||||
From 6ea10b4fd4908ee8c4a48a8b0362a279a5b55d32 Mon Sep 17 00:00:00 2001
|
||||
From: roly <Rolyli.Li@luxshare-ict.com>
|
||||
Date: Wed, 13 Nov 2024 14:45:30 +0800
|
||||
Subject: [PATCH] Webui support fan board cpld verison display
|
||||
|
||||
---
|
||||
src/locales/en-US.json | 2 ++
|
||||
src/store/modules/Operations/FirmwareStore.js | 12 +++++++++
|
||||
.../Operations/Firmware/FirmwareCardsCPLD.vue | 27 +++++++++++++++----
|
||||
3 files changed, 36 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
|
||||
index 23821a1..b695955 100644
|
||||
--- a/src/locales/en-US.json
|
||||
+++ b/src/locales/en-US.json
|
||||
@@ -329,6 +329,8 @@
|
||||
"cardBodyVersion": "Version",
|
||||
"cardTitleBackup": "Backup image",
|
||||
"cardTitleRunning": "Running image",
|
||||
+ "cardTitleMBCpld": "Mother Board CPLD",
|
||||
+ "cardTitleFBCpld": "Fan Board CPLD",
|
||||
"sectionTitleBmcCards": "BMC",
|
||||
"sectionTitleBmcCardsCombined": "BMC and server",
|
||||
"sectionTitleHostCards": "Host",
|
||||
diff --git a/src/store/modules/Operations/FirmwareStore.js b/src/store/modules/Operations/FirmwareStore.js
|
||||
index a90e1a5..f03b425 100644
|
||||
--- a/src/store/modules/Operations/FirmwareStore.js
|
||||
+++ b/src/store/modules/Operations/FirmwareStore.js
|
||||
@@ -7,6 +7,7 @@ const FirmwareStore = {
|
||||
bmcFirmware: [],
|
||||
hostFirmware: [],
|
||||
cpldFirmware: [],
|
||||
+ fbcpldFirmware: [],
|
||||
bmcActiveFirmwareId: null,
|
||||
hostActiveFirmwareId: null,
|
||||
applyTime: null,
|
||||
@@ -41,6 +42,11 @@ const FirmwareStore = {
|
||||
(firmware) => firmware.id === 'cpld_active'
|
||||
);
|
||||
},
|
||||
+ fbcpldFirmware: (state) => {
|
||||
+ return state.fbcpldFirmware.find(
|
||||
+ (firmware) => firmware.id === 'fb_cpld_active'
|
||||
+ );
|
||||
+ },
|
||||
},
|
||||
mutations: {
|
||||
setActiveBmcFirmwareId: (state, id) => (state.bmcActiveFirmwareId = id),
|
||||
@@ -48,6 +54,7 @@ const FirmwareStore = {
|
||||
setBmcFirmware: (state, firmware) => (state.bmcFirmware = firmware),
|
||||
setHostFirmware: (state, firmware) => (state.hostFirmware = firmware),
|
||||
setCPLDFirmware: (state, firmware) => (state.cpldFirmware = firmware),
|
||||
+ setFBCPLDFirmware: (state, firmware) => (state.fbcpldFirmware = firmware),
|
||||
setApplyTime: (state, applyTime) => (state.applyTime = applyTime),
|
||||
setHttpPushUri: (state, httpPushUri) => (state.httpPushUri = httpPushUri),
|
||||
setTftpUploadAvailable: (state, tftpAvailable) =>
|
||||
@@ -90,6 +97,7 @@ const FirmwareStore = {
|
||||
const bmcFirmware = [];
|
||||
const hostFirmware = [];
|
||||
const cpldFirmware = [];
|
||||
+ const fbcpldFirmware = [];
|
||||
response.forEach(({ data }) => {
|
||||
const firmwareType = data?.RelatedItem?.[0]?.['@odata.id']
|
||||
.split('/')
|
||||
@@ -109,10 +117,14 @@ const FirmwareStore = {
|
||||
if (item.id === 'cpld_active') {
|
||||
cpldFirmware.push(item);
|
||||
}
|
||||
+ if (item.id === 'fb_cpld_active') {
|
||||
+ fbcpldFirmware.push(item);
|
||||
+ }
|
||||
});
|
||||
commit('setBmcFirmware', bmcFirmware);
|
||||
commit('setHostFirmware', hostFirmware);
|
||||
commit('setCPLDFirmware', cpldFirmware);
|
||||
+ commit('setFBCPLDFirmware', fbcpldFirmware);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.log(error);
|
||||
diff --git a/src/views/Operations/Firmware/FirmwareCardsCPLD.vue b/src/views/Operations/Firmware/FirmwareCardsCPLD.vue
|
||||
index baaec3e..ccc76a9 100755
|
||||
--- a/src/views/Operations/Firmware/FirmwareCardsCPLD.vue
|
||||
+++ b/src/views/Operations/Firmware/FirmwareCardsCPLD.vue
|
||||
@@ -5,12 +5,23 @@
|
||||
<b-card>
|
||||
<template #header>
|
||||
<p class="font-weight-bold m-0">
|
||||
- {{ $t('pageFirmware.cardTitleRunning') }}
|
||||
+ {{ $t('pageFirmware.cardTitleMBCpld') }}
|
||||
</p>
|
||||
</template>
|
||||
<dl class="mb-0">
|
||||
<dt>{{ $t('pageFirmware.cardBodyVersion') }}</dt>
|
||||
- <dd class="mb-0">{{ runningVersion }}</dd>
|
||||
+ <dd class="mb-0">{{ MBCPLDVersion }}</dd>
|
||||
+ </dl>
|
||||
+ </b-card>
|
||||
+ <b-card>
|
||||
+ <template #header>
|
||||
+ <p class="font-weight-bold m-0">
|
||||
+ {{ $t('pageFirmware.cardTitleFBCpld') }}
|
||||
+ </p>
|
||||
+ </template>
|
||||
+ <dl class="mb-0">
|
||||
+ <dt>{{ $t('pageFirmware.cardBodyVersion') }}</dt>
|
||||
+ <dd class="mb-0">{{ FBCPLDVersion }}</dd>
|
||||
</dl>
|
||||
</b-card>
|
||||
</b-card-group>
|
||||
@@ -23,11 +34,17 @@ import PageSection from '@/components/Global/PageSection';
|
||||
export default {
|
||||
components: { PageSection },
|
||||
computed: {
|
||||
- running() {
|
||||
+ mbcpld() {
|
||||
return this.$store.getters['firmware/cpldFirmware'];
|
||||
},
|
||||
- runningVersion() {
|
||||
- return this.running?.version || '--';
|
||||
+ MBCPLDVersion() {
|
||||
+ return this.mbcpld?.version || '--';
|
||||
+ },
|
||||
+ fbcpld() {
|
||||
+ return this.$store.getters['firmware/fbcpldFirmware'];
|
||||
+ },
|
||||
+ FBCPLDVersion() {
|
||||
+ return this.fbcpld?.version || '--';
|
||||
},
|
||||
},
|
||||
};
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user