9f3b2485 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents d35fabe4 ddf93337
...@@ -98,7 +98,7 @@ ol, ul { list-style:none; } ...@@ -98,7 +98,7 @@ ol, ul { list-style:none; }
98 .tabs{ 98 .tabs{
99 >.el-tabs__content{ 99 >.el-tabs__content{
100 position: unset; 100 position: unset;
101 margin-top: 50px; 101 margin-top: 40px;
102 } 102 }
103 >.is-top{ 103 >.is-top{
104 position: -webkit-fixed; 104 position: -webkit-fixed;
......
...@@ -343,8 +343,8 @@ export default { ...@@ -343,8 +343,8 @@ export default {
343 this.$nextTick(() => { 343 this.$nextTick(() => {
344 this.tableHeight = 344 this.tableHeight =
345 (document.documentElement.clientHeight || 345 (document.documentElement.clientHeight ||
346 document.body.clientHeight) - 396; 346 document.body.clientHeight) - 352;
347 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208; 347 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220;
348 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; 348 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
349 }); 349 });
350 }, 350 },
......
...@@ -312,8 +312,8 @@ export default { ...@@ -312,8 +312,8 @@ export default {
312 this.$nextTick(() => { 312 this.$nextTick(() => {
313 this.tableHeight = 313 this.tableHeight =
314 (document.documentElement.clientHeight || document.body.clientHeight) - 314 (document.documentElement.clientHeight || document.body.clientHeight) -
315 392; 315 352;
316 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208; 316 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222;
317 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; 317 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
318 }); 318 });
319 }, 319 },
......
...@@ -731,7 +731,7 @@ ...@@ -731,7 +731,7 @@
731 } 731 }
732 } 732 }
733 .zxx { 733 .zxx {
734 width: calc(60% - 40px); 734 width: calc(60% - 24px);
735 margin-left: 20px; 735 margin-left: 20px;
736 display: flex; 736 display: flex;
737 flex-direction: column; 737 flex-direction: column;
......