From 87a9235304f1568499a6ba6e3b82e4b206594c80 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 9 Nov 2021 15:28:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=97=E8=BD=A6=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E5=8F=B7&=E5=88=A0=E9=99=A4=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/bejing_01.js | 14 +- src/jmapNew/config/skinCode/chengdu_01.js | 4 +- src/jmapNew/config/skinCode/chengdu_03.js | 2 +- src/jmapNew/config/skinCode/foshan_01.js | 2 +- src/jmapNew/config/skinCode/haerbin_01.js | 2 +- src/jmapNew/config/skinCode/nanjing_02.js | 2 +- src/jmapNew/config/skinCode/ningbo_01.js | 2 +- src/jmapNew/config/skinCode/xian_02.js | 4 +- src/jmapNew/shape/graph/TrainWindow/EMouse.js | 14 +- src/jmapNew/shape/graph/TrainWindow/index.js | 7 +- .../components/menus/dialog/trainControl.vue | 402 +++++++++--------- .../theme/components/utils/menuOperate.js | 2 +- .../fuzhou_01/menus/dialog/trainDelete.vue | 10 +- .../theme/fuzhou_01/menus/menuTrain.vue | 23 +- 14 files changed, 247 insertions(+), 243 deletions(-) diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index 94354546d..6275f77d2 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -6,8 +6,8 @@ class SkinCode extends defaultStyle { super(); this.fontFamily = '宋体'; this[deviceType.Section] = { - elemnetType:['name', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit'], - preAxleIgnoreFault: true, + elemnetType:['name', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit'], + preAxleIgnoreFault: true, active: { routeColor: false // 进路触发颜色 }, @@ -83,7 +83,7 @@ class SkinCode extends defaultStyle { borderBackgroundColor: '#22DFDF', textShadowColor: '#22DFDF', nameShow: true, - nameBackgroundColor: '#000', + nameBackgroundColor: '#000', lineDash: [3, 3], lineWidthMore: 2.5 }, @@ -126,7 +126,7 @@ class SkinCode extends defaultStyle { }, trainPosition:{ display: false // 列车实时位置显示 - } + } }; this[deviceType.Signal] = { @@ -351,7 +351,7 @@ class SkinCode extends defaultStyle { mouseOverStyle: { borderLineColor: '#FFFFFF', borderLineDash: [3, 3], - standBackgroundColor: 'rgba(0,0,0,0)' + standBackgroundColor: 'rgba(0,0,0,0)' }, // reentry: {}, // 站台折返策略 common: { // 通用属性 @@ -608,7 +608,7 @@ class SkinCode extends defaultStyle { lineDash: [3, 3], // 车次窗虚线间隔 lineWidth: 1, // 车次窗线宽 trainWindowSmooth: 0.01, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 @@ -765,7 +765,7 @@ class SkinCode extends defaultStyle { }; this[deviceType.FloodGate] = {}; this[deviceType.DirectionRod] = {}; - this[deviceType.IndicatorLight] = {}; + this[deviceType.IndicatorLight] = {}; } } diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index dbd3950f7..852a84947 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -549,7 +549,7 @@ class SkinCode extends defaultStyle { lineDash: null, // 车次窗虚线间隔 lineWidth: 1, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 @@ -699,7 +699,7 @@ class SkinCode extends defaultStyle { }; this[deviceType.FloodGate] = {}; this[deviceType.DirectionRod] = {}; - this[deviceType.IndicatorLight] = {}; + this[deviceType.IndicatorLight] = {}; } } diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 202f71bd2..1e026a9e6 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -746,7 +746,7 @@ class SkinCode extends defaultStyle { lineDash: null, // 车次窗虚线间隔 lineWidth: 1, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js index 4a0d18837..28331a08f 100644 --- a/src/jmapNew/config/skinCode/foshan_01.js +++ b/src/jmapNew/config/skinCode/foshan_01.js @@ -581,7 +581,7 @@ class SkinCode extends defaultStyle { lineDash: null, // 车次窗虚线间隔 lineWidth: 1, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 999039334..19646e185 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -630,7 +630,7 @@ class SkinCode extends defaultStyle { lineDash: null, // 车次窗虚线间隔 lineWidth: 1, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index 32358d6aa..36130b90a 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -703,7 +703,7 @@ class SkinCode extends defaultStyle { lineDash: null, // 车次窗虚线间隔 lineWidth: 1, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index 48bee6fef..c9a7f9454 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -663,7 +663,7 @@ class SkinCode extends defaultStyle { lineDash: [3], // 车次窗虚线间隔 lineWidth: 0.5, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index a32dfb12b..091a11515 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -604,7 +604,7 @@ class SkinCode extends defaultStyle { lineDash: null, // 车次窗虚线间隔 lineWidth: 1, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: true // 车次窗是否显示 + show: false // 车次窗是否显示 }; this[deviceType.NoOneReturn] = { displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） @@ -849,7 +849,7 @@ class SkinCode extends defaultStyle { }; this[deviceType.FloodGate] = {}; this[deviceType.DirectionRod] = {}; - this[deviceType.IndicatorLight] = {}; + this[deviceType.IndicatorLight] = {}; } } diff --git a/src/jmapNew/shape/graph/TrainWindow/EMouse.js b/src/jmapNew/shape/graph/TrainWindow/EMouse.js index 24c0dc460..0d790f839 100644 --- a/src/jmapNew/shape/graph/TrainWindow/EMouse.js +++ b/src/jmapNew/shape/graph/TrainWindow/EMouse.js @@ -4,13 +4,13 @@ export default class EMouse { } mouseover(e) { - // if (this.device.prdType) { - // this.device.setVisible(true); - // const instance = this.device.getInstanceByCode(this.device.model.sectionCode); - // if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) { - // instance.mouseEvent.mouseEnter(e); - // } - // } + if (this.device.prdType) { + this.device.setVisible(true); + const instance = this.device.getInstanceByCode(this.device.model.sectionCode); + if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) { + instance.mouseEvent.mouseEnter(e); + } + } } mouseout(e) { diff --git a/src/jmapNew/shape/graph/TrainWindow/index.js b/src/jmapNew/shape/graph/TrainWindow/index.js index b697755df..2d9914968 100644 --- a/src/jmapNew/shape/graph/TrainWindow/index.js +++ b/src/jmapNew/shape/graph/TrainWindow/index.js @@ -70,10 +70,10 @@ class TrainWindow extends Group { setState(model) { // if (!this.isShowShape) return; - if (this.model.showMode) { + if (this.model.showMode != '02' || !this.style.TrainWindow.show) { this.eachChild(item => { item.hide(); }); - } else if (!store.getters['map/checkDeviceShow'](this._code)) { - this.trainRect && this.trainRect.hide(); + // } else if (!store.getters['map/checkDeviceShow'](this._code)) { + // this.trainRect && this.trainRect.hide(); } else if (model._tro) { this.trainRect && this.trainRect.hide(); } else { @@ -83,7 +83,6 @@ class TrainWindow extends Group { setVisible(show) { this.trainRect && this.trainRect.setStyle('lineWidth', show ? 1 : 0); - } getInstanceByCode(code) { diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue index afdd1ef5d..a69d37618 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue @@ -1,108 +1,108 @@