Merge remote-tracking branch 'origin/dev-sensitive-20191111' into dev-sensitive-20191111

src/views/sensitive-control/data-view-message.vue

@@ -8,7 +8,6 @@
       <template v-if="tableDataList && tableDataList.outModels && tableDataList.outModels.length > 0">
         <el-table
           :data="tableDataList.outModels"
-          height="100%"
           border
           style="width: 100%">
           <template
@@ -153,7 +152,6 @@
     },
     mounted() {
       
-      
     },
     data() {
       return {
@@ -463,7 +461,7 @@
   .data-view-message-wrap {
     width: 100%;
     height: 100%;
-    overflow: hidden; 
+    overflow: scroll; 
     
     .no-table-data{
       width: 100%;
@@ -498,7 +496,7 @@
           float: left;
         }
         img{
-          float: left;
+          float: left; cursor: pointer;
           display: block; border: none;
           width: 100px; height: 32px; margin-left: 10px;
           background: #fff;
@@ -511,7 +509,7 @@
           float: left;
         }
         .button{
-          float: left;
+          float: left; cursor: default;
           width: 100px; height: 32px; margin-left: 10px;
           font-size: 13px;
           text-align: center; line-height: 32px;
@@ -569,6 +567,10 @@
         }
       }
     }
+    .pagination-style{
+      margin: 30px 0;
+      float: right;
+    }
   }
 
 </style>
\ No newline at end of file