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

@@ -68,7 +68,7 @@
         data() {
         data() {
             return {
             return {
                 activeName:'zhcx',
                 activeName:'zhcx',
-                type:'all',
+                type:'add',
                 total: 0,
                 total: 0,
                 pageNo: 1,
                 pageNo: 1,
                 pageSize: 15,
                 pageSize: 15,

@@ -30,7 +30,7 @@
 						class="box"
 						class="box"
 						v-for="(item, index) in list"
 						v-for="(item, index) in list"
 						:key="index"
 						:key="index"
-						@click="handleSelect"
+						@click="handleSelect(item)"
 					>
 					>
 						<div class="psr">
 						<div class="psr">
 							<img :src="item.img" alt="" />
 							<img :src="item.img" alt="" />
@@ -97,13 +97,14 @@ export default {
 				{ name: "退件箱", img: require("@assets/images/tjx.png"),count:0 },
 				{ name: "退件箱", img: require("@assets/images/tjx.png"),count:0 },
 			],
 			],
 			list: [
 			list: [
-				{ name: "宗地分割", img: require("@assets/images/zdfg.png") },
+				{ name: "宗地分割", img: require("@assets/images/zdfg.png"),path:'change',oLevel:'fg',tLevel:'zd'},
 				{
 				{
-					name: "导入楼盘表模板",
+					name: "宗地合并",
 					img: require("@assets/images/drlpbmb.png"),
 					img: require("@assets/images/drlpbmb.png"),
+					path:'change',oLevel:'hb',tLevel:'zd'
 				},
 				},
-				{ name: "新办房屋", img: require("@assets/images/xbfw.png") },
-				{ name: "重新落宗", img: require("@assets/images/cxlz.png") },
+				{ name: "范围属性变更", img: require("@assets/images/xbfw.png"),path:'change',oLevel:'fwsxbg',tLevel:'' },
+				{ name: "重新落宗", img: require("@assets/images/cxlz.png"),path:'change',oLevel:'cxlz',tLevel:''},
 				{ name: "添加", img: require("@assets/images/tj.png") },
 				{ name: "添加", img: require("@assets/images/tj.png") },
 			],
 			],
 			tableData: [
 			tableData: [
@@ -161,12 +162,16 @@ export default {
 			//非编辑状态才可以点击
 			//非编辑状态才可以点击
 			if (!this.isEdit) {
 			if (!this.isEdit) {
 				if(item.path){
 				if(item.path){
+					let params = {};
+					if(item.oLevel!==''){
+						params.oLevel = item.oLevel;
+					}
+					if(item.tLevel!==''){
+						params.tLevel = item.tLevel;
+					}
 					this.$router.push({
 					this.$router.push({
-						path:'/change',
-						query:{
-							oLevel:'fg',
-							tLevel:'h'
-						}
+						path:item.path,
+						query:params
 					})
 					})
 				}
 				}
 			}
 			}