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:
joylink_cuiweidong 2020-03-17 17:59:47 +08:00
parent 03d85d705c
commit d8d143ae38
9 changed files with 11 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/config/skinCode/bejing_01.js
View File

@ -326,7 +326,6 @@ class SkinCode extends defaultStyle {
// show: true // 公里标名称显示
// },
kmPostShow: true, // 公里标显示
functionButtonShow: '03', // 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
kilometerPosition: 'down', // 公里标位置
fontWeight: 'bold', // 文字错细
text: {

1
src/jmapNew/config/skinCode/chengdu_01.js
View File

@ -322,7 +322,6 @@ class SkinCode extends defaultStyle {
// show: true // 公里标名称显示
// },
kmPostShow: false, // 公里标显示
functionButtonShow: '03', // 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
kilometerPosition: 'up', // 公里标朝向
text: {
fontSize: 11, // 字体大小

1
src/jmapNew/config/skinCode/chengdu_03.js
View File

@ -303,7 +303,6 @@ class SkinCode extends defaultStyle {
// show: true // 公里标名称显示
// },
kmPostShow: false, // 公里标显示
functionButtonShow: '03', // 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
kilometerPosition: 'up', // 公里标朝向
text: {
fontSize: 11, // 字体大小

1
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -305,7 +305,6 @@ class SkinCode extends defaultStyle {
// show: true // 公里标名称显示
// },
kmPostShow: true, // 公里标显示
functionButtonShow: '03', // 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
kilometerPosition: 'up', // 公里标朝向
text: {
fontSize: 11, // 字体大小

3
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -320,7 +320,6 @@ class SkinCode extends defaultStyle {
// show: true // 公里标名称显示
// },
kmPostShow: true, // 公里标显示
functionButtonShow: '03', // 功能灯按钮（引导总锁）显示条件
kilometerPosition: 'up', // 公里标朝向
text: {
borderShow: true, // 车站包围框显示
@ -397,7 +396,7 @@ class SkinCode extends defaultStyle {
},
sectionAction: {
flag: true, // 道岔 关联区段显示
spareColor: '#5b5b5b', // 区段显示颜色 (灰色)
spareColor: '#5b5b5b' // 区段显示颜色 (灰色)
},
core: {
splice: true, // 哈尔滨特殊显示

1
src/jmapNew/config/skinCode/ningbo_01.js
View File

@ -326,7 +326,6 @@ class SkinCode extends defaultStyle {
// show: true // 公里标名称显示
// },
kmPostShow: false, // 公里标显示
functionButtonShow: '03', // 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
kilometerPosition: 'up', // 公里标朝向
text: {
fontSize: 11, // 字体大小

54
src/jmapNew/shape/Station/index.js
View File

@ -10,7 +10,7 @@ import EArrow from './EArrow';
import { arrow } from '../utils/ShapePoints';
import Rect from 'zrender/src/graphic/shape/Rect';
import BoundingRect from 'zrender/src/core/BoundingRect';
import {isShowThePrdType} from '../../utils/handlePath';
// import {isShowThePrdType} from '../../utils/handlePath';
export default class Station extends Group {
constructor(model, style) {
@ -24,12 +24,6 @@ export default class Station extends Group {
this.isShowShape = true;
this.create();
this.createTurnBack(); // 创建按图折返
if (isShowThePrdType(model.prdType, style.Station.functionButtonShow) || model.previewOrMapDraw) {
this.createGuideTotalLock(); // 创建引导总锁
}
if (model.previewOrMapDraw) {
this.setShowMode();
}
this.createControlMode();
this.setState(model);
this.checkIsDrawMap();
@ -112,42 +106,6 @@ export default class Station extends Group {
}
}
}
createGuideTotalLock() { // 创建引导总锁
const model = this.model;
const style = this.style;
if (model.guideTotalLock) {
this.guideLamp = new EControl({
zlevel: this.zlevel,
z: 1000,
arc: {
shape: {
cx: model.guideTotalLockPoint.x,
cy: model.guideTotalLockPoint.y,
r: style.Station.lamp.radiusR
},
subType: 'GuideLamp',
lineWidth: 0,
fill: style.Station.lamp.guideColor,
onmouseover: this.guideMouseOver,
onmouseout: this.guideMouseOut
},
text: {
position: [0, 0],
x: model.guideTotalLockPoint.x,
y: model.guideTotalLockPoint.y + style.Station.lamp.radiusR + style.Station.StationControl.text.distance,
fontWeight: style.Station.text.fontWeight,
fontSize: style.Station.text.fontSize,
fontFamily: style.fontFamily,
text: '引导总锁',
textFill: '#fff',
textAlign: 'middle',
textVerticalAlign: 'top'
},
style: this.style
});
this.add(this.guideLamp);
}
}
createTurnBack() { // 创建按图折返
const model = this.model;
const style = this.style;
@ -369,16 +327,6 @@ export default class Station extends Group {
this.on('mouseover', () => { this.EMouse.mouseover(); });
}
}
// 设置显示模式
setShowMode() {
const showMode = this.model.showMode;
const showConditions = this.style.Station.functionButtonShow;
if (!showConditions || showConditions === '01' || showMode === showConditions) {
this.guideLamp && this.guideLamp.show();
} else {
this.guideLamp && this.guideLamp.hide();
}
}
setShowStation(flag) {
if (flag) {
this.eachChild(item => {

11
src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
View File

@ -187,8 +187,8 @@ export default {
}
case OperationEvent.MixinCommand.totalCancel.button.operation: {
if (selectType.stationHoldTrain || selectType.centerHoldTrain) {
// 站台总取消 (取消扣车)
this.cancleStandTotal(selectType);
// 取消扣车
this.cancleDetainTrainByLow(selectType);
}
break;
}
@ -257,15 +257,16 @@ export default {
}
});
},
/** 站台总取消 */
cancleStandTotal(selectType) {
/** 取消扣车 */
cancleDetainTrainByLow(selectType) {
const operate = {
start: true,
over: true,
operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
param:{
standCode:selectType.code
},
cmdType: CMD.Stand.CMD_STAND_TOTAL_CANCLE
cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {

12
src/views/newMap/newMapdraft/mapoperate/station.vue
View File

@ -146,8 +146,6 @@ export default {
// controlled:false,
createControlMode:false,
createTurnBack:false,
guideTotalLock: false,
guideTotalLockPoint: {x: 0, y: 0}, // 引导总锁坐标
turnBackPoint: {x: 0, y: 0}, // 按图折返坐标
controlModePoint: { x: 0, y: 0 } // 控制模式坐标
},
@ -225,11 +223,6 @@ export default {
{ prop: 'turnBackPoint', label: '按图折返坐标:', type: 'coordinate', width: '120px', isHidden: !this.isPointsShow, children: [
{ prop: 'turnBackPoint.x', firstLevel: 'turnBackPoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
{ prop: 'turnBackPoint.y', firstLevel: 'turnBackPoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
] },
{ prop: 'guideTotalLock', label: '引导总锁:', type: 'checkbox'},
{ prop: 'guideTotalLockPoint', label: '引导总锁坐标:', type: 'coordinate', width: '120px', isHidden: !this.isGuidePointsShow, children: [
{ prop: 'guideTotalLockPoint.x', firstLevel: 'guideTotalLockPoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
{ prop: 'guideTotalLockPoint.y', firstLevel: 'guideTotalLockPoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
] }
]
},
@ -279,9 +272,6 @@ export default {
isPointsShow() {
return this.editModel.createTurnBack;
},
isGuidePointsShow() {
return this.editModel.guideTotalLock;
},
isZcCode() {
return this.editModel.centralized;
}
@ -429,8 +419,6 @@ export default {
// controlled: false,
chargeStationCodeList:[],
createControlMode: item.control,
guideTotalLock: false,
guideTotalLockPoint: {x: 0, y: 0},
createTurnBack: false,
turnBackPoint: {x: 0, y: 0} // 按图折返坐标
};