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

BUG 160: 宁波一：控制模式（按钮）处缺少紧急站控

Browse Source
This commit is contained in:
fan 2021-02-02 17:54:40 +08:00
parent 1729082bac
commit 18dcc3b089
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
View File

@ -17,12 +17,14 @@
<span v-else-if="scope.row.controlMode == 'Local'">站控</span>
<!-- <span v-else-if="scope.row.controlMode == 'Local' && $route.query.prdType == '02'">中心请求站控</span>
<span v-else-if="scope.row.controlMode == 'Center' && $route.query.prdType == '01'">现地请求遥控</span> -->
<span v-else-if="scope.row.controlMode == 'Emergency'">紧急站控</span>
<span v-else>获取状态中...</span>
</template>
</el-table-column>
</el-table>
</el-col>
<el-col :span="6" :offset="1">
<el-radio v-model="controlMode" label="emergency" :disabled="disabledAll" style="margin-bottom: 8px">紧急站控</el-radio>
<el-radio v-model="controlMode" label="center" :disabled="disabledAll" style="margin-bottom: 8px;">请求站控</el-radio>
<el-radio v-model="controlMode" label="local" :disabled="disabledAll">请求遥控</el-radio>
</el-col>
@ -84,6 +86,8 @@ export default {
return OperationEvent.StationControl.requestCentralControl.choose.domId;
} else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
return OperationEvent.StationControl.requestStationControl.choose.domId;
} else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
return OperationEvent.StationControl.emergencyStationControl.choose.domId;
}
return '';
},
@ -92,6 +96,8 @@ export default {
return OperationEvent.StationControl.requestCentralControl.confirm.domId;
} else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
return OperationEvent.StationControl.requestStationControl.confirm.domId;
} else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
return OperationEvent.StationControl.emergencyStationControl.confirm.domId;
}
return '';
},
@ -202,6 +208,8 @@ export default {
this.controlMode = 'local';
} else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
this.controlMode = 'center';
} else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
this.controlMode = 'emergency';
}
}
this.dialogShow = true;
@ -275,6 +283,9 @@ export default {
} else if (this.controlMode == 'local') {
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
} else if (this.controlMode == 'emergency') {
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
operate.operation = OperationEvent.StationControl.emergencyStationControl.confirm.operation;
}
this.loading = true;

22
src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
View File

@ -33,6 +33,11 @@ export default {
menu: [],
menuNormal: {
Local: [
{
label: '紧急站控',
handler: this.setEmergencyControl,
cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
},
{
label: '请求站控',
handler: this.setStationControl,
@ -45,6 +50,11 @@ export default {
}
],
Center: [
{
label: '紧急站控',
handler: this.setEmergencyControl,
cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
},
{
label: '请求站控',
handler: this.setStationControl,
@ -112,7 +122,7 @@ export default {
},
setCenterControl() {
// 请求中控（遥控）
commitOperate(menuOperate.StationControl.requestCentralControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.stationControl.doShow(operate, this.selected);
}
@ -120,7 +130,15 @@ export default {
},
setStationControl() {
// 请求站控
commitOperate(menuOperate.StationControl.requestStationControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.stationControl.doShow(operate, this.selected);
}
});
},
setEmergencyControl() {
// 紧急站控
commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode: this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.stationControl.doShow(operate, this.selected);
}

2
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -902,7 +902,7 @@ export default {
minDuration: 8,
operateType: 'Station_Set_Turn_Back_Strategy',
skinCode: '06',
trainingName: '设置折返策略({26})({31})',
trainingName: '设置折返策略({32})({31})',
trainingRemark: '设置折返策略',
trainingType: 'Station',
productTypes: ['02'],