diff --git a/src/App.vue b/src/App.vue index 020f9791a..d9f26b20c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,6 +2,7 @@
+
@@ -11,6 +12,7 @@ import { getSessionStorage } from '@/utils/auth'; import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig'; import DeomonTopic from '@/views/demonstration/deomonTopic'; import WindowResizeHandler from '@/mixin/WindowResizeHandler'; +import LoadingImg from '@/assets/loading.gif'; export default { name: 'App', @@ -20,6 +22,12 @@ export default { mixins: [ WindowResizeHandler ], + data() { + return { + loadingImg: LoadingImg, + loading: false + }; + }, computed: { path() { return window.location.pathname; @@ -47,6 +55,14 @@ export default { } }); }); + }, + '$store.state.app.transitionAnimationsCount': function(val) { + this.loading = true; + }, + '$route' () { + this.$nextTick(function() { + this.loading = false; + }); } }, created() { diff --git a/src/assets/loading.gif b/src/assets/loading.gif new file mode 100644 index 000000000..24f001edb Binary files /dev/null and b/src/assets/loading.gif differ diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue index 7d7af67a2..149cd8be5 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue @@ -375,6 +375,8 @@ export default { getTrainDetailByStNumber(this.$route.query.group, {tripNumber: tripNumber, serviceNumber: serviceNumber}).then(resp => { if (resp.data) { this.formModel.destinationCode = resp.data.destinationCode; + } else { + this.$message.error('未找到输入列车信息!'); } }); } else { @@ -382,6 +384,8 @@ export default { if (resp.data) { this.formModel.serviceNumber = resp.data.serviceNumber; this.formModel.destinationCode = resp.data.destinationCode; + } else { + this.$message.error('未找到输入列车信息!'); } }); } diff --git a/src/permission.js b/src/permission.js index e38230d20..8813933ed 100644 --- a/src/permission.js +++ b/src/permission.js @@ -85,7 +85,7 @@ function handleRoute(to, next, loginPath) { router.beforeEach((to, from, next) => { const project = getSessionStorage('project'); document.title = loginInfo[project || 'login'].browserTitle || loginInfo[project || 'login'].title; - + store.dispatch('app/transitionAnimations'); NProgress.start(); const loginPath = getRouteInfo(to); if (getToken()) { diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 9198f675a..97f8d6868 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -113,6 +113,28 @@ export const loginInfo = { navigationMarginLeft: '140px', systemType: '019' }, + hyd: { + title: '城市轨道交通综合行车模拟仿真系统V1.0', + loginTitle: '空串', + logoWidth: '140px', + loginPath: '/login?project=hyd', + bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273', + loginParam: 'DEFAULT', + navigationLogoWidth: '120px', + navigationMarginLeft: '140px', + systemType: '011' + }, + designhyd: { + title: '城市轨道交通设计平台V1.0', + loginTitle: '空串', + logoWidth: '140px', + loginPath: '/design/login?project=hyd', + bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273', + loginParam: 'DEFAULT', + navigationLogoWidth: '120px', + navigationMarginLeft: '140px', + systemType: '011' + }, xadt: { title: '城市轨道交通实训平台', logoWidth: '60px', @@ -292,6 +314,8 @@ export const ProjectIcon = { designgzb:FaviconGzb, heb: FaviconHeb, designheb: FaviconHeb, + hyd: FaviconHeb, + designhyd: FaviconHeb, xadt: FaviconXadt, designxadt: FaviconXadt, jsxt: Favicon, @@ -322,13 +346,13 @@ export const ProjectCode = { drts: 'DRTS', designdrts: 'DRTS' }; -export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls']; // 底部栏仅展示公司信息不展示备案号 +export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd']; // 底部栏仅展示公司信息不展示备案号 export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏的项目 -export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts']; // 登录页右下角版本开发基于不展示 -export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls']; // 登录页右下角主体不展示 +export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'hyd', 'designhyd']; // 登录页右下角版本开发基于不展示 +export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd']; // 登录页右下角主体不展示 export const GenerateRouteProjectList = ['jsxt', 'refereeJsxt'];// 需要在公共路由中生成登录页面的项目 -export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts']; // 登录页样式 +export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'hyd', 'designhyd']; // 登录页样式 export const NoQrcodeList = ['heb', 'designheb']; export const goOtherPlatformMenu = { // 导航栏快速切换平台 login: '/design/login', @@ -350,7 +374,9 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台 crsc: '/design/login?project=crsc', designcrsc: '/login?project=crsc', hls: '/design/login?project=hls', - designhls: '/login?project=hls' + designhls: '/login?project=hls', + hyd: '/design/login?project=hyd', + designhyd: '/login?project=hyd' }; export const ProjectList = [ {value:'xty', label:'西铁院'}, diff --git a/src/store/modules/app.js b/src/store/modules/app.js index b73d14ce6..80ea0b6e5 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -9,7 +9,8 @@ const state = { width: document.documentElement.clientWidth, height: document.documentElement.clientHeight, windowSizeCount: 0, - dialogMessage:'' + dialogMessage:'', + transitionAnimationsCount: 0 }; const mutations = { @@ -38,6 +39,9 @@ const mutations = { }, SET_DIALOG_MESSAGE:(state, dialogMessage)=>{ state.dialogMessage = dialogMessage; + }, + SET_TRANSITION_ANIMATIONS:(state) => { + state.transitionAnimationsCount++; } }; @@ -57,11 +61,14 @@ const actions = { } if (opt.height) { commit('SET_HEIGHT', opt.height); - } + } state.windowSizeCount += 1; }, SET_DIALOG_MESSAGE({ commit }, dialogMessage) { commit('SET_DIALOG_MESSAGE', dialogMessage); + }, + transitionAnimations({ commit }, dialogMessage) { + commit('SET_TRANSITION_ANIMATIONS'); } };