From 078817248162259e9809125201876ac07c5d52e9 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 26 Nov 2021 17:37:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/nanjing_02.js | 2 +- src/jmapNew/shape/graph/Section/index.js | 2 +- src/jmapNew/shape/graph/Signal/index.js | 2 +- .../components/menus/dialog/setFault.vue | 6 +- .../theme/nanjing_02/menus/menuButton.vue | 1 + src/scripts/ProjectConfig.js | 69 ++++++++++++++----- src/views/newMap/displayBaSiDi/troDetail.vue | 2 +- 7 files changed, 60 insertions(+), 24 deletions(-) diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index 5a3f96766..03699bcd8 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -96,7 +96,7 @@ class SkinCode extends defaultStyle { faultLockColor: '#00FF00', // 区段故障锁定颜色 - invalidColor: '#ff0000', // 计轴故障 + invalidColor: '', // 计轴故障 undefinedColor: '#0071C1', // 区段未定义颜色 atcExcisionColor: '#A0522D', // 区段atc切除颜色 atsExcisionColor: '#A0522D', // 区段ats切除颜色 diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index 98c345c8a..f102f273c 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -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 }); diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index 1fdef025f..153d5e8f3 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -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(); diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index ead9ba555..f9fbd99c9 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -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 = [ diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 5442191d1..ad5c45d87 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -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) { diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index f5011cc02..ee647e1aa 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -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', diff --git a/src/views/newMap/displayBaSiDi/troDetail.vue b/src/views/newMap/displayBaSiDi/troDetail.vue index a68ec30d5..684e79b40 100644 --- a/src/views/newMap/displayBaSiDi/troDetail.vue +++ b/src/views/newMap/displayBaSiDi/troDetail.vue @@ -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;