joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

南京二号线问题调整

Browse Source
This commit is contained in:
fan 2021-11-26 17:37:22 +08:00
parent f44bcfabcb
commit 0788172481
7 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -96,7 +96,7 @@ class SkinCode extends defaultStyle {
faultLockColor: '#00FF00', // 区段故障锁定颜色
invalidColor: '#ff0000', // 计轴故障
invalidColor: '', // 计轴故障
undefinedColor: '#0071C1', // 区段未定义颜色
atcExcisionColor: '#A0522D', // 区段atc切除颜色
atsExcisionColor: '#A0522D', // 区段ats切除颜色

2
src/jmapNew/shape/graph/Section/index.js
View File

@ -245,7 +245,7 @@ export default class Section extends Group {
return;
}
this.line && this.line.setStyle({
this.style.Section.line.invalidColor && this.line && this.line.setStyle({
stroke: this.style.Section.line.invalidColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});

2
src/jmapNew/shape/graph/Signal/index.js
View File

@ -995,7 +995,7 @@ class Signal extends Group {
// 只响应前端自定义类型的状态变化
if (this.model.showMode === '05') {
this.eachChild(item => { item.hide(); });
} if (!store.getters['map/checkDeviceShow'](this._code)) {
} else if (!store.getters['map/checkDeviceShow'](this._code)) {
this.eachChild(item => { item.hide(); });
} else if (model._free) {
this.setAshShow();

6
src/jmapNew/theme/components/menus/dialog/setFault.vue
View File

@ -234,9 +234,9 @@ export default {
{label: '反位短闪', value: 'REVERSE_SPLIT'},
{label: '长闪', value: 'SQUEEZE'},
{label: '道岔区段灰显', value: 'SECTION_NO_STATUS'},
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: '红光带故障', value: 'AXLE_FAULT'},
{label: '橙光带故障', value: 'ARB'}
{label: '红光带故障', value: 'CBTC_OCCUPIED_FAULT'},
{label: '紫光带故障', value: 'AXLE_FAULT'},
{label: '计轴受扰', value: 'ARB'}
];
} else if (selected._type === 'Server' && this.popClass === 'nanjing-02__systerm') {
this.faultList = [

1
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -1103,6 +1103,7 @@ export default {
this.securityCommand = '';
this.speedLimitValue = '';
this.secondConfirm = false;
this.dialogVisible = false;
this.overlap = null;
this.cr1Confrim = false;
if (this.oldClickObj) {

69
src/scripts/ProjectConfig.js
View File

@ -57,14 +57,14 @@ export const loginInfo = {
systemType: '011'
},
xzexam:{
title: '城市轨道交通标准化培训软件',
loginPath: '/login?project=xzexam',
loginParam: 'DEFAULT',
loginTitle: '空串',
logoWidth: '140px',
navigationLogoWidth: '120px',
navigationMarginLeft: '140px',
systemType: '011'
title: '城市轨道交通标准化培训软件',
loginPath: '/login?project=xzexam',
loginParam: 'DEFAULT',
loginTitle: '空串',
logoWidth: '140px',
navigationLogoWidth: '120px',
navigationMarginLeft: '140px',
systemType: '011'
},
bjd: {
title: '城市轨道交通列车运行智慧辅助系统',
@ -542,7 +542,25 @@ export const loginInfo = {
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '025'
systemType: '024'
},
designygy: {
title: '扬州工业职业技术学院城市轨道交通设计平台',
loginPath: '/design/login?project=ygy',
loginParam: 'YGY',
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '024'
},
ygy: {
title: '扬州工业职业技术学院城市轨道交通实训平台',
loginPath: '/login?project=ygy',
loginParam: 'YGY',
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '024'
},
designjxgm: {
title: '江西工业贸易职业技术学院城市轨道交通设计平台',
@ -633,7 +651,9 @@ export const ProjectIcon = {
srsandbox: FaviconRichor,
designsrsandbox:FaviconRichor,
jxgm: FaviconRichor,
designjxgm: FaviconRichor
designjxgm: FaviconRichor,
ygy: FaviconRichor,
designygy: FaviconRichor
};
export const ProjectCode = {
@ -676,26 +696,40 @@ export const ProjectCode = {
designsrsandbox: 'SR_SANDBOX',
jxgm: 'JXGM',
designjxgm: 'JXGM',
ygy: 'YGY',
designygy: 'YGY',
hls: 'DEFAULT',
designhls: 'DEFAULT'
};
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo']; // 底部栏仅展示公司信息不展示备案号
/** 底部栏仅展示公司信息不展示备案号 */
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls',
'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo'];
/** 实训设计平台通过项目code获取地图列表的项目 */
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls',
'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor',
'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm',
'ygy', 'designygy'];
/** 案例展示隐藏的项目 */
export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy'];
/** 登录页右下角版本开发基于不展示 */
export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt',
'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm','xzexam']; // 登录页右下角版本开发基于不展示
'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'ygy', 'designygy'];
/** 登录页右下角主体不展示 */
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls',
'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'richor', 'richorlesson3d', 'richorjoint', 'nologo', 'designnologo',
'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm','xzexam']; // 登录页右下角主体不展示
'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'ygy', 'designygy'];
/** 登录页项目 title 登录输入框上方 大字体 加粗居中 */
export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc',
'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc',
'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm','xzexam']; // 登录页样式
'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam',
'ygy', 'designygy'];
/** 登录页 登录输入框无二维码 */
export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];
/** 综合演练 无二维码 */
export const NoSimulationQrCodeList = ['heb', 'bjd'];
export const RegisterCodeList = ['cgy', 'designcgy'];
export const goOtherPlatformMenu = { // 导航栏快速切换平台
/** 导航栏快速切换平台 */
export const goOtherPlatformMenu = {
login: '/design/login',
design: '/login',
xty: '/design/login?project=xty',
@ -762,6 +796,7 @@ export const ProjectList = [
{value: 'sr_sandbox', label: '上饶沙盘'},
{value: 'jxgm', label: '江西工贸' }
];
/** 本地项目打包 */
export const localPackageProject = {
localdesign: 'designheb',
locallogin: 'heb',

2
src/views/newMap/displayBaSiDi/troDetail.vue
View File

@ -141,7 +141,7 @@ export default {
const station = this.stationList.find((item) => {
return item.sn === stationSn;
});
if (station.depot) {
if (station && station.depot) {
this.changeStation(value * 2);
} else if (station) {
this.deviceCode = station.code;