diff --git a/README-zh.md b/README-zh.md index 34d864f21..698b9f2f2 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,3 +1,3 @@ # jl-nclient - +showMode 01 行调&现地;02 行调; 03 现地; 04 大屏; 05 轨道预览; Copyright (c) 2018-present Joylink diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index 92a273335..d3df2226d 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -81,6 +81,8 @@ class SkinCode extends defaultStyle { line: { z: 0, width: 5, // 区段宽度 + troWidth: 2, // 轨道总览区段宽度 + troColor: '#c0c0c0', // 轨道总览区段颜色 beyondWidth: 0, // 区段宽超出宽度 invadeColor: '#EF0C08', // 区段侵入颜色 routeBlockFlashing: true, // 进路锁闭且封锁时闪烁 @@ -259,10 +261,10 @@ class SkinCode extends defaultStyle { }, transmission: { // 传输信号机 fillColor: '#f00', - fillColorVirtual: '#000080', + fillColorVirtual: '#000080', sideLength: 20, textColor: '#fff', - strokeColor: '#00FFFF', + strokeColor: '#00FFFF' } }; @@ -933,7 +935,7 @@ class SkinCode extends defaultStyle { // textFill: '#fff' // } // }; - this[deviceType.IndicatorLight] = {}; + this[deviceType.IndicatorLight] = {}; } } diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index dea35f8c7..781d725f6 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -6,7 +6,7 @@ import EblockLines from './EblockLines'; // 区段封锁特有 import ESeparator from './ESeparator'; // 分隔符 (私有) import EMouse from './EMouse'; import EAxle from './EAxle'; // 创建计轴 -import EDerailer from './EDerailer'; //脱轨器 +import EDerailer from './EDerailer'; // 脱轨器 // import { EBackArrow, EBackArrowTriangle } from './EBackArrow'; // 折返进路箭头 import EBackArrowGroup from './EBackArrow'; // 折返进路箭头 import ELimitName from './ELimitName'; // 成都三号线 限速名称 @@ -14,41 +14,40 @@ import ELimitName from './ELimitName'; // 成都三号线 限速名称 import { drawSectionStyle } from '../../config/defaultStyle'; import EStopRouteImg from './EStopRouteImg'; import EBadShunt from './EBadShunt'; -import store from '@/store/index'; -const exec = (f,...args) => { f && f(...args); }; +const exec = (f, ...args) => { f && f(...args); }; const DerailerMap = { - 0: (derailer, style) => { - derailer.show(); - derailer.setTextStyle({textFill: 'green'}); - derailer.setSymbolStyle({fill: 'red'}); - }, - 1: (derailer, style) => { - derailer.show(); - derailer.setTextStyle({textFill: 'yellow'}); - derailer.setSymbolStyle({fill: 'red'}); - }, - 2: (derailer, style) => { - derailer.show(); - derailer.setTextStyle({textFill: 'green'}); - derailer.setSymbolStyle({fill: 'green'}); - }, - 3: (derailer, style) => { - derailer.show(); - derailer.setTextStyle({textFill: 'yellow'}); - derailer.setSymbolStyle({fill: 'green'}); - }, - 4: (derailer, style) => { - derailer.show(); - derailer.setTextStyle({textFill: 'red'}); - derailer.setSymbolStyle({fill: 'red'}); - }, - 5: (derailer, style) => { - derailer.show(); - derailer.setTextStyle({textFill: 'red'}); - derailer.setSymbolStyle({fill: 'gray'}); - } -} + 0: (derailer, style) => { + derailer.show(); + derailer.setTextStyle({textFill: 'green'}); + derailer.setSymbolStyle({fill: 'red'}); + }, + 1: (derailer, style) => { + derailer.show(); + derailer.setTextStyle({textFill: 'yellow'}); + derailer.setSymbolStyle({fill: 'red'}); + }, + 2: (derailer, style) => { + derailer.show(); + derailer.setTextStyle({textFill: 'green'}); + derailer.setSymbolStyle({fill: 'green'}); + }, + 3: (derailer, style) => { + derailer.show(); + derailer.setTextStyle({textFill: 'yellow'}); + derailer.setSymbolStyle({fill: 'green'}); + }, + 4: (derailer, style) => { + derailer.show(); + derailer.setTextStyle({textFill: 'red'}); + derailer.setSymbolStyle({fill: 'red'}); + }, + 5: (derailer, style) => { + derailer.show(); + derailer.setTextStyle({textFill: 'red'}); + derailer.setSymbolStyle({fill: 'gray'}); + } +}; /** 区段*/ export default class Section extends Group { @@ -67,6 +66,7 @@ export default class Section extends Group { this.create(); this.createMouseEvent(); this.setState(model); + this.setShowMode(); } create() { @@ -99,7 +99,7 @@ export default class Section extends Group { 'speedLimitName': ELimitName, // 限速线名称 'shuttleBack': EBackArrowGroup, // 折返箭头 (成都三号线显示) 'badShunt':EBadShunt, // 大铁项目 分路不良 - 'derailer': EDerailer + 'derailer': EDerailer }; // 遍历当前线路下的绘图元素 const model = this.model; @@ -141,7 +141,7 @@ export default class Section extends Group { // this.line.setRunLineDefault(); } this.name && this.name.recover(); - this.derailer && this.derailer.hide(); + this.derailer && this.derailer.hide(); this.speedLimit && this.speedLimit.hide(); this.speedLimitName && this.speedLimitName.hide(); this.badShunt && this.badShunt.hide(); @@ -465,8 +465,8 @@ export default class Section extends Group { model.faultLock && this.faultLock(); // 设置灰显 model.noStatus && this.setAshShow(); - // 设置脱轨器 - model.signalDerailer && exec(DerailerMap[model.signalDerailer], this.derailer, this.style); + // 设置脱轨器 + model.signalDerailer && exec(DerailerMap[model.signalDerailer], this.derailer, this.style); /** 道岔区段更新岔心颜色 */ if (model.type === '03' && model.switch) { @@ -573,7 +573,14 @@ export default class Section extends Group { mouseover() { this.line && this.line.setStyle({ stroke: 'rgba(255,255,255,0.8)' }); } - setShowMode() { } + setShowMode() { + if (this.model.showMode === '05') { + this.line.setStyle({stroke: this.style.Section.line.troColor, lineWidth: this.style.Section.line.troWidth}); + if (this.model.type === '05') { + this.line.hide(); + } + } + } setShowStation(stationCode) { if (!stationCode || this.model.stationCode === stationCode) { this.eachChild(item => { diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index fdec3adfb..f679a9461 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -31,6 +31,7 @@ export default class Switch extends Group { this.createMouseEvent(); this.setState(model); this.checkIsDrawMap(); + this.setShowMode(); } createMouseEvent() { @@ -722,7 +723,7 @@ export default class Switch extends Group { // this.interlockingReserved(); // 联锁预留道岔 model.preReset && this.preReset(model.normalPosition, model.reversePosition); // 道岔预复位 - if (this.style.Switch.sectionAction.flag) { // 哈尔滨线路处理道岔相关区段颜色 + if (this.style.Switch.sectionAction.flag && this.model.showMode !== '05') { // 哈尔滨线路处理道岔相关区段颜色 const switchModel = this.mapDevice[model.code]; const sectionB = this.mapDevice[switchModel.sectionBCode]; sectionB && sectionB.instance && sectionB.instance.setState(sectionB); @@ -797,7 +798,13 @@ export default class Switch extends Group { this.on('mouseover', () => { this.highlight.mouseover(); }); } } - setShowMode() {} + setShowMode() { + if ( this.model.showMode === '05') { + this.eachChild(item => { + item.hide(); + }); + } + } setShowStation(stationCode) { if (!stationCode || this.model.stationCode === stationCode) { this.eachChild(item => { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 3d8412a75..b10fad3d0 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -79,7 +79,7 @@ 车次号修改 车次号删除 车次号创建 - 车次号步进 + 车次号步进 diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue index 60df9049b..f4b736d5f 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue @@ -2,7 +2,6 @@
@@ -10,10 +9,10 @@ diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/tro.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/tro.vue new file mode 100644 index 000000000..4e240473b --- /dev/null +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/tro.vue @@ -0,0 +1,76 @@ + + + + diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue index 6cb8d97cc..f36aeaa4a 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue @@ -93,7 +93,7 @@
背投
车场
-
轨道
+
轨道
系统
列车
@@ -171,6 +171,7 @@ + @@ -187,6 +188,7 @@ import AlarmTableHmi from './menuDialog/alarmTableHmi'; import AlarmTableLow from './menuDialog/alarmTableLow'; import TrainControl from './dialog/trainControl'; import RpsDialog from './dialog/rps'; +import TroDialog from './dialog/tro'; import LogDetail from './menuDialog/logDetail'; export default { @@ -196,7 +198,8 @@ export default { AlarmTableHmi, TrainControl, LogDetail, - RpsDialog + RpsDialog, + TroDialog }, props: { selected: { @@ -483,6 +486,9 @@ export default { rpsClick() { this.$refs.rpsDialog.doShow(); }, + troClick() { + this.$refs.troDialog.doShow(); + }, controlAudio(val) { const audio = document.getElementById('buzzer'); this.sound = val; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 648fd20ce..11702c286 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 - BASE_API = 'http://192.168.3.120:9000'; // 张赛 + // BASE_API = 'http://192.168.3.120:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康