Commit 2b07a81b authored by zhengke's avatar zhengke

优化 行程图

parent e4629888
...@@ -17,6 +17,7 @@ import { isPC, query } from './utils/common' ...@@ -17,6 +17,7 @@ import { isPC, query } from './utils/common'
import { userStore } from './store/user' import { userStore } from './store/user'
import { injectKeyTemplate } from '@/types/injectKey' import { injectKeyTemplate } from '@/types/injectKey'
import ConfigService from '@/services/ConfigService' import ConfigService from '@/services/ConfigService'
import { domainManager } from '@/utils/domainManager'
import Editor from './views/Editor/index.vue' import Editor from './views/Editor/index.vue'
import Screen from './views/Screen/index.vue' import Screen from './views/Screen/index.vue'
...@@ -57,15 +58,11 @@ const userLoginHandler = async ()=>{ ...@@ -57,15 +58,11 @@ const userLoginHandler = async ()=>{
if(param.model) model=parseInt(param.model) if(param.model) model=parseInt(param.model)
ConfigIdStore.setConfigId(ConfigId) ConfigIdStore.setConfigId(ConfigId)
modelStore.setModel(model) modelStore.setModel(model)
if(!userInfo.value.EmployeeId){ try {
try { await userStore().setUserLoginAsync(userId,ConfigId)
await userStore().setUserLoginAsync(userId,ConfigId) await useFontStore().loadAllFonts()
await useFontStore().loadAllFonts()
if(ConfigId) await GetTripConfig(ConfigId)
} catch (error) {}
}else{
if(ConfigId) await GetTripConfig(ConfigId) if(ConfigId) await GetTripConfig(ConfigId)
} } catch (error) {}
isFinish.value=true isFinish.value=true
if(!ConfigId&&!model) ElMessageBox.confirm( if(!ConfigId&&!model) ElMessageBox.confirm(
'当前没有权限进行任何操作,请联系管理员!', '当前没有权限进行任何操作,请联系管理员!',
...@@ -95,9 +92,11 @@ const GetTripConfig = async (ConfigId) =>{ ...@@ -95,9 +92,11 @@ const GetTripConfig = async (ConfigId) =>{
ConfigId: ConfigId ConfigId: ConfigId
} }
let datasRes = await ConfigService.triptemplateGetTripConfig(queryMsg); let datasRes = await ConfigService.triptemplateGetTripConfig(queryMsg);
if (datasRes.data.resultCode == 1 && datasRes.data.data && datasRes.data.data.TempId) { if (datasRes.data.resultCode == 1 && datasRes.data.data) {
console.log(dataObj,'--------------dataObj')
let dataObj = datasRes.data.data let dataObj = datasRes.data.data
if(dataObj.TempId==0){
return window.parent.postMessage(`暂无行程数据`, `${domainManager().notificationUrl}`);
}
isModelStore.setIsModel(true) isModelStore.setIsModel(true)
marketStore.setMarket(!market) marketStore.setMarket(!market)
TempIdStore.setTempId(dataObj.TempId) TempIdStore.setTempId(dataObj.TempId)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment