From 32439cd031cc38fcc1f60fa331ec2fca080cfbc7 Mon Sep 17 00:00:00 2001
From: bsdbc <597918744@qq.com>
Date: Mon, 2 Mar 2020 19:47:57 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=20cabinet=20?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
nezha-fronted/src/assets/stylus/main.scss | 3 +
.../src/components/common/exportXLSX.vue | 4 +-
.../src/components/common/language/en.js | 2 +
.../components/common/rightBox/cabinetBox.vue | 206 ++++++++++
.../src/components/page/config/dc.vue | 354 +++++++++++++-----
5 files changed, 480 insertions(+), 89 deletions(-)
create mode 100644 nezha-fronted/src/components/common/rightBox/cabinetBox.vue
diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 3b181c593..67185cb9b 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -641,6 +641,9 @@ li{
.right-box-add-endpoint {
width: 850px;
}
+.right-box-cabinet{
+ width:400px
+}
/* begin--右侧弹框--顶部按钮*/
.right-box-top-btns {
text-align: center;
diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue
index c862e6ad4..27b616876 100644
--- a/nezha-fronted/src/components/common/exportXLSX.vue
+++ b/nezha-fronted/src/components/common/exportXLSX.vue
@@ -36,10 +36,10 @@
-
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 77b58e651..c65fdd1ca 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -43,6 +43,7 @@ const en = {
createAccount:'create account',
createPrometheusServer:'create prometheus server',
createDatacenter:'create datacenter',
+ createCabinet:'create cabinet',
exportExcel:'Export',
importExcel:'Import',
importExcelLower:'import',
@@ -391,6 +392,7 @@ const en = {
selectArea: 'Select area',
cabinetNum: "Cabinet number",
assets: "Assets",
+ remark:'Remark',
}
},
alert: {
diff --git a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
new file mode 100644
index 000000000..05ca8ef17
--- /dev/null
+++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+ {{$t('overall.delete')}}
+
+
+
+ {{$t('overall.edit')}}
+
+
+
+
+
+
{{rightBox.title}}
+
+
+
+
+
+
+
+ {{cabinet.name}}
+
+
+
+ {{idc?idc.name:''}}
+
+
+ {{cabinet.uSize}}
+
+
+
+
+ {{cabinet.remark}}
+
+
+
+
+
+
+
+ {{$t('overall.cancel')}}
+
+
+ {{$t('overall.save')}}
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 4220796d3..f795dc01c 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -27,113 +27,202 @@
.dc-asset-state-out {
background-color: orange;
}
+ .dc-asset-state-high {
+ background-color: rgba(255, 0, 0, 0.6);
+ }
-