diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index b6c2bb5..ae563dd 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <el-card class="box-card" style="margin-top: 15px;">
+  <div ref="card">
+    <el-card class="box-card" style="">
       <div slot="header" class="clearfix">
         <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
@@ -9,7 +9,7 @@
       </div>
       <div v-loading="loading">
         <div v-for="(item,index) in list" :key="index" class="text-item">
-          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+          <span class="index">{{ index+1 }}</span><span class="content">{{ item[column] }}</span>
         </div>
       </div>
       <div v-if="list.length==0">
@@ -33,9 +33,9 @@
         return []
       }
     },
-    total:{
-      type:Number,
-      default:0
+    total: {
+      type: Number,
+      default: 0
     },
     emptyText: {
       type: String,
@@ -50,6 +50,10 @@
       default: 'title'
     }
   },
+  mounted() {
+    var rightHeight = document.getElementById('mainbody').offsetHeight
+    this.$refs.card.style.height = (rightHeight / 2 - 60) + 'px'
+  },
   methods: {
     goDetail() {
       this.$emit('detail')
@@ -61,6 +65,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .box-card{
     font-size: 14px;
+    margin-top: 15px;
+    height:100%;
     .card-title{
       padding-right:10px;
     }
@@ -77,5 +83,16 @@
     .text-item .index{
      margin-right: 20px
     }
+    .text-item .content{
+      display:inline-block;             /*内联对象需加*/
+      width: calc( 100% - 35px);
+      height: 16px;
+      line-height: 16px;
+      vertical-align: middle;
+      word-break:keep-all;       /* 不换行 */
+      white-space:nowrap;        /* 不换行 */
+      overflow:hidden;           /* 内容超出宽度时隐藏超出部分的内容 */
+      text-overflow:ellipsis;    /*溢出时显示省略标记...；需与overflow:hidden;一起使用*/
+    }
   }
 </style>

diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index b6c2bb5..ae563dd 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <el-card class="box-card" style="margin-top: 15px;">
+  <div ref="card">
+    <el-card class="box-card" style="">
       <div slot="header" class="clearfix">
         <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
@@ -9,7 +9,7 @@
       </div>
       <div v-loading="loading">
         <div v-for="(item,index) in list" :key="index" class="text-item">
-          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+          <span class="index">{{ index+1 }}</span><span class="content">{{ item[column] }}</span>
         </div>
       </div>
       <div v-if="list.length==0">
@@ -33,9 +33,9 @@
         return []
       }
     },
-    total:{
-      type:Number,
-      default:0
+    total: {
+      type: Number,
+      default: 0
     },
     emptyText: {
       type: String,
@@ -50,6 +50,10 @@
       default: 'title'
     }
   },
+  mounted() {
+    var rightHeight = document.getElementById('mainbody').offsetHeight
+    this.$refs.card.style.height = (rightHeight / 2 - 60) + 'px'
+  },
   methods: {
     goDetail() {
       this.$emit('detail')
@@ -61,6 +65,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .box-card{
     font-size: 14px;
+    margin-top: 15px;
+    height:100%;
     .card-title{
       padding-right:10px;
     }
@@ -77,5 +83,16 @@
     .text-item .index{
      margin-right: 20px
     }
+    .text-item .content{
+      display:inline-block;             /*内联对象需加*/
+      width: calc( 100% - 35px);
+      height: 16px;
+      line-height: 16px;
+      vertical-align: middle;
+      word-break:keep-all;       /* 不换行 */
+      white-space:nowrap;        /* 不换行 */
+      overflow:hidden;           /* 内容超出宽度时隐藏超出部分的内容 */
+      text-overflow:ellipsis;    /*溢出时显示省略标记...；需与overflow:hidden;一起使用*/
+    }
   }
 </style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 998ef1a..1920a93 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -92,6 +92,7 @@
 .dashboard {
   &-container {
     margin: 30px;
+    margin-top:10px;
   }
   &-text {
     font-size: 30px;