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

@@ -59,12 +59,11 @@
 <script>
     import SearchHead from "@components/searchHead/searchHead";
     import {getDbxList} from "@api/dbx";
-    import panelSy from "@/views/panel/index"
 
     export default {
         name: "",
         inject:['getRightTree','getTreeByBsm'],
-        components: {SearchHead,panelSy},
+        components: {SearchHead},
         props: {},
         data() {
             return {

 <template>
     <el-tabs v-model="activeName" type="card" @tab-remove="removeTab">
-<!--        <el-tab-pane label="首页" name="sy" ref="sy"><panelSy></panelSy></el-tab-pane>-->
         <el-tab-pane label="待办箱" name="dbx"><dbxInfo></dbxInfo></el-tab-pane>
-        <el-tab-pane
-                v-for="(item, index) in editableTabs"
-                :key="item.name"
-                :label="item.title"
-                :name="item.name"
-        >
-            {{item.content}}
-        </el-tab-pane>
+<!--        <el-tab-pane-->
+<!--                v-for="(item, index) in editableTabs"-->
+<!--                :key="item.name"-->
+<!--                :label="item.title"-->
+<!--                :name="item.name"-->
+<!--        >-->
+<!--            {{item.content}}-->
+<!--        </el-tab-pane>-->
     </el-tabs>
 </template>
 
 <script>
-    import SearchHead from "@components/searchHead/searchHead";
-    import panelSy from "@/views/panel/index"
     import dbxInfo from "@/views/dbx/dbxinfo/index"
 
     export default {
         name: "",
         inject:['getRightTree','getTreeByBsm'],
-        components: {SearchHead,panelSy,dbxInfo},
+        components: {dbxInfo},
         props: {},
         data() {
             return {

@@ -28,7 +28,7 @@ export default {
 		};
 	},
 	methods: {
-		handleClick(tab, event) {
+		handleClick(tab) {
 			// this.$refs.fg.$refs.isSearch = true;
 			if (tab.name != 'fg') {
 				this.fgLoad = false;
@@ -51,7 +51,19 @@ export default {
 		},
 	},
 	created() {},
-	mounted() {},
+	mounted() {
+		if (this.$route.query.oLevel) {
+			this.activeName = this.$route.query.oLevel;
+			this.handleClick({name:this.$route.query.oLevel});
+			this.$nextTick(()=>{
+				if (this.$route.query.oLevel == 'hb') {
+					this.$refs.hb.tabName = this.$route.query.tLevel;
+				}else{
+					this.$refs.fg.tabName = this.$route.query.tLevel;
+				}
+			})
+		}
+	},
 	computed: {},
 	watch: {},
 };

@@ -52,7 +52,7 @@
 					:height="tableHeight"
 					:row-class-name="tableRowClassName"
 				>
-					<el-table-column prop="title" width="500" align="center" label="标题">
+					<el-table-column prop="title" width="500" align="left" label="标题">
 					</el-table-column>
 					<el-table-column
 						prop="date"
@@ -106,7 +106,32 @@ export default {
 				{ name: "重新落宗", img: require("@assets/images/cxlz.png") },
 				{ name: "添加", img: require("@assets/images/tj.png") },
 			],
-			tableData: [],
+			tableData: [
+				{
+					title:"明起部分不动产登记业务实行“网上不见面”办理",
+					date:"2020-12-30"
+				},
+				{
+					title:"【通知】关于暂停不动产交易缴税业务的通知",
+					date:"2020-12-30"
+				},
+				{
+					title:"我市不动产登记改革跨入新领域",
+					date:"2020-12-30"
+				},
+				{
+					title:"住建委发布白皮书 持续推进房地产市场平稳健康发展",
+					date:"2020-12-30"
+				},
+				{
+					title:"不动产登记与公证业务全面联办 中心城区下月起实行",
+					date:"2020-12-30"
+				},
+				{
+					title:"坚持以人民为中心发展思想 推进解决房地产历史遗留问题",
+					date:"2020-12-30"
+				}
+			],
             downloadData:[
                 {
                     name:"宗地导入模板",
@@ -137,7 +162,11 @@ export default {
 			if (!this.isEdit) {
 				if(item.path){
 					this.$router.push({
-						path:'/dbx'
+						path:'/change',
+						query:{
+							oLevel:'fg',
+							tLevel:'h'
+						}
 					})
 				}
 			}