Merge remote-tracking branch 'origin/master'

+import request from '@/plugin/axios'
+/**
+ * 查询所有行政区
+ */
+export function getSearchList() {
+    return request({
+        url: '/system/basiccommon/query',
+        method: 'get',
+    })
+}
\ No newline at end of file

@@ -9,3 +9,28 @@ export function insertZrzjbxx (data) {
         data: data,
     })
 }
+
+/**
+ * 生成不动产单元号
+ */
+export function getBdcdyh (dpdm,dptype) {
+    return request({
+        url: '/system/generator/getBdcdyh',
+        method: 'get',
+        params:{
+            dpdm:dpdm,
+            dptype:dptype
+        }
+    })
+}
+
+/**
+ * 保存自然幢信息
+ */
+export function saveZrzInfo (data) {
+    return request({
+        url: '/fw/qjZrz/updateQjZrz',
+        method: 'put',
+        data:data
+    })
+}
\ No newline at end of file

@@ -12,7 +12,10 @@ const store = new Vuex.Store({
     zdbsm:'',
     xzqList:[],
     djqList:[],
-    djzqList:[]
+    djzqList:[],
+    //创建自然幢时需要用到的临时存储信息
+    zrzbsm:'',
+    xmmc:'',
   },
   modules: {
     user,

@@ -31,27 +31,6 @@
 							<i :class="item.icon"></i>
 							<span>{{ item.name }}</span>
 						</div>
-						<div class="top-items">
-							<el-menu
-								:default-active="activeIndex"
-								class="el-menu-demo"
-								mode="horizontal"
-								@select="handleSelect"
-								:router="true"
-							>
-								<el-submenu index="2">
-									<template slot="title"
-										>临时网页开发路由跳转</template
-									>
-									<el-menu-item
-										v-for="(item, index) in tempTab"
-										:index="item.path"
-										:key="'tempTab' + index"
-										>{{ item.name }}</el-menu-item
-									>
-								</el-submenu>
-							</el-menu>
-						</div>
 					</div>
 					<div class="header-bottom">
 						<Navigation ref="navigation"></Navigation>
@@ -73,7 +52,6 @@
 </template>
 <script>
 import util from "@/libs/util.js";
-import screenfull from "screenfull";
 import Navigation from "../components/IvyElement/navigation";
 import Create from "./panel/create/index";
 import LineTree from "../components/lineTree/lineTree";
@@ -86,7 +64,6 @@ export default {
 	},
 	data() {
 		return {
-			activeIndex: "1",
 			navigationList: [],
 			isActive: false,
 			textLogo: false,
@@ -310,21 +287,10 @@ export default {
 				}
 			});
 		},
-		screen() {
-			// 如果不允许进入全屏，发出不允许提示
-			// if (!screenfull.enabled) {
-			//   this.$message('您的浏览器不能全屏');
-			//   return false
-			// }
-			screenfull.toggle();
-		},
 		//树控件点击事件
 		itemClick(data) {
 			console.log(data);
 		},
-		handleSelect(key, keyPath) {
-			console.log(key, keyPath);
-		},
 		//关闭新建子组件弹框
 		closeDialog(){
 			this.dialogVisible = false;

@@ -242,7 +242,12 @@ export default {
 						});
 						//todo 跳转到自然幢基本信息内容表页面  (预留)
 						this.close();
-						this.$router.push("/zrz");
+						this.$store.zdbsm=res.result.zdbsm;
+						this.$store.zrzbsm=res.result.bsm;
+						this.$store.xmmc=res.result.xmmc;
+						this.$router.push({
+							path: '/zrz', query:{data: res.result}
+						});
 					} else {
 						this.$message.error("创建失败！");
 					}

@@ -43,6 +43,7 @@
 
 <script>
 import SearchHead from "../../../components/searchHead/searchHead";
+import {getSearchList} from "../../../api/search";
 export default {
 	name: "",
 	components: { SearchHead },
@@ -55,35 +56,42 @@ export default {
 				type: [],
 			},
 			tableData: [
-				{
-					bdcdyh: "610101001001GB00001W",
-					xmmc: "万科集团万科城",
-					bdcqzh: "陕（2017）西安市不动产权第00000",
-					lx: "宗地",
-					qlr: "李子新",
-					zl: "灞桥－田家湾-咸宁东路,近浐河西路",
-					zrsj: "2020.09.07 ",
-					cjr: "李子新",
-				},
+				// {
+				// 	bdcdyh: "610101001001GB00001W",
+				// 	xmmc: "万科集团万科城",
+				// 	bdcqzh: "陕（2017）西安市不动产权第00000",
+				// 	lx: "宗地",
+				// 	qlr: "李子新",
+				// 	zl: "灞桥－田家湾-咸宁东路,近浐河西路",
+				// 	zrsj: "2020.09.07 ",
+				// 	cjr: "李子新",
+				// },
 			],
 			tableHeight: "",
 		};
 	},
 	created() {},
 	mounted() {
-		for (let i = 0; i < 11; i++) {
-			let obj = {
-				bdcdyh: "610101001001GB00001W",
-				xmmc: "万科集团万科城",
-				bdcqzh: "陕（2017）西安市不动产权第00000",
-				lx: "自然幢",
-				qlr: "李子新",
-				zl: "灞桥－田家湾-咸宁东路,近浐河西路",
-				zrsj: "2020.09.07 ",
-				cjr: "李子新",
-			};
-			this.tableData.push(obj);
+		getSearchList().then((res)=>{
+			console.log(res)
+			if(res.code===200){
+				this.tableData=res.result.records;
+				console.log(this.tableData)
 			}
+		})
+		// for (let i = 0; i < 11; i++) {
+		// 	let obj = {
+		// 		bdcdyh: "610101001001GB00001W",
+		// 		xmmc: "万科集团万科城",
+		// 		bdcqzh: "陕（2017）西安市不动产权第00000",
+		// 		lx: "自然幢",
+		// 		qlr: "李子新",
+		// 		zl: "灞桥－田家湾-咸宁东路,近浐河西路",
+		// 		zrsj: "2020.09.07 ",
+		// 		cjr: "李子新",
+		// 	};
+		// 	this.tableData.push(obj);
+		// }
 		this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
 	},
 	methods: {