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-03 16:01:57 +08:00
parent 308f82c14e
commit 28e0617c87
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
View File

@ -27,7 +27,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import { querySignalStatus } from '@/api/simulation'; // import { querySignalStatus } from '@/api/simulation';
export default { export default {
name: 'SignalMenu', name: 'SignalMenu',
@ -258,10 +258,11 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (valid) { if (valid) {
querySignalStatus(this.group, {signalCode: this.selected.code}).then(resp => { // querySignalStatus(this.group, {signalCode: this.selected.code}).then(resp => {
const tempData = resp.data; // const tempData = resp.data;
const tempData = [];
this.$refs.routeSelection.doShow(step.operation, this.selected, tempData); this.$refs.routeSelection.doShow(step.operation, this.selected, tempData);
}); // });
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(step); this.$refs.noticeInfo.doShow(step);
@ -368,10 +369,11 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => { // querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
const tempData = resp.data; // const tempData = resp.data;
const tempData = [];
this.$refs.routeHandControl.doShow(operate, this.selected, tempData); this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
}); // });
} }
}); });
}, },
@ -388,10 +390,11 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => { // querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
const tempData = resp.data; // const tempData = resp.data;
const tempData = [];
this.$refs.routeHandControl.doShow(operate, this.selected, tempData); this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
}); // });
} }
}); });
}, },
@ -425,10 +428,11 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => { // querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
const tempData = resp.data; // const tempData = resp.data;
const tempData = [];
this.$refs.routeDetail.doShow(operate, this.selected, tempData); this.$refs.routeDetail.doShow(operate, this.selected, tempData);
}); // });
} }
}); });
} }

4
src/scripts/cmdPlugin/MenuContextHandler.js
View File

@ -86,16 +86,13 @@ class MenuContextHandler {
covert(menuList) { covert(menuList) {
const selected = this.getCurrentStateObject(); const selected = this.getCurrentStateObject();
let menu = []; let menu = [];
console.log(selected, 'selected');
const control = this.getStationControl(selected); const control = this.getStationControl(selected);
console.log(control, 'control');
if (control) { if (control) {
if ( this.getPrdType() != '') { if ( this.getPrdType() != '') {
const type = State2SimulationMap[this.getPrdType()]; const type = State2SimulationMap[this.getPrdType()];
// const status = State2ControlMap[control.status]; // 缺少车站控制模式字段 // const status = State2ControlMap[control.status]; // 缺少车站控制模式字段
const status = State2ControlMap['01']; // 缺少车站控制模式字段 const status = State2ControlMap['01']; // 缺少车站控制模式字段
menu = [...menuList[type]]; menu = [...menuList[type]];
console.log(menu, 'menu');
if (menu.constructor === Array) { if (menu.constructor === Array) {
menu.forEach(elem => { menu.forEach(elem => {
if (elem.type === 'separator') { if (elem.type === 'separator') {
@ -120,7 +117,6 @@ class MenuContextHandler {
} }
} }
} }
console.log(menu, '=========212');
return menu; return menu;
// if (menuList.constructor === Array) { // if (menuList.constructor === Array) {

8
src/views/newMap/displayNew/menuDemon.vue
View File

@ -211,10 +211,10 @@ export default {
} }
}, },
async loadSystemTime() { async loadSystemTime() {
const rest = await runDiagramGetTime(this.group); // const rest = await runDiagramGetTime(this.group);
if (rest && rest.code == 200) { // if (rest && rest.code == 200) {
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(rest.data)}`)); // this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(rest.data)}`));
} // }
}, },
change3dname() { change3dname() {
if (this.$route.query.prdType == '04') { if (this.$route.query.prdType == '04') {