大铁线路:1.调车进路的总人解 问题修改 2.信号机和信号机按钮宽度调整
3.鼠标光标问题修改
This commit is contained in:
parent
94504d03aa
commit
2d4c5f8cf8
@ -209,7 +209,7 @@ class SkinCode extends defaultStyle {
|
|||||||
borderWidth: 2, // 信号灯边框线宽度
|
borderWidth: 2, // 信号灯边框线宽度
|
||||||
borderColor: 'rgb(85,120,182)', // 信号灯边框线颜色
|
borderColor: 'rgb(85,120,182)', // 信号灯边框线颜色
|
||||||
darkColor:'rgb(85,120,182)', //
|
darkColor:'rgb(85,120,182)', //
|
||||||
radiusR: 7, // 信号灯半径
|
radiusR: 5, // 信号灯半径
|
||||||
grayColor: '#7F7F7F', // 信号灯灰色
|
grayColor: '#7F7F7F', // 信号灯灰色
|
||||||
redColor: '#FF0000', // 信号灯红色
|
redColor: '#FF0000', // 信号灯红色
|
||||||
greenColor: '#00FF00', // 信号灯绿色
|
greenColor: '#00FF00', // 信号灯绿色
|
||||||
@ -264,6 +264,7 @@ class SkinCode extends defaultStyle {
|
|||||||
};
|
};
|
||||||
|
|
||||||
this[deviceType.SignalButton] = {
|
this[deviceType.SignalButton] = {
|
||||||
|
width:12,
|
||||||
guideColor: 'rgb(80,80,255)',
|
guideColor: 'rgb(80,80,255)',
|
||||||
trainColor:'rgb(0,128,0)',
|
trainColor:'rgb(0,128,0)',
|
||||||
strokeColor:'rgb(128,128,128)'
|
strokeColor:'rgb(128,128,128)'
|
||||||
|
@ -953,12 +953,12 @@ class Signal extends Group {
|
|||||||
showRemainTime(number) {
|
showRemainTime(number) {
|
||||||
this.remainTimeName.show();
|
this.remainTimeName.show();
|
||||||
this.remainTimeName && this.remainTimeName.setStyle({ text: number });
|
this.remainTimeName && this.remainTimeName.setStyle({ text: number });
|
||||||
this.model.signalButtonList && this.model.signalButtonList.length && this.model.signalButtonList.forEach(item => {
|
// this.model.signalButtonList && this.model.signalButtonList.length && this.model.signalButtonList.forEach(item => {
|
||||||
const button = store.getters['map/getDeviceByCode'](item);
|
// const button = store.getters['map/getDeviceByCode'](item);
|
||||||
if (button.type === 'PICK') {
|
// if (button.type === 'PICK') {
|
||||||
button && button.instance && button.instance.startAnimate();
|
// button && button.instance && button.instance.startAnimate();
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
if (this.model.type === 'SHUNTING') {
|
if (this.model.type === 'SHUNTING') {
|
||||||
if (!this.style.Signal.dtTextNearSignalOffset) {
|
if (!this.style.Signal.dtTextNearSignalOffset) {
|
||||||
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
|
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
|
||||||
|
@ -93,14 +93,15 @@ export default class SignalButton extends Group {
|
|||||||
.add(circle2)
|
.add(circle2)
|
||||||
.add(circle3);
|
.add(circle3);
|
||||||
} else {
|
} else {
|
||||||
|
const width = this.style.SignalButton && this.style.SignalButton.width ? this.style.SignalButton.width : 14;
|
||||||
this.rectButton = new Rect({
|
this.rectButton = new Rect({
|
||||||
zlevel: this.zlevel,
|
zlevel: this.zlevel,
|
||||||
z: this.z,
|
z: this.z,
|
||||||
shape: {
|
shape: {
|
||||||
x: computedPosition.x,
|
x: computedPosition.x,
|
||||||
y: computedPosition.y,
|
y: computedPosition.y,
|
||||||
width: 14,
|
width:width,
|
||||||
height: 14
|
height: width
|
||||||
},
|
},
|
||||||
style: {
|
style: {
|
||||||
lineDash: null,
|
lineDash: null,
|
||||||
@ -110,7 +111,7 @@ export default class SignalButton extends Group {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (this.style.SignalButton && this.style.SignalButton.strokeColor) {
|
if (this.style.SignalButton && this.style.SignalButton.strokeColor) {
|
||||||
this.rectButton.setStyle("stroke",this.style.SignalButton.strokeColor)
|
this.rectButton.setStyle('stroke', this.style.SignalButton.strokeColor);
|
||||||
}
|
}
|
||||||
this.add(this.rectButton);
|
this.add(this.rectButton);
|
||||||
}
|
}
|
||||||
@ -315,6 +316,7 @@ export default class SignalButton extends Group {
|
|||||||
this.arcShapeDock2 && this.arcShapeDock2.hide();
|
this.arcShapeDock2 && this.arcShapeDock2.hide();
|
||||||
} else {
|
} else {
|
||||||
if (model.hasSelected) {
|
if (model.hasSelected) {
|
||||||
|
debugger;
|
||||||
if (this.style.SignalButton && this.style.SignalButton.selectColor) {
|
if (this.style.SignalButton && this.style.SignalButton.selectColor) {
|
||||||
this.rectButton && this.rectButton.setStyle({fill:this.style.SignalButton.selectColor});
|
this.rectButton && this.rectButton.setStyle({fill:this.style.SignalButton.selectColor});
|
||||||
} else {
|
} else {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<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()">
|
<button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: xGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockRightButtonDown()">
|
||||||
<span style="color: #800000">
|
<span style="color: #800000">
|
||||||
<center><b>X引导总锁</b></center>
|
<center><b>X引导总锁</b></center>
|
||||||
@ -160,7 +160,7 @@ export default {
|
|||||||
guideColorUp: '#DCDCDC',
|
guideColorUp: '#DCDCDC',
|
||||||
buttonDownColor: '#FEEE1A',
|
buttonDownColor: '#FEEE1A',
|
||||||
buttonUpColor: '#DCDCDC',
|
buttonUpColor: '#DCDCDC',
|
||||||
width: 78,
|
width: 75,
|
||||||
tempData: null,
|
tempData: null,
|
||||||
offset: {},
|
offset: {},
|
||||||
commandTypeList: [],
|
commandTypeList: [],
|
||||||
@ -343,6 +343,7 @@ export default {
|
|||||||
if (dom) {
|
if (dom) {
|
||||||
dom.disabled = true;
|
dom.disabled = true;
|
||||||
dom.style.backgroundColor = this.buttonDownColor;
|
dom.style.backgroundColor = this.buttonDownColor;
|
||||||
|
// dom.style.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -887,6 +888,15 @@ export default {
|
|||||||
float: left;
|
float: left;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
height: 35px;
|
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 {
|
.menu {
|
||||||
background-color: $bg;
|
background-color: $bg;
|
||||||
|
Loading…
Reference in New Issue
Block a user