diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index 8d51300ce..08c062b9c 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -285,7 +285,7 @@ class SkinCode extends defaultStyle { this[deviceType.StationStand] = { // 哈尔滨一号线站台元素 站台 站台紧急关闭 扣车元素 停站时间 运行等级 跳停 - elemnetType:['gapStand', 'emergentArrow', 'detainNormal', 'level', 'jump', 'trainStop', 'trainDepart', 'stationPlatform'], + elemnetType:['gapStand', 'emergentArrow', 'detainNormal', 'level', 'jump', 'trainStop', 'trainDepart'], // 站台 gapStand:{ // 层级 @@ -314,13 +314,14 @@ class SkinCode extends defaultStyle { detainNormal:{ z:0, position: 1, // 扣车标识在站台上显示方向 - special:true, + special:false, text: 'H', // 扣车显示内容 insideOffset: { x: 15, y: -28 }, // 内站台扣车偏移量 outsideOffset: { x:15, y: 22 }, // 外站台扣车偏移量 centerTrainColor: '#ff0', // 中心扣车颜色 andCenterTrainColor: '#ff0', // 车站+中心扣车颜色 detainTrainTextColor: '#ff0', // 车站扣除文字颜色 + noDetainTrainColor: '#8D918F', // 无扣车文字颜色 fontSize: 14, // 字体大小 fontWeight: 'bolder', textVerticalAlign: 'middle' // 车站扣车 文字垂直对齐方式 diff --git a/src/jmapNew/shape/graph/StationStand/detain/EDetain.js b/src/jmapNew/shape/graph/StationStand/detain/EDetain.js index d6051f944..ca10c9511 100644 --- a/src/jmapNew/shape/graph/StationStand/detain/EDetain.js +++ b/src/jmapNew/shape/graph/StationStand/detain/EDetain.js @@ -24,6 +24,7 @@ class EDetain extends Group { this.detain = new Text({ zlevel: this.model.zlevel, z: this.model.z, + _subType: 'StandDetain', position: [0, 0], style: { x: detainX, @@ -77,6 +78,9 @@ class EDetain extends Group { } else if (model.ibpHoldTrain) { this.showMode(deviceParam); this.setColor(deviceParam.ibpDetainTrainColor); + } else if (deviceParam.noDetainTrainColor) { + this.showMode(deviceParam); + this.setColor(deviceParam.noDetainTrainColor); } } } diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index f2b7435b2..6849dffb1 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -653,7 +653,7 @@ export default { }); }, handleIbpShow() { - if (this.selectedObj._type == 'StationStand' && this.$store.state.menuOperation.subType == 'StationPlatform') { + if (this.selectedObj._type == 'StationStand' && (this.$store.state.menuOperation.subType == 'StationPlatform' || this.$store.state.menuOperation.subType == 'StandDetain')) { if (!(this.selectedObj.assignSkip || this.selectedObj.allSkip || this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain)) { this.allowCancle = false; } else { diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue index 1f4d7034a..b638e7e00 100644 --- a/src/views/newMap/displayBaSiDi/tmt.vue +++ b/src/views/newMap/displayBaSiDi/tmt.vue @@ -44,9 +44,21 @@