From a51cb700840febdcf4bebfef8692dc53529616e5 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 30 Oct 2020 15:16:25 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=9C=BA?=
 =?UTF-8?q?=E6=9F=9C=E6=98=BE=E7=A4=BAu=E4=BD=8D=20=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/deleteButton.vue       | 16 +++++++++++-----
 .../src/components/page/asset/asset.vue          |  8 +++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue
index 4e8ad9109..6105dc4e6 100644
--- a/nezha-fronted/src/components/common/deleteButton.vue
+++ b/nezha-fronted/src/components/common/deleteButton.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="delete-button">
+    <div :class="['delete-button',(deleteObjs.length<1?'':'delete-button-light')]">
       <el-button class="nz-btn nz-btn-size-normal nz-btn-style-light" :class="{'nz-btn-disabled' : deleteObjs.length<1}" @click="batchDelete"><span><i class="nz-icon nz-icon-delete"></i></span></el-button>
     </div>
 </template>
@@ -52,11 +52,17 @@
 <style scoped>
   .delete-button{
     margin-left: 16px;
-  }
-  .delete-button .nz-icon-delete{
-    color: #ee6723;
+    opacity: 0.7;
+    border-radius: 2px;
   }
   .delete-button .nz-btn-disabled .nz-icon-delete{
-    color: #e5e5e5;
+    opacity: 0.5;
+    color: #D14A2B;
+  }
+  .delete-button-light.delete-button{
+    border-radius: 2px;
+  }
+  .delete-button-light .nz-icon-delete{
+    color:  #D14A2B;
   }
 </style>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 59a7d49fd..d9af02d79 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -119,7 +119,7 @@
             <span  >{{scope.row.idc.name}}</span>
           </div>
           <template v-if="item.prop=='cabinet'">
-            <span v-if="scope.row.cabinet && scope.row.cabinet != '--'">{{returnData(scope.row.cabinet).name}}</span>
+            <span v-if="scope.row.cabinet && scope.row.cabinet != '--'">{{returnData(scope.row.cabinet).name}}{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
             <span v-else >{{returnData(scope.row.cabinet)}}</span>
           </template>
           <div v-if="item.prop=='model'">
@@ -582,6 +582,12 @@
           return "--";
         }
       },
+      returnCabinet(start,end){//返回机柜u位信息
+       if(!start|| !end){
+         return ''
+       }
+        return `[${start} - ${end}]`
+      },
       closeAllPop() {
         this.$refs.idcConfigBox.forEach((item) => {
           item.show(false);