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:
zyy 2020-01-10 17:11:35 +08:00
parent a7b97dd7cc
commit 5d6a994cbc
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/constant/deviceState.js
View File

@ -240,6 +240,8 @@ deviceState[deviceType.StationStand] = {
centerHoldTrain: false, // 中心是否扣车
allSkip: false, // 是否全部跳停
assignSkip: false, // 是否指定跳停
runLevelTime: 0, // 区间运行时间（自动为 0）
// parkingTime: 0, // 停站时间 （自动为-1）
/** 停站时间*/
parkingTime: {

26
src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
View File

@ -9,8 +9,7 @@
<template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column>
</el-table>
<el-checkbox v-model="upForward" label="1" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-checkbox>
<el-checkbox v-model="upReverse" label="2" style="display: block; text-align: left;">反向{{ title }}</el-checkbox>
<el-checkbox v-model="upForward" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-checkbox>
</el-col>
<el-col :span="11" :offset="2">
<span>下行线路设置{{ title }}</span>
@ -20,8 +19,7 @@
<template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column>
</el-table>
<el-checkbox v-model="downForward" label="3" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-checkbox>
<el-checkbox v-model="downReverse" label="4" style="display: block; text-align: left;">反向{{ title }}</el-checkbox>
<el-checkbox v-model="downForward" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-checkbox>
</el-col>
</el-row>
<el-row class="button-group">
@ -60,9 +58,7 @@ export default {
upSelectList: [],
downSelectList: [],
upForward: true, // 上行 正向
upReverse: false, // 上行 反向
downForward: false, // 下行 正向
downReverse: false // 下行 反向
downForward: false // 下行 正向
};
},
computed: {
@ -195,8 +191,8 @@ export default {
operation: OperationEvent.StationStand.setBulkBuckleTrain.menu.operation,
cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL,
param: {
rightHoldTrain: { standCodes: [], forward: this.upForward, reverse: this.upReverse },
leftHoldTrain: { standCodes: [], forward: this.downForward, reverse: this.downReverse }
rightHoldTrain: { standCodes: [], forward: this.upForward },
leftHoldTrain: { standCodes: [], forward: this.downForward }
}
};
this.upSelectList.forEach(item => {
@ -205,10 +201,10 @@ export default {
this.downSelectList.forEach(item => {
operate.param.leftHoldTrain.standCodes.push(item.code);
});
if (!operate.param.rightHoldTrain.forward && !operate.param.rightHoldTrain.reverse) {
if (!operate.param.rightHoldTrain.forward) {
operate.param.rightHoldTrain.standCodes = [];
}
if (!operate.param.leftHoldTrain.forward && !operate.param.leftHoldTrain.reverse) {
if (!operate.param.leftHoldTrain.forward) {
operate.param.leftHoldTrain.standCodes = [];
}
@ -232,8 +228,8 @@ export default {
operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation,
cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL,
param: {
rightHoldTrain: { standCodes: [], forward: this.upForward, reverse: this.upReverse },
leftHoldTrain: { standCodes: [], forward: this.downForward, reverse: this.downReverse }
rightHoldTrain: { standCodes: [], forward: this.upForward },
leftHoldTrain: { standCodes: [], forward: this.downForward }
}
};
this.upSelectList.forEach(item => {
@ -242,10 +238,10 @@ export default {
this.downSelectList.forEach(item => {
operate.param.leftHoldTrain.standCodes.push(item.code);
});
if (!operate.param.rightHoldTrain.forward && !operate.param.rightHoldTrain.reverse) {
if (!operate.param.rightHoldTrain.forward) {
operate.param.rightHoldTrain.standCodes = [];
}
if (!operate.param.leftHoldTrain.forward && !operate.param.leftHoldTrain.reverse) {
if (!operate.param.leftHoldTrain.forward) {
operate.param.leftHoldTrain.standCodes = [];
}

4
src/utils/baseUrl.js
View File

@ -3,11 +3,11 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
} else {
BASE_API = process.env.VUE_APP_BASE_API;
}