Browse Source

跳转登录修改

duy 2 months ago
parent
commit
b840ce10d9
4 changed files with 40 additions and 9 deletions
  1. 9 2
      src/views/home/auth.vue
  2. 10 2
      src/views/login/index.vue
  3. 11 1
      src/views/login/new.vue
  4. 10 4
      src/views/user/auth.vue

+ 9 - 2
src/views/home/auth.vue

@@ -22,6 +22,7 @@ import { useRoute, useRouter } from 'vue-router'
 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'
 
 //初始变量
 const router = useRouter()
@@ -82,8 +83,14 @@ const loginByTokenApi = async (form) => {
             loading.value = false
             isErrorShow.value = false
             window?.$message?.success('授权登录成功')
-            // router.push({ path: toUrl.value })
-            router.push({ name: 'file' })
+            if (!website.localModel) {
+            //210跳转文件收集
+                router.push({ name: 'file' })  
+            } else {
+                //甬台温,跳转大屏
+                router.push({ path: toUrl.value })
+            }
+            
         }, 500)
     } else {
         window.$message?.error('授权登录失败')

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

@@ -73,6 +73,7 @@ import HcHomeBg from './components/home-bg.vue'
 import { getTenantID } from '~api/user'
 import { getTopUrl } from '~uti/tools'
 import { formValidate, getObjVal, setImageColorStyle } from 'js-fast-way'
+import website from '~src/config'
 
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存
@@ -157,8 +158,15 @@ const formValidateClick = async () => {
     window?.$message?.success('登录成功')
     setTimeout(() => {
         loading.value = false
-        // router.push({ name: 'datav' })
-        router.push({ name: 'file' })
+        if (!website.localModel) {
+            //210跳转文件收集
+            router.push({ name: 'file' })  
+        } else {
+            //甬台温,跳转大屏
+            router.push({
+                name: 'datav',
+            })
+        }
     }, 1500)
 }
 

+ 11 - 1
src/views/login/new.vue

@@ -68,6 +68,7 @@ import { setUserTenantInfo, useAppLogin } from '~sto/user'
 import { getTenantID } from '~api/user'
 import { getTopUrl } from '~uti/tools'
 import { formValidate, getObjVal } from 'js-fast-way'
+import website from '~src/config'
 
 //图片文件
 import bgPng from '~src/assets/login/new-bg.png'
@@ -142,7 +143,16 @@ const formValidateClick = async () => {
     setTimeout(() => {
         loading.value = false
         // router.push({ name: 'datav' })
-        router.push({ name: 'file' })
+        // router.push({ name: 'file' })
+        if (!website.localModel) {
+            //210跳转文件收集
+            router.push({ name: 'file' })  
+        } else {
+            //甬台温,跳转大屏
+            router.push({
+                name: 'datav',
+            })
+        }
     }, 1500)
 }
 

+ 10 - 4
src/views/user/auth.vue

@@ -23,6 +23,7 @@ import svg403 from '~src/assets/view/403.svg'
 import userApi from '~api/userInfo'
 import { getTenantID } from '~api/user'
 import { getTopUrl } from '~uti/tools'
+import website from '~src/config'
 
 //初始变量
 const router = useRouter()
@@ -95,10 +96,15 @@ const useAppLoginApi = async (form) => {
         loading.value = false
         isErrorShow.value = false
         window?.$message?.success('授权登录成功')
-        // router.push({
-        //     name: 'datav',
-        // })
-        router.push({ name: 'file' })
+        if (!website.localModel) {
+            //210跳转文件收集
+            router.push({ name: 'file' })  
+        } else {
+            //甬台温,跳转大屏
+            router.push({
+                name: 'datav',
+            })
+        }
     }, 1500)
 }