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

@@ -71,3 +71,16 @@ export function getTree(zdbsm) {
         }
     })
 }
+
+/**
+ * 根据自然幢BSM获取左侧目录树
+ */
+export function getTreeByZrzbsm(zrzbsm) {
+    return request({
+        url: 'system/xzq/getMenuTreeByZrzbsm',
+        method: 'get',
+        params: {
+            zrzbsm
+        }
+    })
+}
\ No newline at end of file

@@ -220,7 +220,8 @@ export default {
 	width: 16px;
 	left: 9px;
 	top: 9px;
-	background: #c3c5c8;
+	background: url('../../assets/images/rowline.png');
+    background-position-y: center;
 }
 .third_layer::before {
 	content: "";
@@ -239,7 +240,8 @@ export default {
 	width: 1px;
 	left: 9px;
 	top: 0px;
-	background: #c3c5c8;
+	background: url('../../assets/images/colline.png');
+	background-position-x: center;
 }
 .linkLine_first::after {
 	content: "";
@@ -249,7 +251,8 @@ export default {
 	height: calc(100% + 14px);
 	width: 1px;
 	left: 9px;
-	background: #c3c5c8;
+	background: url('../../assets/images/colline.png');
+	background-position-x: center;
 }
 // 上半截
 .linkLine_half_top::after {
@@ -259,7 +262,8 @@ export default {
 	top: -14px;
 	width: 1px;
 	left: 9px;
-	background: #c3c5c8;
+	background: url('../../assets/images/colline.png');
+	background-position-x: center;
 }
 .linkLine_last::after {
 	content: "";
@@ -268,7 +272,8 @@ export default {
 	width: 1px;
 	left: 9px;
 	top: 0px;
-	background: #c3c5c8;
+	background: url('../../assets/images/colline.png');
+	background-position-x: center;
 }
 .reTree_collapse_icon {
 	background: url("../../assets/images/reTree_collapse_.svg") no-repeat center

@@ -52,7 +52,7 @@ import Navigation from "../components/IvyElement/navigation";
 import Create from "./panel/create/index";
 import LineTree from "../components/lineTree/lineTree";
 import { setTimeout } from "timers";
-import { getTree,getDdicByMC,getTreeList } from "../api/common";
+import { getTree,getDdicByMC,getTreeList,getTreeByZrzbsm } from "../api/common";
 
 export default {
 	components: {
@@ -194,14 +194,14 @@ export default {
 			if (newPath == "/zd") {
 				this.getRightTree(this.$store.state.zdbsm);
 			}else if (newPath == "/zrz") {
-				this.getRightTree(this.$store.state.zdbsm);
+				this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
 			}else {
 				this.getTreeList();
 			}
 		},
-		"$store.state.zdbsm": function(bsm) {
-			this.getRightTree(bsm);
-		},
+		// "$store.state.zdbsm": function(bsm) {
+		// 	this.getRightTree(bsm);
+		// },
 	},
 	created() {
 		if (this.$route.meta) {
@@ -282,6 +282,14 @@ export default {
 				}
 			});
 		},
+
+		getRightTreeByZrzbsm(bsm) {
+			getTreeByZrzbsm(bsm).then((res) => {
+				if (res.success) {
+					this.pd = res.result;
+				}
+			});
+		},
 		sortNavigation(data, selectId) {
 			let headTop = this.headTop;
 			data.forEach((item, index) => {

@@ -55,6 +55,7 @@
                 total: 0,
                 pageNo: 1,
                 pageSize: 10,
+                qszt: 1,
                 queryData: {},
                 formData: {
                     user: "",
@@ -68,7 +69,10 @@
         created() {
         },
         mounted() {
-            this.getData({})
+            this.getData({
+                pageNo: this.pageNo,
+                pageSize: this.pageSize,
+            })
             this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
         },
         methods: {
@@ -79,6 +83,7 @@
                 this.getData(this.queryData);
             },
             getData(data) {
+                data['qszt'] = this.qszt
                 getSearchList(data).then(res => {
                     this.tableData = res.result.records
                     this.total = res.result.total

@@ -59,6 +59,7 @@
         props: {},
         data() {
             return {
+                qszt:2,
                 total: 0,
                 pageNo: 1,
                 pageSize: 10,
@@ -90,6 +91,7 @@
                 this.getData(this.queryData);
             },
             getData(data) {
+                data['qszt'] = this.qszt
                 getSearchList(data).then(res => {
                     this.tableData = res.result.records
                     this.total = res.result.total
@@ -136,7 +138,7 @@
         width: 100%;
         height: 100%;
         box-sizing: border-box;
-        padding: 0 18px!important;
+        padding: 0 18px !important;
         display: flex;
         flex-direction: column;
         background-color: #fcfdff;

@@ -258,7 +258,7 @@ export default {
 			//todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
 			this.$refs['ruleForm1'].validate((valid) => {
 				if (valid) {
-					insertDzjbxx(this.ruleForm1)
+					insertZrzjbxx(this.ruleForm1)
 						.then((res) => {
 							if (res.code == "200") {
 								this.$message({

@@ -53,6 +53,7 @@
         props: {},
         data() {
             return {
+                qszt: 1,
                 total: 0,
                 pageNo: 1,
                 pageSize: 10,
@@ -80,6 +81,7 @@
                 this.getData(this.queryData);
             },
             getData(data) {
+                data['qszt'] = this.qszt
                 getSearchList(data).then(res => {
                     this.tableData = res.result.records
                     this.total = res.result.total

@@ -109,6 +109,7 @@
                 let path = "";
                 switch (row.dylx) {
                     case "zrz":
+                        this.$store.state.zrzbsm = row.glbsm;
                         path = "/zrz";
                         break;
                     case "zd":