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:
fan 2022-12-12 17:00:23 +08:00
parent a3791a0cbf
commit 1fbd8b5824
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
View File

@ -193,7 +193,7 @@ export default {
}, },
// 请求遥控 // 请求遥控
conterCommit() { conterCommit() {
commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 1).then(({valid, operate})=>{
if (valid) { if (valid) {
this.doClose(); this.doClose();
this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由站控转为中控:\n' + this.stationName); this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由站控转为中控:\n' + this.stationName);
@ -202,7 +202,7 @@ export default {
}, },
// 请求站控 // 请求站控
requestCommit() { requestCommit() {
commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 1).then(({valid, operate})=>{
if (valid) { if (valid) {
this.doClose(); this.doClose();
this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName); this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
@ -211,7 +211,7 @@ export default {
}, },
// 紧急站控 // 紧急站控
emergencyCommit() { emergencyCommit() {
commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 1).then(({valid, operate})=>{
if (valid) { if (valid) {
this.doClose(); this.doClose();
this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName); this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);

1
src/jmapNew/theme/beijing_01/menus/menuStation.vue
View File

@ -151,6 +151,7 @@ export default {
initMenu() { initMenu() {
this.menu = []; this.menu = [];
this.menuNormal.forEach(menuItem => { this.menuNormal.forEach(menuItem => {
console.log(this.selected, this.work, '------');
menuItem.show = menuItem.isShow && menuItem.isShow(this.selected, this.work); menuItem.show = menuItem.isShow && menuItem.isShow(this.selected, this.work);
menuItem.disabled = !judgeStationControl(this.selected.code, this.selected.stationCode, this.work) || (menuItem.isDisabled && menuItem.isDisabled(this.selected, this.work)); menuItem.disabled = !judgeStationControl(this.selected.code, this.selected.stationCode, this.work) || (menuItem.isDisabled && menuItem.isDisabled(this.selected, this.work));
this.menu.push(menuItem); this.menu.push(menuItem);

5
src/views/newMap/display/trainingDesign/createDraftTraining.vue
View File

@ -160,10 +160,11 @@ export default {
}, },
doCreate() { doCreate() {
this.$refs.dataform.validateForm(() => { this.$refs.dataform.validateForm(() => {
this.$refs.form.validate(valid => {
if (valid) {
const cpData = Object.assign({}, this.formModel); const cpData = Object.assign({}, this.formModel);
cpData.client = this.tagForm.client; cpData.client = this.tagForm.client;
cpData.labelJson = JSON.stringify(this.tagForm.dynamicTags); cpData.labelJson = JSON.stringify(this.tagForm.dynamicTags);
console.log(cpData, '----------');
let api = updateTraining; let api = updateTraining;
let mes = '编辑'; let mes = '编辑';
if (this.isCreate) { if (this.isCreate) {
@ -178,6 +179,8 @@ export default {
this.$message.error('获取实训详情信息失败！'); this.$message.error('获取实训详情信息失败！');
this.$message.error(`${mes}实训失败！，${err.message}`); this.$message.error(`${mes}实训失败！，${err.message}`);
}); });
}
});
}); });
}, },
doClose() { doClose() {