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

@@ -316,7 +316,7 @@ export default {
 		padding: 0 !important;
 		padding: 0 !important;
 		.header-top {
 		.header-top {
 			height: 60px;
 			height: 60px;
-			border-bottom: 1px solid rgba(242, 242, 242, 1);
+			border-bottom: 1px solid#EAEAEA;
 			box-sizing: border-box;
 			box-sizing: border-box;
 			.top-items {
 			.top-items {
 				cursor: pointer;
 				cursor: pointer;
@@ -337,16 +337,20 @@ export default {
 				}
 				}
 			}
 			}
 			.top-items:not(:last-child)::after {
 			.top-items:not(:last-child)::after {
-				content: "";
-				width: 1px;
-				height: 14px;
-				background: #eaeaea;
-				position: absolute;
-				right: -1px;
-				top: 24px;
+				// content: "";
+				// width: 1px;
+				// height: 14px;
+				// background: #eaeaea;
+				// position: absolute;
+				// right: -1px;
+				// top: 24px;
 			}
 			}
 			.top-items.is-active {
 			.top-items.is-active {
 				color: #006cff;
 				color: #006cff;
+				border-left: 1px solid #EAEAEA;
+    			border-right: 1px solid #EAEAEA;
+				height: 59px;
+				border-bottom: 1px solid #FFF;
 			}
 			}
 		}
 		}
 		.header-bottom {
 		.header-bottom {

@@ -126,7 +126,7 @@
 						<input
 						<input
 							type="text"
 							type="text"
 							class="formInput percent78"
 							class="formInput percent78"
-							v-model="formData.dyhbsm"
+							v-model="formData.bdcdyh"
 						/>
 						/>
 						<el-button type="primary" class="createBtn">生成</el-button>
 						<el-button type="primary" class="createBtn">生成</el-button>
 					</td>
 					</td>
@@ -437,7 +437,7 @@ export default {
 				.then((res) => {
 				.then((res) => {
 					console.log(res);
 					console.log(res);
 					this.formData.zddm = res.result.substring(0, 19);
 					this.formData.zddm = res.result.substring(0, 19);
-					this.formData.dyhbsm = res.result;
+					this.formData.bdcdyh = res.result;
 				})
 				})
 				.catch((error) => {});
 				.catch((error) => {});
 		},
 		},
@@ -510,7 +510,7 @@ export default {
 		},
 		},
 		//判断容密高是否为区间
 		//判断容密高是否为区间
 		isInterval(val){
 		isInterval(val){
-			if(val == '>' || val == '<' || val == '=' || val == '>=' || val == '<='){
+			if(val == '>' || val == '<' || val == '=' || val == '>=' || val == '<='|| val == null){
 				return false
 				return false
 			}else{
 			}else{
 				return true;
 				return true;