Merge remote-tracking branch 'origin/master'

@@ -98,7 +98,7 @@ ol, ul { list-style:none; }
 .tabs{
     >.el-tabs__content{
         position: unset;
-        margin-top: 50px;
+        margin-top: 40px;
     }
     >.is-top{
         position: -webkit-fixed;

@@ -343,8 +343,8 @@ export default {
 		this.$nextTick(() => {
 			this.tableHeight =
 				(document.documentElement.clientHeight ||
-					document.body.clientHeight) - 396;
-          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208;
+					document.body.clientHeight) - 352;
+          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220;
 			this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
 		});
 	},

@@ -312,8 +312,8 @@ export default {
 		this.$nextTick(() => {
 			this.tableHeight =
 				(document.documentElement.clientHeight || document.body.clientHeight) -
-				392;
-          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208;
+				352;
+          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222;
 			this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
 		});
 	},

@@ -731,7 +731,7 @@
                 }
             }
             .zxx {
-                width: calc(60% - 40px);
+                width: calc(60% - 24px);
                 margin-left: 20px;
                 display: flex;
                 flex-direction: column;