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:
fan 2020-04-01 14:30:39 +08:00
commit b1a80173b3
6 changed files with 2 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/jmapNew/theme/beijing_01/menus/menuButton.vue
View File

@ -444,33 +444,6 @@ export default {
Handler.clear();
this.$store.dispatch('menuOperation/setButtonOperation', null);
}
// 按钮按下时
// if (this.$store.state.menuOperation.buttonOperation) {
// const model = this.$store.state.menuOperation.selected;
// if (model && model._type) {
// // const deviceType = MapDeviceType[model._type];
// const operate = {
// send: true,
// model: model,
// code: model.code,
// // type: deviceType.type,
// operation: this.$store.state.menuOperation.buttonOperation,
// tempData: this.tempData
// };
// this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
// if (valid) {
// if (response) {
// this.tempData = response.data;
// }
// }
// });
// } else {
// Handler.clear();
// this.$store.dispatch('menuOperation/setButtonOperation', null);
// }
// }
}
}
};

1
src/jmapNew/theme/foshan_01/menus/menuSection.vue
View File

@ -16,7 +16,6 @@ import SpeedLimitControl from './dialog/speedLimitControl';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from './utils/menuOperate';

1
src/jmapNew/theme/foshan_01/menus/menuSignal.vue
View File

@ -29,7 +29,6 @@ import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import {menuOperate, commitOperate} from './utils/menuOperate';
// import { querySignalStatus } from '@/api/simulation';
export default {
name: 'SignalMenu',

1
src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
View File

@ -22,7 +22,6 @@ import StandRunLevel from './dialog/standRunLevel';
import StandStopTime from './dialog/standStopTime';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import StandDetainTrainAll from './dialog/standDetainTrainAll';
// import Handler from '@/scripts/cmdPlugin/Handler';
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';

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

@ -33,35 +33,6 @@ class MenuContextHandler {
return store.state.training.prdType;
}
// menuFiltration(menuList) {
// const selected = this.getCurrentStateObject();
// let menu = [];
// const control = this.getStationControl(selected);
// if (control) {
// if ( this.getPrdType() != '') {
// const type = State2SimulationMap[this.getPrdType()];
// const status = State2ControlMap[control.status];
// menu = [...menuList[type]];
// if (menu.constructor === Array) {
// menu.forEach(elem => {
// if (elem.type === 'separator') {
// elem.show = true;
// return;
// }
// if (elem.auth.constructor === Object) {
// elem.show = true;
// if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示
// elem.show = false;
// }
// elem.defaultDisabled = !elem.auth[status];
// }
// });
// }
// }
// }
// return menu;
// }
// 判断指令是否隐藏
checkDisabled(data, selected) {
let result = false;
@ -82,8 +53,6 @@ class MenuContextHandler {
}
}
});
// 特殊处理哈尔滨线的虚拟信号机操作( 因为哈尔滨虚拟信号机有些操作没有 )
// 待处理
result = !result;
}
return result;

4
src/views/newMap/displayNew/menuTrainList.vue
View File

@ -19,11 +19,11 @@
size="50%"
>
<div class="menuTrainList">
<el-table :data="trainList" height="100%" @row-click="selectTrain">
<el-table :data="trainList" height="100%" :highlight-current-row="true" @row-click="selectTrain">
<el-table-column property="groupNumber" label="车组号" width="130" />
<el-table-column property="serviceNumber" label="表号" width="130" />
<el-table-column property="tripNumber" label="车次号" width="130" />
<!-- <el-table-column property="right" label="是否上行" width="90" /> -->
<!-- <el-table-column property="right" label="是否上行" width="90" /> -->
</el-table>
</div>
</el-drawer>