Browse Source

登录跳转修改

duy 3 months ago
parent
commit
8bca84a841
5 changed files with 35 additions and 6 deletions
  1. 1 0
      src/config/index.js
  2. 8 1
      src/views/home/auth.vue
  3. 9 2
      src/views/login/index.vue
  4. 8 2
      src/views/login/new.vue
  5. 9 1
      src/views/user/auth.vue

+ 1 - 0
src/config/index.js

@@ -16,6 +16,7 @@ export default {
     refreshTokenKey: 'archives-refresh-token',
     statusWhiteList: [], //http的status默认放行列表
     role_id: '1610526744728031234', //档案总管理角色组ID
+    ex_role_id: ['1656191696348082177', '1656191770880864257'], //专家iD
     isLog: 'auto', //是否打印日志
     //进入新登录页的域名或端口
     domains: [],

+ 8 - 1
src/views/home/auth.vue

@@ -23,6 +23,7 @@ import { getObjVal, getObjValue, isNullES } from 'js-fast-way'
 import svg403 from '~src/assets/view/403.svg'
 import { getTopUrl } from '~uti/tools'
 import website from '~src/config'
+import { getStoreValue } from '~uti/storage'
 
 //初始变量
 const router = useRouter()
@@ -85,7 +86,13 @@ const loginByTokenApi = async (form) => {
             window?.$message?.success('授权登录成功')
             if (!website.localModel) {
             //210跳转文件收集
-                router.push({ name: 'file' })  
+                // router.push({ name: 'file' })  
+            const role_id = getStoreValue('role_id')
+            if (website.ex_role_id.includes(role_id)) {
+                router.push({ name: 'transfer-initial-expert' })
+            } else {
+                router.push({ name: 'file' })
+            }
             } else {
                 //甬台温,跳转大屏
                 router.push({ path: toUrl.value })

+ 9 - 2
src/views/login/index.vue

@@ -74,6 +74,8 @@ import { getTenantID } from '~api/user'
 import { getTopUrl } from '~uti/tools'
 import { formValidate, getObjVal, setImageColorStyle } from 'js-fast-way'
 import website from '~src/config'
+import notableform from '~src/assets/view/notableform.svg'
+import { getStoreValue } from '~uti/storage'
 
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存
@@ -156,15 +158,20 @@ const formValidateClick = async () => {
         return false
     }
     window?.$message?.success('登录成功')
+    const role_id = getStoreValue('role_id')
     setTimeout(() => {
         loading.value = false
         if (!website.localModel) {
             //210跳转文件收集
-            router.push({ name: 'file' })  
+            if (website.ex_role_id.includes(role_id)) {
+                router.push({ name: 'transfer-initial-expert' })
+            } else {
+                router.push({ name: 'file' })
+            }
         } else {
             //甬台温,跳转大屏
             router.push({
-                name: 'datav',
+                name: 'statistics-datav',
             })
         }
     }, 1500)

+ 8 - 2
src/views/login/new.vue

@@ -75,7 +75,7 @@ import bgPng from '~src/assets/login/new-bg.png'
 import bgPng1 from '~src/assets/login/new-bg-1.png'
 import imgPng from '~src/assets/login/new-img.png'
 import logoPng from '~src/assets/login/new-logo.png'
-
+import { getStoreValue } from '~uti/storage'
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存
 
@@ -144,7 +144,13 @@ const formValidateClick = async () => {
         loading.value = false
         if (!website.localModel) {
             //210跳转文件收集
-            router.push({ name: 'file' })  
+            // router.push({ name: 'file' })  
+            const role_id = getStoreValue('role_id')
+            if (website.ex_role_id.includes(role_id)) {
+                router.push({ name: 'transfer-initial-expert' })
+            } else {
+                router.push({ name: 'file' })
+            }
         } else {
             //甬台温,跳转大屏
             router.push({

+ 9 - 1
src/views/user/auth.vue

@@ -24,6 +24,7 @@ import userApi from '~api/userInfo'
 import { getTenantID } from '~api/user'
 import { getTopUrl } from '~uti/tools'
 import website from '~src/config'
+import { getStoreValue } from '~uti/storage'
 
 //初始变量
 const router = useRouter()
@@ -98,7 +99,14 @@ const useAppLoginApi = async (form) => {
         window?.$message?.success('授权登录成功')
         if (!website.localModel) {
             //210跳转文件收集
-            router.push({ name: 'file' })  
+            // router.push({ name: 'file' })  
+               //210跳转文件收集
+               const role_id = getStoreValue('role_id')
+            if (website.ex_role_id.includes(role_id)) {
+                router.push({ name: 'transfer-initial-expert' })
+            } else {
+                router.push({ name: 'file' })
+            }
         } else {
             //甬台温,跳转大屏
             router.push({