Merge remote-tracking branch 'origin/master'

@@ -40,6 +40,9 @@ table{
 table,td,tr,.el-col,.title{
 table,td,tr,.el-col,.title{
     border-color: #E6E6E6 !important;
     border-color: #E6E6E6 !important;
 }
 }
+.el-table th{
+    background-color: #FBFBFB;
+}
 .formInput {
 .formInput {
     height: 100%;
     height: 100%;
     width: 100%;
     width: 100%;

@@ -300,26 +300,46 @@ export default {
 		},
 		},
 		//右键菜单的删除
 		//右键菜单的删除
 		deleteByBsm(){
 		deleteByBsm(){
-			let params={"bsm":this.zdData.bsm,"type":this.zdData.type};
-			if(this.zdData.type=='zd'){
-				params={"bsm":this.zdData.zdbsm,"type":this.zdData.type};
+			let name='';
+			switch (this.zdData.type) {
+				case 'zd':
+					name = '宗地'
+					break;
+				case 'dz':
+					name = '多幢'
+					break;
+				case 'zrz':
+					name = '自然幢'
+					break;
+			
+				default:
+					break;
 			}
 			}
-			deleteZdInfoByBsm(params)
-				.then((res) => {
-					if(res.code=200){
-						this.$message({
-							message: res.message,
-							type: "success",
-						});
-					} else {
-						this.$message({
-							message: res.message,
-							type: "warning",
-						});
-					}
-				})
-				.catch((error) => {});
+			 this.$confirm('是否确定删除该'+name+'?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let params={"bsm":this.zdData.bsm,"type":this.zdData.type};
+				deleteZdInfoByBsm(params)
+					.then((res) => {
+						if(res.code=200){
+							this.$message({
+								type: 'success',
+								message: '删除成功!'
+							});
+							this.$router.push("/panel");
+						} else {
+							this.$message({
+								message: res.message,
+								type: "warning",
+							});
+						}
+					})
+					.catch((error) => {});
+			}).catch(() => {
 
 
+			});
 		},
 		},
 	},
 	},
 };
 };
@@ -352,12 +372,6 @@ export default {
 	text-overflow: ellipsis;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	white-space: nowrap;
 }
 }
-// .active_color {
-// 	color: #ffffff;
-// }
-.reTree_box {
-	// overflow-y: auto;
-}
 .reTree_icon {
 .reTree_icon {
 	width: 17px;
 	width: 17px;
 	height: 17px;
 	height: 17px;
@@ -369,7 +383,6 @@ export default {
 	position: relative;
 	position: relative;
 	color: #ffffff;
 	color: #ffffff;
 	cursor: pointer;
 	cursor: pointer;
-	moz-user-select: -moz-none;
 	-moz-user-select: none;
 	-moz-user-select: none;
 	-o-user-select: none;
 	-o-user-select: none;
 	-khtml-user-select: none;
 	-khtml-user-select: none;