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

@@ -189,7 +189,7 @@ export default {
 			margin-left: -10px;
 		}
 	}
-	margin-bottom: 18px;
+	margin-bottom: 10px;
 }
 .el-button {
 	width: 100px;

@@ -544,7 +544,7 @@ export default {
 	box-sizing: border-box;
 	padding: 18px 0 4px 0;
 	border: 1px solid #E6E6E6;
-	margin-bottom: 18px;
+	margin-bottom: 10px;
 }
 .el-button {
 	width: 100px;

@@ -584,6 +584,8 @@ export default {
 					this.$message.success("实预测转换成功");
 					this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,'1');
 					this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,'0');
+				}else if(res.code === 500) {
+					this.$message.warning(res.message);
 				}
 			});
 		},