Merge remote-tracking branch 'origin/master'

@@ -85,8 +85,8 @@ const constantRoutes = [
 			},
 			},
 			{
 			{
 				path: "/ljz",
 				path: "/ljz",
-				name: "宗地",
-				code: "1-5",
+				name: "宗地1",
+				code: "1-6",
 				component: () => import("@/views/basic/ljz/index"),
 				component: () => import("@/views/basic/ljz/index"),
 			},
 			},
 		],
 		],

@@ -31,27 +31,6 @@
 							<i :class="item.icon"></i>
 							<i :class="item.icon"></i>
 							<span>{{ item.name }}</span>
 							<span>{{ item.name }}</span>
 						</div>
 						</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>
 					<div class="header-bottom">
 					<div class="header-bottom">
 						<Navigation ref="navigation"></Navigation>
 						<Navigation ref="navigation"></Navigation>
@@ -73,7 +52,6 @@
 </template>
 </template>
 <script>
 <script>
 import util from "@/libs/util.js";
 import util from "@/libs/util.js";
-import screenfull from "screenfull";
 import Navigation from "../components/IvyElement/navigation";
 import Navigation from "../components/IvyElement/navigation";
 import Create from "./panel/create/index";
 import Create from "./panel/create/index";
 import LineTree from "../components/lineTree/lineTree";
 import LineTree from "../components/lineTree/lineTree";
@@ -86,7 +64,6 @@ export default {
 	},
 	},
 	data() {
 	data() {
 		return {
 		return {
-			activeIndex: "1",
 			navigationList: [],
 			navigationList: [],
 			isActive: false,
 			isActive: false,
 			textLogo: false,
 			textLogo: false,
@@ -310,21 +287,10 @@ export default {
 				}
 				}
 			});
 			});
 		},
 		},
-		screen() {
-			// 如果不允许进入全屏，发出不允许提示
-			// if (!screenfull.enabled) {
-			//   this.$message('您的浏览器不能全屏');
-			//   return false
-			// }
-			screenfull.toggle();
-		},
 		//树控件点击事件
 		//树控件点击事件
 		itemClick(data) {
 		itemClick(data) {
 			console.log(data);
 			console.log(data);
 		},
 		},
-		handleSelect(key, keyPath) {
-			console.log(key, keyPath);
-		},
 		//关闭新建子组件弹框
 		//关闭新建子组件弹框
 		closeDialog(){
 		closeDialog(){
 			this.dialogVisible = false;
 			this.dialogVisible = false;