Merge remote-tracking branch 'origin/master'

@@ -3,7 +3,6 @@
     padding-top: 0;
     padding-top: 0;
     box-sizing: border-box;
     box-sizing: border-box;
     width: 100%;
     width: 100%;
-    height: 100%;
 }
 }
 .el-table .success-row {
 .el-table .success-row {
     background:@tablebg;
     background:@tablebg;

@@ -18,7 +18,7 @@
                 <el-button  class="radioBtn" label="7" border>批量单元号</el-button>
                 <el-button  class="radioBtn" label="7" border>批量单元号</el-button>
           </div>
           </div>
       </div>
       </div>
-      <div class="tab-content">
+      <div class="tab-content" :style="{'height':lpbContentHight+'px'}">
           <div class="lp-tree" :class="createFlag ? 'w260':'w0'">
           <div class="lp-tree" :class="createFlag ? 'w260':'w0'">
             <LineTree :pd="pd" class="treeData" :islpb = "islpb" ></LineTree>
             <LineTree :pd="pd" class="treeData" :islpb = "islpb" ></LineTree>
             <p @click="createFlag = false" style="width:20px;float:left;cursor:pointer;">X</p> 
             <p @click="createFlag = false" style="width:20px;float:left;cursor:pointer;">X</p> 
@@ -29,8 +29,8 @@
           <div class="lp-legend">
           <div class="lp-legend">
               <div class="handleCol">
               <div class="handleCol">
                 <div class="btn" @click="legendToggle">
                 <div class="btn" @click="legendToggle">
-                    <i class="el-icon-d-arrow-left"></i>
-                    <!-- <i class="el-icon-d-arrow-right"></i> -->
+                    <i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i>
+                    <i v-show="legendToggleFlag" class="el-icon-d-arrow-right"></i>
                 </div>
                 </div>
                 <div class="dyzt">
                 <div class="dyzt">
                     <span>单元状态</span>
                     <span>单元状态</span>
@@ -165,14 +165,22 @@ export default {
                 mj:'285'
                 mj:'285'
             },
             },
         ],
         ],
-        legendToggleFlag:false
+        legendToggleFlag:false,
+        lpbContentHight:''
     }
     }
   },
   },
-  created(){},
+  created(){
+      window.addEventListener('resize', this.getHeight);
+      this.getHeight()
+  },
   mounted(){
   mounted(){
       this.getLpbMenuTree('d1b82b27f2a6ab7bf3f0e7708c96e46f')
       this.getLpbMenuTree('d1b82b27f2a6ab7bf3f0e7708c96e46f')
   },
   },
   methods:{
   methods:{
+      //获取高度计算lpb内容区高度
+      getHeight(){
+          this.lpbContentHight = window.innerHeight - 340
+      },
       //创建楼盘
       //创建楼盘
       create(){
       create(){
         this.createFlag = true
         this.createFlag = true
@@ -236,6 +244,9 @@ export default {
       }
       }
   },
   },
   computed: {},
   computed: {},
+  destroyed(){
+    window.removeEventListener('resize', this.getHeight)
+  },
   watch: {
   watch: {
   },
   },
 }
 }
@@ -269,9 +280,9 @@ export default {
         }
         }
     }
     }
     .tab-content{
     .tab-content{
-        height: calc(100% - 161px);
         background-color: #ffffff;
         background-color: #ffffff;
         display: flex;
         display: flex;
+        overflow-y: scroll;
         .lp-tree{
         .lp-tree{
             height: 100%;
             height: 100%;
             overflow: hidden;
             overflow: hidden;

@@ -2,25 +2,25 @@
   <div class="lpb">
   <div class="lpb">
      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane label="编辑楼盘" name="edit">
       <el-tab-pane label="编辑楼盘" name="edit">
-        <edit></edit>
+        <bjlp></bjlp>
       </el-tab-pane>
       </el-tab-pane>
       <el-tab-pane label="预览楼盘" name="preview">
       <el-tab-pane label="预览楼盘" name="preview">
-        <preview></preview>
+        <yllp></yllp>
       </el-tab-pane>
       </el-tab-pane>
       <el-tab-pane label="详细信息" name="detail">
       <el-tab-pane label="详细信息" name="detail">
-        <detail></detail>
+        <xxxx></xxxx>
       </el-tab-pane>
       </el-tab-pane>
     </el-tabs>
     </el-tabs>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-import edit from "./edit"
-import preview from "./preview"
-import detail from "./detail"
+import bjlp from "./bjlp"
+import yllp from "./yllp"
+import xxxx from "./xxxx"
 export default {
 export default {
   name:"",
   name:"",
-  components:{edit,preview,detail},
+  components:{bjlp,yllp,xxxx},
   props:{},
   props:{},
   data() {
   data() {
       return {
       return {