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

@@ -767,7 +767,7 @@ export default {
 		}
 		}
 	}
 	}
 	.qlxzModule {
 	.qlxzModule {
-		width: calc(100% - 101px);
+		width: calc(100% - 102px);
 		height: auto;
 		height: auto;
 		position: relative;
 		position: relative;
 		border-bottom: 1px solid #E6E6E6;
 		border-bottom: 1px solid #E6E6E6;

@@ -47,7 +47,7 @@
 				@changeDzVisible="changeDzVisible"
 				@changeDzVisible="changeDzVisible"
 				@changeGzwVisible="changeGzwVisible"
 				@changeGzwVisible="changeGzwVisible"
 				:list="item.children"
 				:list="item.children"
-				:visible="visible"
+				:visible="zrzVisible"
 				:size="size"
 				:size="size"
 				:islpb="islpb"
 				:islpb="islpb"
 				:formatData="formatData"
 				:formatData="formatData"
@@ -55,7 +55,7 @@
 		</div>
 		</div>
 
 
 		<ul
 		<ul
-			v-show="visible"
+			v-show="zrzVisible"
 			:style="{ left: left + 'px', top: top + 'px' }"
 			:style="{ left: left + 'px', top: top + 'px' }"
 			class="contextmenu"
 			class="contextmenu"
 		>
 		>
@@ -169,6 +169,8 @@ export default {
 			currentClickZdGeo:"",
 			currentClickZdGeo:"",
 			improtDialog:false,
 			improtDialog:false,
 			dialogVisible:false,
 			dialogVisible:false,
+			//控制自然幢右键菜单
+			zrzVisible:false,
 			//控制楼盘表
 			//控制楼盘表
 			lpbvisible: false,
 			lpbvisible: false,
 			lpbtop: 0,
 			lpbtop: 0,
@@ -210,6 +212,13 @@ export default {
 				document.body.removeEventListener("click", this.closeMenu);
 				document.body.removeEventListener("click", this.closeMenu);
 			}
 			}
 		},
 		},
+		zrzVisible(value) {
+			if (value) {
+				document.body.addEventListener("click", this.closeMenu);
+			} else {
+				document.body.removeEventListener("click", this.closeMenu);
+			}
+		},
 
 
 		// createVisible(value) {
 		// createVisible(value) {
 		// 	if (value) {
 		// 	if (value) {
@@ -270,7 +279,10 @@ export default {
 		},
 		},
 		// 改变菜单数据
 		// 改变菜单数据
 		changeVisible(data) {
 		changeVisible(data) {
-			this.visible = data;
+			this.zrzVisible = data;
+			this.lpbvisible = false;
+			this.dzVisible = false;
+			this.gzwVisible = false;
 		},
 		},
 		changeZdData(data) {
 		changeZdData(data) {
 			this.zdData = data;
 			this.zdData = data;
@@ -289,6 +301,9 @@ export default {
 		},
 		},
 		changeLpbVisible(data) {
 		changeLpbVisible(data) {
 			this.lpbvisible = data;
 			this.lpbvisible = data;
+			this.zrzVisible = false;
+			this.dzVisible = false;
+			this.gzwVisible = false;
 		},
 		},
 		changeCreateVisible(data){
 		changeCreateVisible(data){
 			this.createVisible = true;
 			this.createVisible = true;
@@ -296,10 +311,16 @@ export default {
 		//多幢
 		//多幢
 		changeDzVisible(data){
 		changeDzVisible(data){
 			this.dzVisible =  data;
 			this.dzVisible =  data;
+			this.zrzVisible = false;
+			this.lpbvisible = false;
+			this.gzwVisible = false;
 		},
 		},
 		//构筑物
 		//构筑物
 		changeGzwVisible(data){
 		changeGzwVisible(data){
 			this.gzwVisible = data;
 			this.gzwVisible = data;
+			this.zrzVisible = false;
+			this.lpbvisible = false;
+			this.dzVisible = false;
 		},
 		},
 		//添加定着物
 		//添加定着物
 		openCreateDialog(type){
 		openCreateDialog(type){
@@ -397,6 +418,7 @@ export default {
 		},
 		},
 		//关闭右键菜单
 		//关闭右键菜单
 		closeMenu(){
 		closeMenu(){
+			this.zrzVisible = false;
 			this.lpbvisible = false;
 			this.lpbvisible = false;
 			this.dzVisible = false;
 			this.dzVisible = false;
 			this.gzwVisible = false;
 			this.gzwVisible = false;

@@ -58,17 +58,17 @@
                 </div>
                 </div>
                 <div class="xlgz">
                 <div class="xlgz">
                         <span>
                         <span>
-                            样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
+                            样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
                             <br/>
                             <br/>
-                            样例2：11301室<span>（1单元13层01室）</span>([单元号][层号][室号后缀])
+                            样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀])
                             <br/>
                             <br/>
-                            样例3：101<span>(1层01室)</span>([层号])
+                            样例3：11<span>(1层01室)</span>([层号])
                             <br/>
                             <br/>
-                            样例4：1-101<span>(1单元-01层01室)</span>([单元号][层号][分隔符]，勾选“层号之前增加分隔符”)
+                            样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
                              <br/>
                              <br/>
-                            样例5：1-13-01<span>(1单元13层01室)</span>([单元号][层号][分隔符])
+                            样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
                             <br/>
                             <br/>
-                            样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”)
+                            样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”)
                         </span>
                         </span>
                 </div>
                 </div>
             </div>
             </div>

@@ -12,6 +12,7 @@
                                 action="/api/tx/excelGeo/import"
                                 action="/api/tx/excelGeo/import"
                                 :data="sxdrData"
                                 :data="sxdrData"
                                 :on-success="uploadSuccess"
                                 :on-success="uploadSuccess"
+                                :on-error="uploadError"
                                 :show-file-list="false"
                                 :show-file-list="false"
                                 multiple
                                 multiple
                         >
                         >
@@ -135,7 +136,7 @@
             top: 18px;
             top: 18px;
         }
         }
     }
     }
-    
+
 
 
     ul {
     ul {
         margin-top: 20px;
         margin-top: 20px;

@@ -343,5 +343,8 @@ export default {
 	.pagination {
 	.pagination {
 		padding: 18px;
 		padding: 18px;
 	}
 	}
+	.el-table{
+		border: 0!important;
+	}
 }
 }
 </style>
 </style>

@@ -534,7 +534,7 @@
             }
             }
             this.$nextTick(()=>{
             this.$nextTick(()=>{
 			    this.mainBoxWidth = this.$refs.mainBox.clientWidth;
 			    this.mainBoxWidth = this.$refs.mainBox.clientWidth;
-                this.formHeight =  (document.documentElement.clientHeight || document.body.clientHeight) - 300
+                this.formHeight =  (document.documentElement.clientHeight || document.body.clientHeight) - 230
             })
             })
         },
         },
         methods: {
         methods: {