diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 92fb7831..709895d6 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -4,6 +4,7 @@ import axios from "axios"; import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; +import { clearLoginInfo } from "@/utils"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -42,6 +43,7 @@ const request = curry( // 10005 token为空 10006登陆超时 10007别处登录 console.log("登录失效"); Message.error(res.data.msg); + clearLoginInfo(); return next({ name: "login", }); diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 92fb7831..709895d6 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -4,6 +4,7 @@ import axios from "axios"; import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; +import { clearLoginInfo } from "@/utils"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -42,6 +43,7 @@ const request = curry( // 10005 token为空 10006登陆超时 10007别处登录 console.log("登录失效"); Message.error(res.data.msg); + clearLoginInfo(); return next({ name: "login", }); diff --git a/src/router/index.js b/src/router/index.js index 82b43cff..397e2d71 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -94,6 +94,16 @@ export const moduleRoutes = { isTab: true, }, }, + { + path: "404", + props: true, + component: () => import("@/views/modules/404"), + name: "main-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, ], }; @@ -129,6 +139,16 @@ export const moduleShujuRoutes = { isTab: false, }, }, + { + path: "404", + props: true, + component: () => import("@/views/modules/visual/404"), + name: "main-shuju-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, ], }; @@ -380,7 +400,7 @@ router.beforeEach((to, from, next) => { // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); http - .get("/gov/access/menu/nav?tableName=data_menu") + .get("/gov/access/menu/nav?tableName=data_menu") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -406,7 +426,7 @@ router.beforeEach((to, from, next) => { }); http - .get("/gov/access/menu/nav") + .get("/gov/access/menu/nav") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -519,10 +539,10 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { children: routes, }, { - path: "*", - // redirect: { - // name: "404", - // }, + path: "/main/*", + redirect: { + path: "/main/404", + }, }, ]); window.SITE_CONFIG["dynamicMenuRoutes"] = routes; @@ -593,10 +613,10 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) { children: routes, }, { - path: "*", - // redirect: { - // name: "404", - // }, + path: "/main-shuju/*", + redirect: { + path: "/main-shuju/404", + }, }, ]); window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes; diff --git a/src/utils/index.js b/src/utils/index.js index c2232ac7..1e6b6e6f 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -45,6 +45,7 @@ export function getDictLabel(dictType, dictValue) { export function clearLoginInfo() { store.commit('resetStore') Cookies.remove('token') + localStorage.setItem("token", ''); window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false } diff --git a/src/views/modules/404.vue b/src/views/modules/404.vue new file mode 100644 index 00000000..33682a33 --- /dev/null +++ b/src/views/modules/404.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 8860180f..c61ba5f5 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1,2236 +1,2477 @@ \ No newline at end of file diff --git a/src/views/modules/visual/404.vue b/src/views/modules/visual/404.vue new file mode 100644 index 00000000..047aec70 --- /dev/null +++ b/src/views/modules/visual/404.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue index f2834df4..2c84054e 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue @@ -923,7 +923,7 @@ const vueGis = { // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" let params = { - icSuperiorResourceId: info.id + icDangerousChemicalsId: info.id } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 0128dd05..117deb9a 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -922,7 +922,7 @@ const vueGis = { // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" let params = { - icSuperiorResourceId: info.id + icDangerousChemicalsId: info.id } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue new file mode 100644 index 00000000..da7d11f5 --- /dev/null +++ b/src/views/modules/workSys/role/role.vue @@ -0,0 +1,379 @@ + + + + + + diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue new file mode 100644 index 00000000..0e0304a2 --- /dev/null +++ b/src/views/modules/workSys/role/roleForm.vue @@ -0,0 +1,356 @@ + + + + + + + + + + + diff --git a/src/views/pages/404.vue b/src/views/pages/404.vue index 5d49d643..e7796ec6 100644 --- a/src/views/pages/404.vue +++ b/src/views/pages/404.vue @@ -2,11 +2,11 @@
-

404

+

页面未找到或无权访问

{{ $t('notFound.back') }} - {{ $t('notFound.home') }} + {{ $t('notFound.home') }}
diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue index a39cfff5..b7c551f3 100644 --- a/src/views/pages/index.vue +++ b/src/views/pages/index.vue @@ -1,27 +1,39 @@ diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 6db09b13..10cf96a9 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -247,7 +247,7 @@ export default { localStorage.setItem("userType", "work"); localStorage.setItem("showHeader", "0"); localStorage.setItem("token", res.data.token); - this.$router.replace({ name: "home" }); + this.$router.replace({ name: "index" }); }) .catch(() => {}); // epmet-ext9.elinkservice.cn/platform-admin