Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

 // element 样式补丁
 // element 样式补丁
 .el-card {
 .el-card {
     &.is-always-shadow {
     &.is-always-shadow {
-      box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-    }
-    &.is-hover-shadow {
-      &:hover {
-        box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-      }
+      box-shadow: 0 2px 15px 1px rgba(49,132,245,0.10);
     }
     }
+    // &.is-hover-shadow {
+    //   &:hover {
+    //     box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+    //   }
+    // }
   }
   }
   
   
   .el-menu--horizontal {
   .el-menu--horizontal {
@@ -59,10 +59,10 @@
 
 
   //table样式
   //table样式
   .el-table .even-row {
   .el-table .even-row {
-    background: #f7f9fb;
+    background: #FAFCFF;
   }
   }
   .el-table th {
   .el-table th {
-    background-color: #f3f5fa;
+    background-color: #FAFCFF;
   }
   }
   //操作提示样式
   //操作提示样式
   .el-message{
   .el-message{

@@ -38,14 +38,14 @@ table{
     border-width: 0;
     border-width: 0;
 }
 }
 table,tr,.el-col,.title{
 table,tr,.el-col,.title{
-    border-color: #E6E6E6 !important;
+    border-color: #E4EBF4 !important;
 }
 }
 //表格加边框
 //表格加边框
 .el-table{
 .el-table{
     border: 1px solid #E6E6E6;
     border: 1px solid #E6E6E6;
 }
 }
 .el-table th{
 .el-table th{
-    background-color: #FBFBFB;
+    background-color: #FAFCFF;
 }
 }
 .formInput {
 .formInput {
     height: 100%;
     height: 100%;

@@ -65,8 +65,8 @@
 					v-if="item.children"
 					v-if="item.children"
 					class="reTree_icon"
 					class="reTree_icon"
 					:style="{
 					:style="{
-						height: 12 + 'px',
-						width: 12 + 'px',
+						height: 10 + 'px',
+						width: 10 + 'px',
 					}"
 					}"
 					:class="{
 					:class="{
 						reTree_default_icon: item.children.length === 0,
 						reTree_default_icon: item.children.length === 0,
@@ -84,8 +84,8 @@
 						reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z',
 						reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z',
 					}"
 					}"
 					:style="{
 					:style="{
-						height: 12 + 'px',
-						width: 12 + 'px',
+						height: 10 + 'px',
+						width: 10 + 'px',
 					}"
 					}"
 				></div>
 				></div>
 			</div>
 			</div>
@@ -314,7 +314,7 @@ export default {
 .reTree_icon {
 .reTree_icon {
 	width: 17px;
 	width: 17px;
 	height: 17px;
 	height: 17px;
-	margin-right: 10px;
+	margin-right: 16px;
 }
 }
 .no_icon {
 .no_icon {
 	width: 17px;
 	width: 17px;
@@ -352,7 +352,7 @@ export default {
 	width: 279px;
 	width: 279px;
 	height: 40px;
 	height: 40px;
     box-sizing: border-box;
     box-sizing: border-box;
-    padding-left: 24px;
+    padding-left: 20px;
 }
 }
 .second_layer {
 .second_layer {
 	position: relative;
 	position: relative;

@@ -20,8 +20,8 @@
 				<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconguoyou"></i> {{ item.mc }}</div><div
 				<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconguoyou"></i> {{ item.mc }}</div><div
 					class="reTree_icon"
 					class="reTree_icon"
 					:style="{
 					:style="{
-						height: 12 + 'px',
-						width: 12 + 'px',
+						height: 10 + 'px',
+						width: 10 + 'px',
 					}"
 					}"
 					:class="{
 					:class="{
 						reTree_default_icon: item.children.length === 0,
 						reTree_default_icon: item.children.length === 0,

 <template>
 <template>
     <div>
     <div>
-        <el-dialog v-dialogDrag :close-on-click-modal="false"
+        <el-dialog v-dialogDrag :modal="false"  :close-on-click-modal="false"
                 title="属性导入"
                 title="属性导入"
                 :visible.sync="isVisible"
                 :visible.sync="isVisible"
                 width="30%"
                 width="30%"