Merge remote-tracking branch 'origin/master'
Showing
4 changed files
with
5 additions
and
19 deletions
1 | <template > | 1 | <template > |
2 | <div class="lshs-content"> | 2 | <div class="main"> |
3 | <div id="mountNode" ref="containerWidth"> | 3 | <div id="mountNode" ref="containerWidth"> |
4 | <div v-show="showhide" style="margin: 20px 0 0 20px;color:red;">暂无变更业务,没有历史回溯数据</div> | 4 | <div v-show="showhide" style="margin: 20px 0 0 20px;color:red;">暂无变更业务,没有历史回溯数据</div> |
5 | 5 | ||
... | @@ -359,16 +359,9 @@ export default { | ... | @@ -359,16 +359,9 @@ export default { |
359 | </script> | 359 | </script> |
360 | <style scoped lang="less"> | 360 | <style scoped lang="less"> |
361 | 361 | ||
362 | .lshs-content{ | ||
363 | width: 100%; | ||
364 | height: 100%; | ||
365 | } | ||
366 | |||
367 | #mountNode{ | 362 | #mountNode{ |
368 | /*height: calc(100% - 68px);*/ | ||
369 | margin: 20px 0 0 20px; | ||
370 | width: 50%; | 363 | width: 50%; |
371 | height: 80%; | 364 | height: calc(100% - 140px); |
372 | border: 1px solid #E6E6E6; | 365 | border: 1px solid #E6E6E6; |
373 | background: white; | 366 | background: white; |
374 | 367 | ||
... | @@ -378,10 +371,9 @@ export default { | ... | @@ -378,10 +371,9 @@ export default { |
378 | } | 371 | } |
379 | 372 | ||
380 | #mountNodeRight{ | 373 | #mountNodeRight{ |
381 | margin: 20px 20px 0 0; | ||
382 | width: 36%; | 374 | width: 36%; |
383 | float: right; | 375 | float: right; |
384 | height: 80%; | 376 | height: calc(100% - 22px); |
385 | border: 1px solid #E6E6E6; | 377 | border: 1px solid #E6E6E6; |
386 | background: white; | 378 | background: white; |
387 | padding: 20px 20px 0 20px; | 379 | padding: 20px 20px 0 20px; | ... | ... |
-
Please register or sign in to post a comment