From 754f5e17d86a755cd2ca333278995442618f4cb1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 30 Oct 2020 15:35:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9remark=20?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=EF=BC=9B=20style=EF=BC=9A=E4=BF=AE=E6=94=B9a?=
 =?UTF-8?q?sset=20=E6=9C=BA=E6=9F=9C=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertMessageTable.vue      | 7 +++++--
 nezha-fronted/src/components/page/asset/asset.vue          | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 2b595bc18..a8074582b 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -183,10 +183,10 @@
     </div>
     <!--删除弹窗-->
     <div class="export-xlsx">
-      <el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px" @close="closeDialog" class="nz-message">
+      <el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px"  @close="closeDialog" class="nz-message">
         <div class="upload-body">
           <el-form ref="remarkForm" :model="deleteBox">
-            <el-form-item :rules="[{required: true, message: this.$t('validate.required'), trigger: 'blur'}]" prop="remark">
+            <el-form-item prop="remark">
               <el-input type="textarea" :placeholder="$t('alert.description')" v-model="deleteBox.remark"></el-input>
             </el-form-item>
           </el-form>
@@ -984,4 +984,7 @@
     padding: 2px 5px;
     border-radius: 4px;
   }
+  /deep/ .nz-message .el-textarea textarea{
+    height: 108px !important;
+  }
 </style>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index ef824b656..7fc35efd1 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}}{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
+            <span v-if="scope.row.cabinet && scope.row.cabinet != '--'">{{returnData(scope.row.cabinet).name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
             <span v-else >{{returnData(scope.row.cabinet)}}</span>
           </template>
           <div v-if="item.prop=='model'">
@@ -585,7 +585,7 @@
        if(!start|| !end){
          return ''
        }
-        return `[${start} - ${end}]`
+        return `[${start}-${end}]`
       },
       closeAllPop() {
         this.$refs.idcConfigBox.forEach((item) => {