Merge remote-tracking branch 'origin/master'

 <template>
 <template>
-	<div class="tree_item_box" :class="list.length>10 ? 'ofy_scroll':''" :style="{maxHeight:(list.length > 10 ? treeXzqHeight:'unset')+'px'}">
+	<div class="tree_item_box" >
 		<div
 		<div
 			class="column-start-start linkLine_default"
 			class="column-start-start linkLine_default"
 			v-for="(item, s_index) in list"
 			v-for="(item, s_index) in list"
@@ -97,9 +97,7 @@ export default {
 		}
 		}
 	},
 	},
 	mounted(){
 	mounted(){
-		this.$nextTick(()=>{
-			this.treeXzqHeight = this.$parent.$el.clientHeight-(this.formatData.length-1)*26+60;
-		})
+		
 	},
 	},
 	methods: {
 	methods: {
 		itemClick(item) {
 		itemClick(item) {
@@ -231,10 +229,10 @@ export default {
 	width: 100%;
 	width: 100%;
 	cursor: pointer;
 	cursor: pointer;
 }
 }
-.ofy_scroll{
-	overflow-y: scroll;
-	overflow-x: hidden;
-}
+// .ofy_scroll{
+// 	overflow-y: scroll;
+// 	overflow-x: hidden;
+// }
 .basic_layer {
 .basic_layer {
 	width: 100%;
 	width: 100%;
 	position: relative;
 	position: relative;

@@ -299,8 +299,10 @@ export default {
 		},
 		},
 		//右键菜单的删除
 		//右键菜单的删除
 		deleteByBsm(){
 		deleteByBsm(){
-			console.log(this.zdData.zdbsm);
-			let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}
+			let params={"bsm":this.zdData.bsm,"type":this.zdData.type};
+			if(this.zdData.type=='zd'){
+				params={"bsm":this.zdData.zdbsm,"type":this.zdData.type};
+			}
 			deleteZdInfoByBsm(params)
 			deleteZdInfoByBsm(params)
 				.then((res) => {
 				.then((res) => {
 					if(res.code=200){
 					if(res.code=200){
@@ -326,6 +328,8 @@ export default {
 .content {
 .content {
 	height: 100%;
 	height: 100%;
 	width: 100%;
 	width: 100%;
+	overflow-y: scroll;
+	overflow-x: hidden;
 }
 }
 .column-start-center {
 .column-start-center {
 	display: flex;
 	display: flex;

@@ -14,7 +14,7 @@
 					<LineTree :pd="pd" @itemClick="itemClick"></LineTree>
 					<LineTree :pd="pd" @itemClick="itemClick"></LineTree>
 				</div>
 				</div>
 			</el-aside>
 			</el-aside>
-			<el-container>
+			<el-container class="calcWidth">
 				<el-header>
 				<el-header>
 					<div class="header-top">
 					<div class="header-top">
 						<div class="top-items" @click="toggleClick">
 						<div class="top-items" @click="toggleClick">
@@ -328,6 +328,9 @@ export default {
 .home-box {
 .home-box {
 	width: 100%;
 	width: 100%;
 	height: 100vh;
 	height: 100vh;
+	.calcWidth{
+		width: calc(100% - 300px);
+	}
 	.el-container {
 	.el-container {
 		height: 100%;
 		height: 100%;
 	}
 	}

@@ -69,7 +69,7 @@
                     type: [],
                     type: [],
                 },
                 },
                 tableData: [],
                 tableData: [],
-                tableHeight: "",
+                tableHeight: 0,
             };
             };
         },
         },
         created() {
         created() {
@@ -79,9 +79,9 @@
                 pageNo: this.pageNo,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
                 pageSize: this.pageSize,
             })
             })
-            this.$nextTick(()=>{
-                this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
-            })
+            this.$nextTick(() => {
+			    this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
+		    });
         },
         },
         methods: {
         methods: {
             handleCurrentChange(val) {
             handleCurrentChange(val) {
@@ -150,7 +150,7 @@
         padding: 0 18px;
         padding: 0 18px;
         display: flex;
         display: flex;
         flex-direction: column;
         flex-direction: column;
-        background-color: #fcfdff;
+        background-color: #EAEDF5;
         .demo-form-inline {
         .demo-form-inline {
             margin-top: 18px;
             margin-top: 18px;
             .moreSearchBtn {
             .moreSearchBtn {

@@ -71,16 +71,16 @@
                 },
                 },
                 queryData: {},
                 queryData: {},
                 tableData: [],
                 tableData: [],
-                tableHeight: "",
+                tableHeight: 0,
             };
             };
         },
         },
         created() {
         created() {
         },
         },
         mounted() {
         mounted() {
             this.getData({})
             this.getData({})
-            this.$nextTick(()=>{
-                this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
-            })
+            this.$nextTick(() => {
+			    this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
+		    });
         },
         },
         methods: {
         methods: {
             handleCurrentChange(val) {
             handleCurrentChange(val) {
@@ -168,7 +168,7 @@
         padding: 0 18px;
         padding: 0 18px;
         display: flex;
         display: flex;
         flex-direction: column;
         flex-direction: column;
-        background-color: #fcfdff;
+        background-color: #EAEDF5;
         .demo-form-inline {
         .demo-form-inline {
             margin-top: 18px;
             margin-top: 18px;
             .moreSearchBtn {
             .moreSearchBtn {
@@ -182,7 +182,6 @@
         }
         }
         .dataGrid {
         .dataGrid {
             flex: 1;
             flex: 1;
-            margin-top: 20px;
             .pagination {
             .pagination {
                 padding: 18px 0;
                 padding: 18px 0;
             }
             }

@@ -414,10 +414,11 @@ export default {
 		};
 		};
 	},
 	},
 	created() {			 
 	created() {			 
-	    let bsm=this.$store.state.zdbsm;
-		this.getZdjbxxData(bsm);
+		
+	},
+	mounted() {
+		this.getZdjbxxData(this.$store.state.zdbsm);
 	},
 	},
-	mounted() {},
 	methods: {
 	methods: {
 		//根据zdbsm查询基本信息
 		//根据zdbsm查询基本信息
 		getZdjbxxData(bsm) {
 		getZdjbxxData(bsm) {