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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-07-26 17:43:43 +08:00
commit 36f6b85e57
15 changed files with 77 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/simulation.js
View File

@ -513,3 +513,10 @@ export function queryIscsResourcesByGroup(group, params) {
params params
}); });
} }
/** 获取机器人驾驶参数 */
export function getRobotDrivingParam(simulationId, groupNumber) {
return request({
url: `/simulation/${simulationId}/driveParam/${groupNumber}`,
method: 'get'
});
}

8
src/jmapNew/theme/beijing_01/menus/menuTrain.vue
View File

@ -246,10 +246,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
View File

@ -159,10 +159,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
View File

@ -142,10 +142,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

35
src/jmapNew/theme/components/menus/dialog/setFault.vue
View File

@ -19,15 +19,19 @@
<el-form-item prop="speedLimit" label="限速："> <el-form-item prop="speedLimit" label="限速：">
<el-input v-model="formModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" /> <el-input v-model="formModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
<span>km/h</span> <span>km/h</span>
<el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，-1为取消限速" placement="top-start"> <el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，不填为取消限速" placement="top-start">
<i class="el-icon-warning" /> <i class="el-icon-warning" />
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
<el-form-item prop="driveForward" label="向前行驶："> <el-form-item prop="through" label="">
<el-switch v-model="formModel.driveForward" active-text="是" inactive-text="否" @change="driveForwardChange" /> <el-radio-group v-model="formModel.through">
<el-radio :label="1">越红灯行驶</el-radio>
<el-radio :label="2">越引导行驶</el-radio>
<el-radio :label="0">无</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item prop="targetDeviceCode" label="目的地:"> <el-form-item prop="targetDeviceCode" label="目的地:">
<el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" :disabled="formModel.driveForward" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择"> <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
<el-option <el-option
v-for="item in selectedList" v-for="item in selectedList"
:key="item.code" :key="item.code"
@ -95,6 +99,7 @@ import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config'; import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate'; import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getRobotDrivingParam } from '@/api/simulation';
export default { export default {
name: 'SwitchControl', name: 'SwitchControl',
@ -120,7 +125,7 @@ export default {
form: { faultType: ''}, form: { faultType: ''},
formModel: { formModel: {
speedLimit: '', speedLimit: '',
driveForward: false, through: 0,
targetDeviceCode: '' targetDeviceCode: ''
}, },
groupNumber: '', groupNumber: '',
@ -290,6 +295,11 @@ export default {
if (judge) { if (judge) {
this.judge = judge; this.judge = judge;
this.groupNumber = selected.groupNumber; this.groupNumber = selected.groupNumber;
getRobotDrivingParam(this.$route.query.group, this.groupNumber).then(resp => {
this.formModel.speedLimit = resp.data.speedLimit ? resp.data.speedLimit : '';
this.formModel.through = resp.data.through;
this.formModel.targetDeviceCode = resp.data.targetDeviceCode ? resp.data.targetDeviceCode : '';
});
} }
} }
if (selected._type) { if (selected._type) {
@ -351,10 +361,6 @@ export default {
this.sendCommand(setp); this.sendCommand(setp);
}, },
handleCollocation() { // 设置托管 handleCollocation() { // 设置托管
if (!this.formModel.driveForward && !this.formModel.targetDeviceCode) {
this.$message.error('请选择向前行驶或目的地');
return;
}
const setp = { const setp = {
over: true, over: true,
operation: menuOperate.Common.collocation.operation, operation: menuOperate.Common.collocation.operation,
@ -363,7 +369,7 @@ export default {
groupNumber: this.groupNumber, groupNumber: this.groupNumber,
param: { param: {
speedLimit: this.formModel.speedLimit, speedLimit: this.formModel.speedLimit,
driveForward: this.formModel.driveForward, through: this.formModel.through,
targetDeviceCode: this.formModel.targetDeviceCode targetDeviceCode: this.formModel.targetDeviceCode
} }
} }
@ -402,18 +408,13 @@ export default {
}); });
}, },
deviceSelect(em) { deviceSelect(em) {
if (this.field == 'selectedCode' && em._type == 'Section' && !this.formModel.driveForward) { if (this.field == 'selectedCode' && em._type == 'Section') {
this.formModel.targetDeviceCode = em.code; this.formModel.targetDeviceCode = em.code;
// this.field = ''; // this.field = '';
} else if (this.field == 'selectedCode' && em._type == 'Train' && !this.formModel.driveForward) { } else if (this.field == 'selectedCode' && em._type == 'Train') {
this.formModel.targetDeviceCode = em.code; this.formModel.targetDeviceCode = em.code;
// this.field = ''; // this.field = '';
} }
},
driveForwardChange(val) {
if (val) {
this.formModel.targetDeviceCode = '';
}
} }
} }
}; };

8
src/jmapNew/theme/datie_02/menus/menuTrain.vue
View File

@ -193,10 +193,10 @@ export default {
label: '越红灯行驶', label: '越红灯行驶',
handler: this.handleOverEedLight handler: this.handleOverEedLight
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '驾驶', label: '驾驶',
handler: this.handleDriveTo handler: this.handleDriveTo

8
src/jmapNew/theme/foshan_01/menus/menuTrain.vue
View File

@ -150,10 +150,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
View File

@ -124,10 +124,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
View File

@ -91,10 +91,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
View File

@ -91,10 +91,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
View File

@ -230,10 +230,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
View File

@ -231,10 +231,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/race_01/menus/menuTrain.vue
View File

@ -233,10 +233,10 @@ export default {
label: '确认运行至前方站', label: '确认运行至前方站',
handler: this.nextStation handler: this.nextStation
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '越引导信号行驶', label: '越引导信号行驶',
handler: this.handleOverFuideSignal handler: this.handleOverFuideSignal

8
src/jmapNew/theme/xian_01/menus/menuTrain.vue
View File

@ -175,10 +175,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection

8
src/jmapNew/theme/xian_02/menus/menuTrain.vue
View File

@ -253,10 +253,10 @@ export default {
label: '开关门', label: '开关门',
handler: this.handleOpenOrCloseDoor handler: this.handleOpenOrCloseDoor
}, },
{ // {
label: '限速指令', // label: '限速指令',
handler: this.handleSpeedLimit // handler: this.handleSpeedLimit
}, // },
{ {
label: '换端', label: '换端',
handler: this.handleTurnDirection handler: this.handleTurnDirection