Merge remote-tracking branch 'origin/test'

This commit is contained in:
program-walker 2020-06-16 15:20:22 +08:00
commit e03e85939d
2 changed files with 8 additions and 6 deletions

View File

@ -70,7 +70,7 @@ export const loginInfo = { // 页面title & 退出登录跳转路径
title: '城市轨道交通实训平台',
loginPath: '/jyd/login',
loginTitle: 'jyd',
bottomColumn: '联系电话: 13289398171',
bottomColumn: '',
bottomIcon: Bottom_Jyd,
linkIcon: Link_Jyd
},
@ -78,7 +78,7 @@ export const loginInfo = { // 页面title & 退出登录跳转路径
title: '城市轨道交通设计平台',
loginTitle: 'jyd',
loginPath: '/designjyd/login',
bottomColumn: '联系电话: 13289398171',
bottomColumn: '',
bottomIcon: Bottom_Jyd,
linkIcon: Link_Jyd
}
@ -116,7 +116,8 @@ export const ProjectCode = {
export const BottomColumnOnlyConInfo = ['hyd', 'designhyd', 'jyd', 'designjyd']; // 底部栏仅展示公司信息不展示备案号
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['hyd', 'designhyd']; // 案例展示隐藏的项目
export const VersionBaseNoShow = ['hyd', 'designhyd']; // 登录页右下角版本开发基于不展示展示
export const VersionBaseNoShow = ['hyd', 'designhyd']; // 登录页右下角版本开发基于不展示
export const MainBodyNoShow = ['hyd', 'designhyd', 'jyd', 'designjyd']; // 登录页右下角主体不展示
export const GenerateRouteProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'jsxt', 'refereeJsxt', 'jyd', 'designjyd'];// 需要在公共路由中生成登录页面的项目&登录页样式
export const goOtherPlatformMenu = { // 导航栏快速切换平台
login: '/design/login',

View File

@ -92,7 +92,7 @@
</el-form>
</div>
<float-part v-if="isProject && !versionBaseNoShow.includes(project)" />
<div v-if="!versionBaseNoShow.includes(project)" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;"><span>主体北京玖琏科技有限公司 备案号京ICP备18028522号</span></div>
<div v-if="!mainBodyNoShow.includes(project)" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;"><span>主体北京玖琏科技有限公司 备案号京ICP备18028522号</span></div>
</div>
</template>
@ -106,7 +106,7 @@ import { getLoginWmurl, checkLoginStatus } from '@/api/login';
import { LoginParams } from '@/utils/login';
import bgImg from '@/assets/bg1.jpg';
import { UrlConfig } from '@/scripts/ConstDic';
import { loginInfo, ProjectIcon, GenerateRouteProjectList, VersionBaseNoShow} from '@/scripts/ProjectConfig';
import { loginInfo, ProjectIcon, GenerateRouteProjectList, VersionBaseNoShow, MainBodyNoShow} from '@/scripts/ProjectConfig';
import { removeToken } from '@/utils/auth';
import LangStorage from '@/utils/lang';
import FloatPart from './floatPart';
@ -160,7 +160,8 @@ export default {
path: '/trainingPlatform',
lang: 'zh',
language: '中文',
versionBaseNoShow: VersionBaseNoShow
versionBaseNoShow: VersionBaseNoShow,
mainBodyNoShow: MainBodyNoShow
};
},
computed: {