joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

大铁线路:1.调车进路的总人解 问题修改 2.信号机和信号机按钮宽度调整

Browse Source 
3.鼠标光标问题修改
This commit is contained in:
joylink_cuiweidong 2022-08-12 13:23:38 +08:00
parent 94504d03aa
commit 2d4c5f8cf8
4 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ class SkinCode extends defaultStyle {
borderWidth: 2, // 信号灯边框线宽度
borderColor: 'rgb(85,120,182)', // 信号灯边框线颜色
darkColor:'rgb(85,120,182)', //
radiusR: 7, // 信号灯半径
radiusR: 5, // 信号灯半径
grayColor: '#7F7F7F', // 信号灯灰色
redColor: '#FF0000', // 信号灯红色
greenColor: '#00FF00', // 信号灯绿色
@ -264,6 +264,7 @@ class SkinCode extends defaultStyle {
};
this[deviceType.SignalButton] = {
width:12,
guideColor: 'rgb(80,80,255)',
trainColor:'rgb(0,128,0)',
strokeColor:'rgb(128,128,128)'

12
src/jmapNew/shape/graph/Signal/index.js
View File

@ -953,12 +953,12 @@ class Signal extends Group {
showRemainTime(number) {
this.remainTimeName.show();
this.remainTimeName && this.remainTimeName.setStyle({ text: number });
this.model.signalButtonList && this.model.signalButtonList.length && this.model.signalButtonList.forEach(item => {
const button = store.getters['map/getDeviceByCode'](item);
if (button.type === 'PICK') {
button && button.instance && button.instance.startAnimate();
}
});
// this.model.signalButtonList && this.model.signalButtonList.length && this.model.signalButtonList.forEach(item => {
// const button = store.getters['map/getDeviceByCode'](item);
// if (button.type === 'PICK') {
// button && button.instance && button.instance.startAnimate();
// }
// });
if (this.model.type === 'SHUNTING') {
if (!this.style.Signal.dtTextNearSignalOffset) {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);

32
src/jmapNew/shape/graph/SignalButton/index.js
View File

@ -93,14 +93,15 @@ export default class SignalButton extends Group {
.add(circle2)
.add(circle3);
} else {
const width = this.style.SignalButton && this.style.SignalButton.width ? this.style.SignalButton.width : 14;
this.rectButton = new Rect({
zlevel: this.zlevel,
z: this.z,
shape: {
x: computedPosition.x,
y: computedPosition.y,
width: 14,
height: 14
width:width,
height: width
},
style: {
lineDash: null,
@ -109,9 +110,9 @@ export default class SignalButton extends Group {
fill: fillColor
}
});
if (this.style.SignalButton && this.style.SignalButton.strokeColor){
this.rectButton.setStyle("stroke",this.style.SignalButton.strokeColor)
}
if (this.style.SignalButton && this.style.SignalButton.strokeColor) {
this.rectButton.setStyle('stroke', this.style.SignalButton.strokeColor);
}
this.add(this.rectButton);
}
this.leftLine = new Line({
@ -252,19 +253,19 @@ export default class SignalButton extends Group {
if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') {
color = '#808080';
} else if (this.model.type === 'GUIDE') {
if (this.style.SignalButton && this.style.SignalButton.guideColor){
color = this.style.SignalButton.guideColor;
}else{
color = '#5050E1';
}
if (this.style.SignalButton && this.style.SignalButton.guideColor) {
color = this.style.SignalButton.guideColor;
} else {
color = '#5050E1';
}
} else if (list.includes(this.model.type)) {
color = '#ccc';
} else {
if (this.style.SignalButton && this.style.SignalButton.trainColor){
color = this.style.SignalButton.trainColor;
}else{
color = '#008000';
}
if (this.style.SignalButton && this.style.SignalButton.trainColor) {
color = this.style.SignalButton.trainColor;
} else {
color = '#008000';
}
}
return color;
} //
@ -315,6 +316,7 @@ export default class SignalButton extends Group {
this.arcShapeDock2 && this.arcShapeDock2.hide();
} else {
if (model.hasSelected) {
debugger;
if (this.style.SignalButton && this.style.SignalButton.selectColor) {
this.rectButton && this.rectButton.setStyle({fill:this.style.SignalButton.selectColor});
} else {

14
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -1,5 +1,5 @@
<template>
<div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height: 35px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
<div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height:40px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
<button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: xGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockRightButtonDown()">
<span style="color: #800000">
<center><b>X引导总锁</b></center>
@ -160,7 +160,7 @@ export default {
guideColorUp: '#DCDCDC',
buttonDownColor: '#FEEE1A',
buttonUpColor: '#DCDCDC',
width: 78,
width: 75,
tempData: null,
offset: {},
commandTypeList: [],
@ -343,6 +343,7 @@ export default {
if (dom) {
dom.disabled = true;
dom.style.backgroundColor = this.buttonDownColor;
// dom.style.
}
}
},
@ -887,6 +888,15 @@ export default {
float: left;
font-size: 13px;
height: 35px;
cursor: pointer;
border-bottom-width: 1px;
border-top-width: 1px;
border-right-width: 1px;
border-left-width: 1px;
box-shadow: 2px 1px 3px #111010;
margin-left: 3px;
padding-left:3px;
padding-right:3px;
}
.menu {
background-color: $bg;