From cda2dd7dafbd6e57c9d37478e930655342e9368e Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Fri, 10 Jan 2020 18:16:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:asset=20=E5=88=97=E8=A1=A8=E6=9C=BA?= =?UTF-8?q?=E6=88=BF=E5=BC=B9=E6=A1=86=20=E5=8F=8A=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.机房配置抽取组件 2.idc配置组件增加详情查看 3.idc配置组件增加联动更新 --- .../src/components/common/header.vue | 11 +- .../common/popBox/cabinetConfig.vue | 202 ++++++++++++++++ .../common/{ => popBox}/dcConfig.vue | 59 +++-- .../components/page/asset/accountConfig.vue | 18 +- .../src/components/page/asset/asset.vue | 25 +- .../components/page/asset/assetAddUnit.vue | 217 +----------------- .../components/page/asset/assetEditUnit.vue | 214 +---------------- .../src/components/page/config/promServer.vue | 15 +- nezha-fronted/src/main.js | 4 +- 9 files changed, 312 insertions(+), 453 deletions(-) create mode 100644 nezha-fronted/src/components/common/popBox/cabinetConfig.vue rename nezha-fronted/src/components/common/{ => popBox}/dcConfig.vue (74%) diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index 54824185b..1041b229e 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -57,9 +57,11 @@
{{item.name}} - + +
{{title}}
+ + + + +
{{cabinet.name}}
+
+ +
{{cabinet.uSize}}
+ +
+ + +
{{cabinet.remark}}
+
+ + + + {{ item.name }} + + +
{{idc?idc.name:''}}
+
+
+
+ + + + + + + + + + + + diff --git a/nezha-fronted/src/components/common/dcConfig.vue b/nezha-fronted/src/components/common/popBox/dcConfig.vue similarity index 74% rename from nezha-fronted/src/components/common/dcConfig.vue rename to nezha-fronted/src/components/common/popBox/dcConfig.vue index c4bad16eb..643c8bfbf 100644 --- a/nezha-fronted/src/components/common/dcConfig.vue +++ b/nezha-fronted/src/components/common/popBox/dcConfig.vue @@ -1,13 +1,14 @@ {{assetViewData.cabinetName}} @@ -637,7 +442,7 @@
{{$t('asset.createAssetTab.cli')}}
- + @@ -1118,16 +923,7 @@ }) } }, - uploadFile:function(file){ - }, - clearFile:function(){ - if(this.$refs.upload){ - this.$refs.upload.clearFiles(); - } - this.uploadFileList=[]; - this.assetData.accounts[0].privateKey=''; - }, addNewData(type) { if (type === 'IDC') { const h = this.$createElement; diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 0f81d2126..95b9424e5 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -33,7 +33,13 @@