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

Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
fan 2019-10-22 14:28:41 +08:00
commit e89211a873
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmap/shape/StationStand/index.js
View File

@ -250,6 +250,7 @@ class StationStand extends Group {
/** 中心+车站扣车*/
standAndCenterDetainTrain() {
this.detain && this.detain.show();
this.detain && this.detain.setColor(this.style.StationStand.detainCar.andCenterTrainColor);
}
/** 人工设置停战时间*/

20
src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
View File

@ -240,12 +240,16 @@ export const MenuDisabledState = {
// 设置扣车
setDetainTrain() {
const device = getCurrentStateObject();
if (store.state.training.prdType == '02') {
if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) {
if (store.state.training.prdType == '02') { // 中心行调模式
if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
return true;
} else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) {
return true;
}
} else {
if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) {
} else { // 现地模式
if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
return true;
} else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) {
return true;
}
}
@ -254,11 +258,15 @@ export const MenuDisabledState = {
cancelDetainTrain() {
const device = getCurrentStateObject();
if (store.state.training.prdType == '02') {
if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) {
if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
return false;
} else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) {
return true;
}
} else {
if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) {
if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
return false;
} else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) {
return true;
}
}

4
src/views/lesson/trainingrecord/category/draft.vue
View File

@ -176,7 +176,7 @@ export default {
}
if (node && node.data) {
switch (node.data.type) {
case 'trainingType':
case 'TrainingType':
if (node.parent) {
this.operateModel.type = node.data.id;
this.operateModel.prdCode = node.parent.data.id;
@ -196,7 +196,7 @@ export default {
this.operateModel.operateType = '';
this.operationList = this.trainingOperateTypeMap[node.data.id] || [];
break;
case 'training':
case 'Training':
if (node.parent && node.parent.parent) {
this.operateModel.type = node.parent.data.id;
this.operateModel.prdCode = node.parent.parent.data.id;

1
src/views/lesson/trainingrecord/category/operateMenu.vue
View File

@ -84,7 +84,6 @@ export default {
doShow(point) {
this.closeEvent();
if (this.$refs && this.$refs.popMenu) {
console.log('22222222333')
this.$refs.popMenu.resetShowPosition(point);
}
this.menuShow = true;