AaronBruin 3 months ago
parent
commit
6afe0cdc88
4 changed files with 70 additions and 54 deletions
  1. 3 0
      src/layout/index.vue
  2. 20 18
      src/store/modules/permission.js
  3. 36 36
      src/utils/request.js
  4. 11 0
      src/views/receptiondesk/index.vue

+ 3 - 0
src/layout/index.vue

@@ -70,6 +70,9 @@ function setLayout() {
   width: 100%;
   display: flex;
   flex-direction: column;
+  overflow: hidden;
+  background: linear-gradient(90deg, rgba(65, 204, 148, 0.1) 5%, transparent 0), linear-gradient(rgba(65, 204, 148, 0.1) 5%, transparent 0);
+  background-size: 20px 20px;
 }
 
 .drawer-bg {

+ 20 - 18
src/store/modules/permission.js

@@ -48,7 +48,7 @@ const usePermissionStore = defineStore(
               },
               name: "/",
               path: "/index",
-            },{
+            }, {
               component: "system/menu/index",
               hidden: false,
               meta: {
@@ -57,7 +57,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/menu",
-            },{
+            }, {
               component: "system/role/index",
               hidden: false,
               meta: {
@@ -66,7 +66,7 @@ const usePermissionStore = defineStore(
               },
               name: "Role",
               path: "/system/role",
-            },{
+            }, {
               component: "system/user/index",
               hidden: false,
               meta: {
@@ -75,7 +75,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/user",
-            },{
+            }, {
               component: "system/dept/index",
               hidden: false,
               meta: {
@@ -84,7 +84,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/dept",
-            },{
+            }, {
               component: "system/post/index",
               hidden: false,
               meta: {
@@ -93,7 +93,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/post",
-            },{
+            }, {
               component: "system/dict/index",
               hidden: false,
               meta: {
@@ -102,7 +102,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/dict",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -111,7 +111,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -120,7 +120,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -129,7 +129,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -138,7 +138,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -147,7 +147,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -156,7 +156,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -165,7 +165,7 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
+            }, {
               component: "system/notice/index",
               hidden: false,
               meta: {
@@ -174,21 +174,23 @@ const usePermissionStore = defineStore(
               },
               name: "Menu",
               path: "/system/notice",
-            },{
-              component: "system/notice/index",
+            }, {
+              component: "receptiondesk/index",
               hidden: false,
               meta: {
                 icon: "service",
                 title: "服务台"
               },
-              name: "Menu",
-              path: "/system/notice",
+              name: "Receptiondesk",
+              path: "/receptiondesk",
             }]
             // const sidebarRoutes = filterAsyncRouter(sdata)
             const sidebarRoutes = filterAsyncRouter(arrData)
+            // const rewriteRoutes = filterAsyncRouter(arrData, false, true)
             const rewriteRoutes = filterAsyncRouter(rdata, false, true)
             const defaultRoutes = filterAsyncRouter(defaultData)
             const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
+
             asyncRoutes.forEach(route => { router.addRoute(route) })
             this.setRoutes(rewriteRoutes)
             this.setSidebarRouters(constantRoutes.concat(sidebarRoutes))

+ 36 - 36
src/utils/request.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus'
+import { ElNotification, ElMessageBox, ElMessage, ElLoading } from 'element-plus'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from '@/utils/ruoyi'
@@ -67,46 +67,46 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
-    Promise.reject(error)
+  console.log(error)
+  Promise.reject(error)
 })
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
-    // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
-    // 二进制数据则直接返回
-    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
-      return res.data
-    }
-    if (code === 401) {
-      if (!isRelogin.show) {
-        isRelogin.show = true;
-        ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
-          isRelogin.show = false;
-          useUserStore().logOut().then(() => {
-            location.href = '/index';
-          })
-      }).catch(() => {
-        isRelogin.show = false;
-      });
-    }
-      return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
-    } else if (code === 500) {
-      ElMessage({ message: msg, type: 'error' })
-      return Promise.reject(new Error(msg))
-    } else if (code === 601) {
-      ElMessage({ message: msg, type: 'warning' })
-      return Promise.reject(new Error(msg))
-    } else if (code !== 200) {
-      ElNotification.error({ title: msg })
-      return Promise.reject('error')
-    } else {
-      return  Promise.resolve(res.data)
+  // 未设置状态码则默认成功状态
+  const code = res.data.code || 200;
+  // 获取错误信息
+  const msg = errorCode[code] || res.data.msg || errorCode['default']
+  // 二进制数据则直接返回
+  if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+    return res.data
+  }
+  if (code === 401) {
+    if (!isRelogin.show) {
+      // isRelogin.show = true;
+      // ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+      //   isRelogin.show = false;
+      //   useUserStore().logOut().then(() => {
+      //     location.href = '/index';
+      //   })
+      // }).catch(() => {
+      //   isRelogin.show = false;
+      // });
     }
-  },
+    return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
+  } else if (code === 500) {
+    ElMessage({ message: msg, type: 'error' })
+    return Promise.reject(new Error(msg))
+  } else if (code === 601) {
+    ElMessage({ message: msg, type: 'warning' })
+    return Promise.reject(new Error(msg))
+  } else if (code !== 200) {
+    ElNotification.error({ title: msg })
+    return Promise.reject('error')
+  } else {
+    return Promise.resolve(res.data)
+  }
+},
   error => {
     console.log('err' + error)
     let { message } = error;

+ 11 - 0
src/views/receptiondesk/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div class="app-container home">
+    123
+  </div>
+</template>
+
+<script setup>
+</script>
+
+<style scoped lang="scss">
+</style>