|
@@ -4,6 +4,7 @@ import Cookies from 'js-cookie'
|
|
|
|
|
|
import ElementPlus from 'element-plus'
|
|
|
import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
|
|
|
+import { ElMessageBox } from 'element-plus'
|
|
|
|
|
|
import '@/assets/styles/index.scss' // global css
|
|
|
import '@/assets/styles/page.scss' // global css
|
|
@@ -11,8 +12,9 @@ import App from './App'
|
|
|
import store from './store'
|
|
|
import router from './router'
|
|
|
import directive from './directive' // directive
|
|
|
-
|
|
|
+import { getToken,setToken } from '@/utils/auth'
|
|
|
import { getQueryObject } from '@/utils'
|
|
|
+import useUserStore from '@/store/modules/user'
|
|
|
|
|
|
// 注册指令
|
|
|
import plugins from './plugins' // plugins
|
|
@@ -119,7 +121,7 @@ app.use(ElementPlus, {
|
|
|
// 修改 el-dialog 默认点击遮照为不关闭
|
|
|
app._context.components.ElDialog.props.closeOnClickModal.default = false
|
|
|
|
|
|
-function importJS() { // 引入 "天地图"
|
|
|
+const importJS = () => { // 引入 "天地图"
|
|
|
return new Promise((resolve) => {
|
|
|
// const key = process.env.TMAP_KEY
|
|
|
// const url = `http://api.tianditu.gov.cn/api?v=4.0&tk=873e4a15f0f80945cd0ba56f069c19bc`
|
|
@@ -144,52 +146,64 @@ function importJS() { // 引入 "天地图"
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+
|
|
|
const omsLogin = () => {
|
|
|
- let params = getQueryObject();
|
|
|
- const ticket = params.ticket;
|
|
|
- const ssoToken = params.ssoToken;
|
|
|
- if(ticket || ssoToken){
|
|
|
- let data = {}
|
|
|
- const url = ticket ? '/sso/doLoginByTicket' : '/sso/doLoginByToken'
|
|
|
- if(ticket) {
|
|
|
- data.ticket = ticket
|
|
|
- }
|
|
|
- if(ssoToken) {
|
|
|
- data.token = ssoToken
|
|
|
- }
|
|
|
- store.dispatch('GetToken',{
|
|
|
- url,data
|
|
|
- }).then(() => {
|
|
|
- unitVue()
|
|
|
- }).catch(err => {
|
|
|
- let msg = '未知错误,请联系管理员!'
|
|
|
- if(err && err.msg) {
|
|
|
- msg = err.msg
|
|
|
+ return new Promise((resolve) => {
|
|
|
+ let params = getQueryObject();
|
|
|
+ const ticket = params.ticket;
|
|
|
+ const ssoToken = params.ssoToken;
|
|
|
+ if(ticket || ssoToken){
|
|
|
+ let data = {}
|
|
|
+ const url = ticket ? '/sso/doLoginByTicket' : '/sso/doLoginByToken'
|
|
|
+ if(ticket) {
|
|
|
+ data.ticket = ticket
|
|
|
+ }
|
|
|
+ if(ssoToken) {
|
|
|
+ data.token = ssoToken
|
|
|
}
|
|
|
- MessageBox.alert(msg, '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- callback: () => {
|
|
|
- store.dispatch('LogOut').then(() => {})
|
|
|
+ console.log('开始');
|
|
|
+ useUserStore().getTokenHandle({url:url,data:data})
|
|
|
+ // request({
|
|
|
+ // url: url,
|
|
|
+ // method:'get',
|
|
|
+ // params:data
|
|
|
+ // })
|
|
|
+ .then(() => {
|
|
|
+ console.log('成功')
|
|
|
+ resolve(true)
|
|
|
+ }).catch(err =>{
|
|
|
+ let msg = '未知错误,请联系管理员!'
|
|
|
+ if(err && err.msg) {
|
|
|
+ msg = err.msg
|
|
|
}
|
|
|
- });
|
|
|
- })
|
|
|
- }else if(getToken()){
|
|
|
- unitVue()
|
|
|
- }else{
|
|
|
- const redirect = location.origin
|
|
|
- location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-const unitVue = () => {
|
|
|
- Promise.all([importJS()]).then(result => {
|
|
|
- app.mount('#app')
|
|
|
+ ElMessageBox.alert(msg, '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ callback: () => {
|
|
|
+ store.dispatch('LogOut').then(() => {})
|
|
|
+ }
|
|
|
+ });
|
|
|
+ })
|
|
|
+ }
|
|
|
+ // else if(getToken()){
|
|
|
+ // unitVue()
|
|
|
+ // }
|
|
|
+ // else{
|
|
|
+ // const redirect = location.origin
|
|
|
+ // location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
|
|
|
+ // }
|
|
|
})
|
|
|
+
|
|
|
}
|
|
|
|
|
|
+// const unitVue = () => {
|
|
|
+// Promise.all([importJS()]).then(result => {
|
|
|
+// app.mount('#app')
|
|
|
+// })
|
|
|
+// }
|
|
|
+
|
|
|
// omsLogin()
|
|
|
|
|
|
Promise.all([importJS()]).then(result => {
|
|
|
- app.mount('#app')
|
|
|
+ app.mount('#app');
|
|
|
})
|
|
|
|