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 13:30:59 +08:00
commit 50bf7d7a63
18 changed files with 78 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -450,7 +450,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -168,7 +168,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -346,7 +346,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -151,7 +151,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -317,7 +317,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -16,8 +16,18 @@
<el-row>
<el-form ref="form" :model="formModel" :rules="rules">
<el-col :span="24">
<el-form-item prop="speedLimit" label="限速：">
<el-input v-model="formModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
<span>km/h</span>
<el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，-1为取消限速" placement="top-start">
<i class="el-icon-warning" />
</el-tooltip>
</el-form-item>
<el-form-item prop="driveForward" label="向前行驶：">
<el-switch v-model="formModel.driveForward" active-text="是" inactive-text="否" @change="driveForwardChange" />
</el-form-item>
<el-form-item prop="targetDeviceCode" label="目的地:">
<el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
<el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" :disabled="formModel.driveForward" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
<el-option
v-for="item in selectedList"
:key="item.code"
@ -109,6 +119,8 @@ export default {
faultList: [],
form: { faultType: ''},
formModel: {
speedLimit: '',
driveForward: false,
targetDeviceCode: ''
},
groupNumber: '',
@ -146,7 +158,7 @@ export default {
} else if (this.operation == OperationEvent.MixinCommand.cancelStoppage.menu.operation) {
return '取消故障';
} else if (this.operation == OperationEvent.MixinCommand.collocation.menu.operation) {
return '驾驶至';
return '驾驶';
}
return '';
}
@ -339,14 +351,22 @@ export default {
this.sendCommand(setp);
},
handleCollocation() { // 设置托管
if (!this.formModel.driveForward && !this.formModel.targetDeviceCode) {
this.$message.error('请选择向前行驶或目的地');
return;
}
const setp = {
over: true,
operation: menuOperate.Common.collocation.operation,
cmdType: menuOperate.Common.collocation.cmdType,
param: {
groupNumber: this.groupNumber,
param: {
speedLimit: this.formModel.speedLimit,
driveForward: this.formModel.driveForward,
targetDeviceCode: this.formModel.targetDeviceCode
}
}
};
this.sendCommand(setp);
},
@ -382,13 +402,18 @@ export default {
});
},
deviceSelect(em) {
if (this.field == 'selectedCode' && em._type == 'Section') {
if (this.field == 'selectedCode' && em._type == 'Section' && !this.formModel.driveForward) {
this.formModel.targetDeviceCode = em.code;
// this.field = '';
} else if (this.field == 'selectedCode' && em._type == 'Train') {
} else if (this.field == 'selectedCode' && em._type == 'Train' && !this.formModel.driveForward) {
this.formModel.targetDeviceCode = em.code;
// this.field = '';
}
},
driveForwardChange(val) {
if (val) {
this.formModel.targetDeviceCode = '';
}
}
}
};

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

@ -71,16 +71,16 @@
<center><b>道岔解封</b></center>
</span>
</button>
<button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">
<span style="color: black">
<center><b>点灯</b></center>
</span>
</button>
<button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">
<span style="color:#800000">
<center><b>灭灯</b></center>
</span>
</button>
<!-- <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">-->
<!-- <span style="color: black">-->
<!-- <center><b>点灯</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">-->
<!-- <span style="color:#800000">-->
<!-- <center><b>灭灯</b></center>-->
<!-- </span>-->
<!-- </button>-->
<button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
<span style="color: #800000">
<center><b>S引导总锁</b></center>

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

@ -197,10 +197,10 @@ export default {
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '驾驶至',
// handler: this.handleDriveTo
// },
{
label: '驾驶',
handler: this.handleDriveTo
},
{
label: '换端',
handler: this.handleTurnDirection
@ -549,7 +549,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

4
src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
View File

@ -191,7 +191,7 @@ export default {
handler: this.handleOverEedLight
},
// {
// label: '驾驶至',
// label: '驾驶',
// handler: this.handleDriveTo
// },
{
@ -536,7 +536,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -159,7 +159,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -330,7 +330,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -133,7 +133,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -325,7 +325,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -100,7 +100,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -295,7 +295,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -100,7 +100,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -294,7 +294,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -239,7 +239,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -406,7 +406,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -240,7 +240,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -406,7 +406,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -254,7 +254,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -519,7 +519,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -184,7 +184,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -464,7 +464,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

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

@ -262,7 +262,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -436,7 +436,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

2
src/scripts/cmdPlugin/CommandHandler.js
View File

@ -46,7 +46,7 @@ class CommandHandle {
// },
Train_Trust: {
operate: 'Train_Trust',
paramList:[{name: 'groupNumber'}, {name: 'targetDeviceCode'}],
paramList:[{name: 'groupNumber'}, {name: 'param'}],
simulationRole: 'Center',
controlMode: ['OperateCenterControl'],
conditionList: []

9
src/views/system/configLine/config.vue
View File

@ -116,7 +116,8 @@ export default {
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber',
'railway'
'railway',
'SFUCanOnlyApplyForFaultLockSection'
],
selectList: ['runMode', 'singleApproachLockCancelRoute'],
generalConfig: [
@ -166,7 +167,8 @@ export default {
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber',
'railway'
'railway',
'SFUCanOnlyApplyForFaultLockSection'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -222,7 +224,8 @@ export default {
tripNumberIsUnique: '运行图中车次号是否唯一',
standTbStrategyIsInvalid: '站台折返策略不生效',
updateTripPlanByServiceNumber: '根据服务号更新车次计划',
railway: '大铁线路'
railway: '大铁线路',
SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段'
}
};
},