b21cc9f7 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents f1dea70f f2df13f0
<template >
<div class="lshs-content">
<div class="main">
<div id="mountNode" ref="containerWidth">
<div v-show="showhide" style="margin: 20px 0 0 20px;color:red;">暂无变更业务,没有历史回溯数据</div>
......@@ -359,16 +359,9 @@ export default {
</script>
<style scoped lang="less">
.lshs-content{
width: 100%;
height: 100%;
}
#mountNode{
/*height: calc(100% - 68px);*/
margin: 20px 0 0 20px;
width: 50%;
height: 80%;
height: calc(100% - 140px);
border: 1px solid #E6E6E6;
background: white;
......@@ -378,10 +371,9 @@ export default {
}
#mountNodeRight{
margin: 20px 20px 0 0;
width: 36%;
float: right;
height: 80%;
height: calc(100% - 22px);
border: 1px solid #E6E6E6;
background: white;
padding: 20px 20px 0 20px;
......
<template>
<div class="lshs-content">
<Lshs :type="type" :bsm="bsm"></Lshs>
</div>
<Lshs :type="type" :bsm="bsm"></Lshs>
</template>
<script>
......
<template>
<div class="lshs-content">
<Lshs :type="type" :bsm="bsm"></Lshs>
</div>
<Lshs :type="type" :bsm="bsm"></Lshs>
</template>
<script>
......
<template>
<div class="">
<Lshs :type="type" :bsm="bsm"></Lshs>
</div>
</template>
<script>
......