Merge remote-tracking branch 'origin/master'

@@ -103,7 +103,7 @@ ol, ul { list-style:none; }
     >.is-top{
         position: -webkit-fixed;
         position: fixed;
-        top: 60px;
+        top: 72px;
         z-index: 999;
         width: 100%;
         margin-bottom: 0;

@@ -69,7 +69,7 @@
 					<li @click="exportToShp">ESRI Shape</li>
 				</ul>
 			</li>
-			<li v-show="isZD" @click="drsx">导入属性</li>
+			<li  @click="drsx">导入属性</li>
 			<li v-show="!isZD">导入楼盘</li>
 			<li>重叠分析</li>
 			<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li>

@@ -69,7 +69,7 @@
 			<el-row>
 				<el-col :span="24">
 					<el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px">
-						<el-form-item class="demo-form-inline" label="查询范围">
+						<el-form-item class="demo-form-inline" label="单元范围">
 							<el-checkbox-group v-model="queryData.dylxs" @change="query">
 								<el-checkbox label="zd" name="type">宗地</el-checkbox>
 								<el-checkbox label="dz" name="type">多幢</el-checkbox>

@@ -8,7 +8,7 @@
             <div class="main-button">
                 <el-upload
                         class="upload-demo"
-                        :action="uploadUrl"
+                        action="/api/tx/excelGeo/import"
                         :data="sxdrData"
                         :on-success="uploadSuccess"
                         :show-file-list="false"
@@ -47,7 +47,6 @@
         },
         data() {
             return {
-                uploadUrl: '',
                 isVisible: false,
                 sxdrData: {
                     bsm: '',
@@ -65,7 +64,6 @@
             },
             reset() {
                 this.errorData = [];
-                this.uploadUrl = '';
                 this.sxdrData = {bsm: ''};
             },
             close() {
@@ -97,13 +95,6 @@
             },
             dylx(val) {
                 this.sxdrData.type=val;
-                switch (val) {
-                    case "zd":
-                        this.uploadUrl = "/api/tx/excelGeo/import";
-                        break;
-                    default:
-                        break;
-                }
             },
             bsm(val) {
                 this.sxdrData.bsm = val;

@@ -26,6 +26,7 @@
 							v-for="(item, index) in headTop"
 							:key="index + '1'"
 							:class="{ 'is-active': item.select }"
+							:style="{'height':item.name == '首页' && item.select ? '70'+'px' : '71'+'px'}"
 							@click="selectTopItems(index)"
 						>
 							<i :class="item.icon"></i>
@@ -335,6 +336,7 @@ export default {
 			}
 		},
 		selectTopItems(ind) {
+			console.log(this.headTop);
 			if (ind == 1) {
 				//点击新建，弹框
 				this.dialogVisible = true;
@@ -430,19 +432,22 @@ export default {
 	.el-header {
 		background-color: #fff;
 		padding: 0 !important;
+		height: 72px!important;
 		.header-top {
-			height: 60px;
+			height: 72px;
 			border-bottom: 1px solid#EAEAEA;
 			box-sizing: border-box;
 			.top-items {
 				cursor: pointer;
-				height: 60px;
+				height: 72px;
 				padding: 0 30px;
 				font-size: 18px;
-				line-height: 60px;
+				line-height: 72px;
 				float: left;
 				position: relative;
 				color: #4a4a4a;
+				// border-left: 1px solid #EAEAEA;
+    			border-right: 1px solid #EAEAEA;
 				i {
 					margin-right: 6px;
 					font-size: 18px;
@@ -451,15 +456,13 @@ export default {
 				}
 				.hamburger {
 					font-size: 16px;
-					line-height: 60px;
+					line-height: 72px;
 					color: #000;
 				}
 			}
 			.top-items.is-active {
 				color: #006cff;
-				border-left: 1px solid #EAEAEA;
-    			border-right: 1px solid #EAEAEA;
-				height: 58px;
+				height: 71px;
 				border-bottom: 1px solid #FFF;
 			}
 		}

@@ -2,9 +2,9 @@
     <el-tabs v-model="activeName" class="tabs">
         <el-tab-pane label="添加" name="tj">
             <div class="main">
-                <p class="tips">查询条件</p>
+                <!-- <p class="tips">查询条件</p> -->
                 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-                <p class="tips">查询列表</p>
+                <!-- <p class="tips">查询列表</p> -->
                 <div class="dataGrid" ref="dataGrid">
                     <el-table
                             :data="tableData"

 <template>
 	<div class="main">
 		<template v-if="isCxlz">
-			<p class="tips">查询条件</p>
+			<!-- <p class="tips">查询条件</p> -->
 			<div class="search">
 				<el-row>
 					<el-col :span="24" style="margin-left: -10px;">
@@ -49,7 +49,7 @@
 					</el-col>
 				</el-row>
 			</div>
-			<p class="tips">查询列表</p>
+			<!-- <p class="tips">查询列表</p> -->
 			<el-table :data="Data" :height="tableHeight">
 				<td class="xh">序号</td>
 				<td class="cz">操作</td>
@@ -525,7 +525,10 @@ export default {
 		//改变syclx，更新楼盘表数据
 		scyclx(n){
 			this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
-		}
+		},
+		selectedZt(n){
+			this.legendToggleFlag = true;
+		},
 	},
 };
 </script>
@@ -677,10 +680,7 @@ table:hover {
 			color: #fff;
 			border-bottom: 1px solid #e6e6e6;
 			}
-			.dyzt {
-			height: 81px;
-			line-height: 81px;
-			}
+			.dyzt,
 			.fwxz,
 			.fwyt {
 			height: 122px;

 <template>
 	<div class="main">
 		<template v-if="isFwsxbg">
-			<p class="tips">查询条件</p>
+			<!-- <p class="tips">查询条件</p> -->
 			<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-			<p class="tips">查询列表</p>
+			<!-- <p class="tips">查询列表</p> -->
 			<div class="dataGrid" ref="dataGrid">
 				<el-table
 					:data="tableData"
@@ -561,7 +561,10 @@ export default {
 		//改变syclx，更新楼盘表数据
 		scyclx(n){
 			this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
-		}
+		},
+		selectedZt(n){
+			this.legendToggleFlag = true;
+		},
 	},
 };
 </script>
@@ -630,10 +633,7 @@ export default {
               color: #fff;
               border-bottom: 1px solid #e6e6e6;
             }
-            .dyzt {
-              height: 81px;
-              line-height: 81px;
-            }
+            .dyzt,
             .fwxz,
             .fwyt {
               height: 122px;

@@ -508,7 +508,10 @@ export default {
     //改变syclx，更新楼盘表数据
     scyclx(n){
 		  this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
-    }
+    },
+		selectedZt(n){
+			this.legendToggleFlag = true;
+		},
   },
 }
 </script>
@@ -561,10 +564,7 @@ export default {
               color: #fff;
               border-bottom: 1px solid #e6e6e6;
             }
-            .dyzt {
-              height: 81px;
-              line-height: 81px;
-            }
+            .dyzt,
             .fwxz,
             .fwyt {
               height: 122px;

@@ -2,9 +2,9 @@
     <el-tabs v-model="activeName" class="tabs">
         <el-tab-pane label="更正" name="gz">
             <div class="main">
-                <p class="tips">查询条件</p>
+                <!-- <p class="tips">查询条件</p> -->
                 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-                <p class="tips">查询列表</p>
+                <!-- <p class="tips">查询列表</p> -->
                 <div class="dataGrid" ref="dataGrid">
                     <el-table
                             :data="tableData"

@@ -2,9 +2,9 @@
     <el-tabs v-model="activeName" class="tabs">
         <el-tab-pane label="综合查询" name="zhcx">
             <div class="main">
-                <p class="tips">查询条件</p>
+                <!-- <p class="tips">查询条件</p> -->
                 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-                <p class="tips">查询列表</p>
+                <!-- <p class="tips">查询列表</p> -->
                 <div class="dataGrid" ref="dataGrid">
                     <el-table
                             :data="tableData"

@@ -853,10 +853,7 @@ export default {
 					color: #fff;
 					border-bottom: 1px solid #e6e6e6;
 				}
-				.dyzt {
-					height: 81px;
-					line-height: 81px;
-				}
+				.dyzt,
 				.fwxz,
 				.fwyt {
 					height: 122px;