diff --git a/src/permission.js b/src/permission.js index 52fea0a..c65d0ac 100644 --- a/src/permission.js +++ b/src/permission.js @@ -6,11 +6,11 @@ import "nprogress/nprogress.css"; import { getToken } from "@/utils/auth"; // 踢出系统 -// function kickOut() { -// if (process.env.NODE_ENV === "production") { -// location.href = location.origin + "/login"; -// } -// } +function kickOut() { + if (process.env.NODE_ENV === "production") { + location.href = location.origin + "/login"; + } +} NProgress.configure({ showSpinner: false }); const whiteList = [ "/login", @@ -21,10 +21,16 @@ const whiteList = [ "/personalData", "/changePassword", "/statistics", + + "/administrative", + "/enterpriseMsg", + "/productsMsg", + "/logout", ]; router.beforeEach((to, from, next) => { NProgress.start(); if (getToken()) { + console.log('有token'); to.meta.title && store.dispatch("settings/setTitle", to.meta.title); /* has token*/ if (to.path === "/login") { @@ -36,39 +42,39 @@ router.beforeEach((to, from, next) => { } else { // 没有token if (whiteList.indexOf(to.path) !== -1) { - // next(); - let token = localStorage.getItem("MSSM-LIAONING__TOKEN"); - if (token) { - if (store.state.myselfPermission.routerList.length > 0) { - let current = store.state.myselfPermission.routerList.filter( - (item) => item.path == to.path || from.path == "/" - ); - if (current.length > 0) { - next(); - } else { - Message.error("无权限访问！"); - } - } else { - store - .dispatch("GetPermission") - .then((res) => { - if (res.length > 0) { - next({ path: res }); - } else { - // kickOut(); - } - }) - .catch((error) => { - // kickOut(); - }); - } - } else { - // //没有token踢出去 - // Message.error("获取令牌失败！"); - // kickOut(); - next(); - - } + next() + // let token = localStorage.getItem("MSSM-LIAONING__TOKEN"); + // if (token) { + // if (store.state.myselfPermission.routerList.length > 0) { + // let current = store.state.myselfPermission.routerList.filter( + // (item) => item.path == to.path || from.path == "/" + // ); + // if (current.length > 0) { + // next(); + // } else { + // next(); + // // Message.error("无权限访问！"); + // } + // } else { + // store + // .dispatch("GetPermission") + // .then((res) => { + // console.log(res); + // if (res.length > 0) { + // next({ path: res }); + // } else { + // kickOut(); + // } + // }) + // .catch((error) => { + // kickOut(); + // }); + // } + // } else { + // //没有token踢出去 + // Message.error("获取令牌失败！"); + // kickOut(); + // } } else { // kickOut(); NProgress.done(); @@ -78,4 +84,4 @@ router.beforeEach((to, from, next) => { router.afterEach(() => { NProgress.done(); -}); +}); \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 2a89513..171a7dd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -63,102 +63,116 @@ export const constantRoutes = [ }, { - path: "", - component: Layout, - redirect: "index", - // children: [ - // { - // path: "index", - // component: () => import("@/views/index"), - // name: "Index", - // meta: { title: "检查员统计", icon: "netWork", affix: true }, - // }, - // ], - }, - - { - path: "/index", + path: '', component: () => import("@/views/index"), - name: "Index", - meta: { title: "首页", icon: "netWork", affix: true }, + redirect: "/administrative", isDiy: true, - hidden: true, - redirect: "/netWorkStat", children: [ { - path: "/netWorkStat", - name: "产品档案", - icon: require("@/assets/images/tree1.svg"), - component: () => import("@/views/netWorkStat/index"), - meta: { title: "产品档案", icon: "netWork", affix: true }, - children:[ - { - path: "/drugFile", - name: "药品档案", - icon: require("@/assets/images/tree2.svg"), - component: () => import("@/views/drugFile/index"), - meta: { title: "产品档案", icon: "netWork", affix: true }, - } - ] + path: "/administrative", + name: "行政审批", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/administrative/index"), + meta: { title: "行政审批", icon: "netWork" }, }, - // { - // path: "/censor", - // name: "全局检查员信息", - // icon: require("@/assets/images/tree2.svg"), - // component: () => import("@/views/censor/index"), - // meta: { title: "全局检查员信息", icon: "netWork" }, - // }, - // { - // path: "/statistics", - // name: "培训情况统计", - // icon: require("@/assets/images/tree3.svg"), - // component: () => import("@/views/statistics/index"), - // meta: { title: "培训情况统计", icon: "netWork" }, - // }, - // { - // path: "/personalData", - // name: "检查员个人资料", - // icon: require("@/assets/images/tree3.svg"), - // component: () => import("@/views/personalData/index"), - // meta: { title: "检查员个人资料", icon: "netWork" }, - // }, - // { - // path: "/changePassword", - // name: "修改密码", - // icon: require("@/assets/images/tree4.svg"), - // component: () => import("@/views/changePassword/index"), - // meta: { title: "修改密码", icon: "netWork" }, - // }, - // { - // path: "/changePassword", - // name: "行政审批", - // icon: require("@/assets/images/tree4.svg"), - // component: () => import("@/views/changePassword/index"), - // meta: { title: "行政审批", icon: "netWork" }, - // }, - // { - // path: "/changePassword", - // name: "企业档案", - // icon: require("@/assets/images/tree4.svg"), - // component: () => import("@/views/changePassword/index"), - // meta: { title: "企业档案", icon: "netWork" }, - // }, - // { - // path: "/changePassword", - // name: "产品档案", - // icon: require("@/assets/images/tree4.svg"), - // component: () => import("@/views/changePassword/index"), - // meta: { title: "产品档案", icon: "netWork" }, - // }, - // { - // path: "/changePassword", - // name: "依法注销", - // icon: require("@/assets/images/tree4.svg"), - // component: () => import("@/views/changePassword/index"), - // meta: { title: "依法注销", icon: "netWork" }, - // }, - ], + { + path: '/enterpriseMsg', + name: "企业档案", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/enterpriseMsg/index"), + meta: { title: "企业档案", icon: "netWork" }, + }, + { + path: "/logout", + name: "依法注销", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/logout/index"), + meta: { title: "依法注销", icon: "netWork" }, + }, + { + path: '/productsMsg', + name: "产品档案", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/productsMsg/index"), + meta: { title: "产品档案", icon: "netWork" }, + } + ] }, + // { + // path: '', + // component: () => import("@/views/index"), + // redirect: "/administrative", + // isDiy: true, + // children: [ + // { + // path: "/administrative", + // name: "行政审批", + // icon: require("@/assets/images/tree4.svg"), + // component: () => import("@/views/administrative/index"), + // meta: { title: "行政审批", icon: "netWork" }, + // }, + // ] + // }, + // { + // path: '/A', + // component: () => import("@/views/index"), + // redirect: "enterpriseMsg", + // isDiy: true, + // children: [ + // { + // path: 'enterpriseMsg', + // name: "企业档案", + // icon: require("@/assets/images/tree4.svg"), + // component: () => import("@/views/enterpriseMsg/index"), + // meta: { title: "企业档案", icon: "netWork" }, + // }, + // ] + // }, + // { + // path: '/B', + // component: () => import("@/views/index"), + // redirect: "logout", + // isDiy: true, + // children: [ + // { + // path: "logout", + // name: "依法注销", + // icon: require("@/assets/images/tree4.svg"), + // component: () => import("@/views/logout/index"), + // meta: { title: "依法注销", icon: "netWork" }, + // }, + // ] + // }, + // { + // path: '/productsMsg', + // component: () => import("@/views/index"), + // redirect: "drugArchives", + // isDiy: true, + // children: [ + // { + // path: "drugArchives", + // name: "药品档案", + // icon: require("@/assets/images/tree4.svg"), + // component: () => import("@/views/productsMsg/components/drugArchives.vue"), + // meta: { title: "药品档案", icon: "netWork" }, + // }, + // { + // path: "cosmeticsArchives", + // name: "化妆品档案", + // icon: require("@/assets/images/tree4.svg"), + // component: () => import("@/views/productsMsg/components/cosmeticsArchives.vue"), + // meta: { title: "化妆品档案", icon: "netWork" }, + // }, + // { + // path: "health", + // name: "医疗器械档案", + // icon: require("@/assets/images/tree4.svg"), + // component: () => import("@/views/productsMsg/components/health.vue"), + // meta: { title: "医疗器械档案", icon: "netWork" }, + // }, + // ] + // }, + //可以按着若依的思路来写,把菜单全部都设置成一级路由，然后有下拉选择框的去进行区别判断设置成二级子路由 ]; // 动态路由，基于用户权限动态去加载 diff --git a/src/views/index.vue b/src/views/index.vue index da678ac..0ff23c2 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -2,8 +2,8 @@
- - -
-
-
+ --> + +
- - - - {{ itemb.name }} - - - -
- -
- -
- +
+ + + + {{ itemb.name }} + + +
+
+ + +
- -
+
- +
@@ -75,26 +78,81 @@ export default { components: { myHeader, TagsView }, data() { return { - routerIndex: "0-0", + routerIndex: "1-1", + routerList: [ + { + path: "/administrative", + name: "行政审批", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/administrative/index"), + meta: { title: "行政审批", icon: "netWork" }, + }, + { + path: "/enterpriseMsg", + name: "企业档案", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/enterpriseMsg/index"), + meta: { title: "企业档案", icon: "netWork" }, + }, + { + path: "/productsMsg", + name: "产品档案", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/index"), + redirect: "drugArchives", + isDiy: true, + // children: [ + // { + // path: "/productsMsg/drugArchives", + // name: "药品档案", + // icon: require("@/assets/images/tree4.svg"), + // component: () => + // import("@/views/productsMsg/components/drugArchives.vue"), + // meta: { title: "药品档案", icon: "netWork" }, + // }, + // { + // path: "/productsMsg/cosmeticsArchives", + // name: "化妆品档案", + // icon: require("@/assets/images/tree4.svg"), + // component: () => + // import("@/views/productsMsg/components/cosmeticsArchives.vue"), + // meta: { title: "化妆品档案", icon: "netWork" }, + // }, + // { + // path: "/productsMsg/health", + // name: "医疗器械档案", + // icon: require("@/assets/images/tree4.svg"), + // component: () => + // import("@/views/productsMsg/components/health.vue"), + // meta: { title: "医疗器械档案", icon: "netWork" }, + // }, + // ], + }, + { + path: "/logout", + name: "依法注销", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/logout/index"), + meta: { title: "依法注销", icon: "netWork" }, + }, + + ], }; }, computed: { //获取自定义路由 myRouter() { + console.log(this.$router.options.routes); // let staticRouter = router.options.routes.filter( // (item) => item.isDiy == true // )[0].children; // return staticRouter; // return this.$store.state.myselfPermission.routerList; + console.log(this.$router.options.routes[6].children); return this.$router.options.routes[6].children; }, - }, - methods:{ - handleOpen(key, keyPath) { - console.log(key, keyPath); - }, - handleClose(key, keyPath) { - console.log(key, keyPath); + get1(e) { + console.log(e); }, }, created() {}, @@ -102,6 +160,28 @@ export default { + \ No newline at end of file diff --git a/src/views/netWorkStat/index.vue b/src/views/netWorkStat/index.vue deleted file mode 100644 index ad71109..0000000 --- a/src/views/netWorkStat/index.vue +++ /dev/null @@ -1,376 +0,0 @@ - - - - - diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue index 5b0c7a5..6e3983c 100644 --- a/src/views/productsMsg/index.vue +++ b/src/views/productsMsg/index.vue @@ -1,3 +1,332 @@ \ No newline at end of file +
+
+
+ + +
+
+ 全文检索： +
+ +
+
+
+ 企业名称： +
+ +
+
+
+ 批准文号： +
+ +
+
+
+ 处方内容： +
+ +
+
+
+ 功能主治： +
+ +
+
+
+ 产品名称： +
+ +
+
+
+
+ 批号有效期： +
+
+
+ + + +
+ +
~
+
+ + + +
+
+
+
+ 产品标签： +
+ + + + + + +
+
+
+ 产品筛选： +
+ + + + + + +
+
+
+ + +
+ +
+
+ + + + + + \ No newline at end of file