diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue index 2c1cdd2..f25d4de 100644 --- a/src/layout/newyjLayout.vue +++ b/src/layout/newyjLayout.vue @@ -79,9 +79,15 @@ export default { icon1: require("../assets/images/zhifa.png"), icon2: require("../assets/images/zhifa-change.png"), }, + // { + // path: "/enterprise", + // name: "企业名录", + // icon1: require("../assets/images/qiye.png"), + // icon2: require("../assets/images/qiye-change.png"), + // }, { - path: "/enterprise", - name: "企业名录", + path: "/focusEnter", + name: "省重点企业", icon1: require("../assets/images/qiye.png"), icon2: require("../assets/images/qiye-change.png"), }, @@ -89,12 +95,12 @@ export default { }; }, watch: { - $route:{ - handler(newRouter,oldRouter){ - this.routerIndex = newRouter.meta.index + $route: { + handler(newRouter, oldRouter) { + this.routerIndex = newRouter.meta.index; }, immediate: true, - } + }, }, methods: { changePath(e, item) { @@ -104,7 +110,7 @@ export default { this.avatarFlag = e; }, //退出登录 - logout() { + logout() { this.$confirm("确定注销并退出系统吗?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/src/router/index.js b/src/router/index.js index 465a95c..c21d18c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -96,10 +96,16 @@ export const constantRoutes = [ name: "enforcing", meta:{index:2} }, + // { + // path: "/enterprise", + // component: () => import("@/views/yingji/enterprise.vue"), + // name: "enterprise", + // meta:{index:3} + // }, { - path: "/enterprise", - component: () => import("@/views/yingji/enterprise.vue"), - name: "enterprise", + path: "/focusEnter", + component: () => import("@/views/yingji/focusEnter.vue"), + name: "focusEnter", meta:{index:3} }, diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index fe5ff9d..e3470c7 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -8,265 +8,345 @@ custom-class="dialog-boxed" width="70%" > -