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 2020-04-29 13:00:41 +08:00
commit d65c5c2922
10 changed files with 93 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
View File

@ -84,7 +84,7 @@ export default {
label: '道岔单解', label: '道岔单解',
handler: this.unlock, handler: this.unlock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
}, }
// { // {
// label: '设备标签', // label: '设备标签',
// handler: '', // handler: '',

61
src/jmapNew/theme/xian_02/menus/menuCancel.vue
View File

@ -28,15 +28,30 @@ export default {
}, },
{ {
label: '全部扣车', label: '全部扣车',
handler: this.undeveloped children: [
{
label: '正线上全部扣车',
handler: this.undeveloped
}
]
}, },
{ {
label: '全部发车', label: '全部发车',
handler: this.undeveloped children: [
{
label: '缓解正线所有列车',
handler: this.undeveloped
}
]
}, },
{ {
label: '停止所有列车', label: '停止所有列车',
handler: this.undeveloped children: [
{
label: '停止正线所有列车',
handler: this.undeveloped
}
]
}, },
{ {
label: '车站选择', label: '车站选择',
@ -52,7 +67,16 @@ export default {
}, },
{ {
label: '显示控制', label: '显示控制',
handler: this.undeveloped children: [
{
label: '正线及车辆段',
handler: this.undeveloped
},
{
label: '列车信息',
handler: this.undeveloped
}
]
}, },
{ {
label: '下一窗口', label: '下一窗口',
@ -64,11 +88,38 @@ export default {
}, },
{ {
label: '激活所有菜单', label: '激活所有菜单',
handler: this.undeveloped children: [
{
label: '确认',
handler: this.undeveloped
}
]
}, },
{ {
label: '恢复激活菜单', label: '恢复激活菜单',
handler: this.undeveloped handler: this.undeveloped
},
{
label: '进路模式 - 授权车站',
children: [
{
label: '自动',
handler: this.undeveloped
},
{
label: '人工',
handler: this.undeveloped
}
]
},
{
label: '列车报警确认',
children: [
{
label: '列车完整性报警确认',
handler: this.undeveloped
}
]
} }
] ]
}; };

2
src/jmapNew/theme/xian_02/menus/menuRequest.vue
View File

@ -117,11 +117,9 @@ export default {
if (requestList.length) { if (requestList.length) {
this.commitEachCommand(requestList); this.commitEachCommand(requestList);
} }
// this.doClose();
} }
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
// this.doClose();
// this.$refs.noticeInfo.doShow(operate); // this.$refs.noticeInfo.doShow(operate);
}); });
} }

2
src/jmapNew/theme/xian_02/menus/menuSection.vue
View File

@ -19,7 +19,7 @@ import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum'; import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; // import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from './utils/menuOperate'; import {menuOperate, commitOperate} from './utils/menuOperate';
export default { export default {

28
src/jmapNew/theme/xian_02/menus/menuSwitch.vue
View File

@ -264,7 +264,12 @@ export default {
locate() { locate() {
commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.switchControl.doShow(operate, this.selected); this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.Switch.locate.menu.operation, name: '道岔定位'},
cmdType: CMD.Switch.CMD_SWITCH_TURN,
param: operate.param
});
} }
}); });
}, },
@ -272,7 +277,12 @@ export default {
reverse() { reverse() {
commitOperate(menuOperate.Switch.rpChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.rpChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.switchControl.doShow(operate, this.selected); this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.Switch.reverse.menu.operation, name: '道岔反位'},
cmdType: CMD.Switch.CMD_SWITCH_TURN,
param: operate.param
});
} }
}); });
}, },
@ -280,7 +290,12 @@ export default {
lock() { lock() {
commitOperate(menuOperate.Switch.lock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.lock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.switchControl.doShow(operate, this.selected); this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.Switch.lock.menu.operation, name: '道岔单锁'},
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
param: operate.param
});
} }
}); });
}, },
@ -288,7 +303,12 @@ export default {
unlock() { unlock() {
commitOperate(menuOperate.Switch.unlock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.unlock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.switchUnLock.doShow(operate, this.selected); this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔解锁'},
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
param: operate.param
});
} }
}); });
}, },

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

@ -241,7 +241,12 @@ export default {
}, },
{ {
label: '列车报警确认', label: '列车报警确认',
handler: this.undeveloped children: [
{
label: '完整性报警确认',
handler: this.undeveloped
}
]
}, },
{ {
label: '更新列车计划', label: '更新列车计划',

2
src/views/newMap/displayNew/index.vue
View File

@ -259,7 +259,6 @@ export default {
this.setWindowSize(); this.setWindowSize();
}, },
'$store.state.app.windowSizeCount': function() { '$store.state.app.windowSizeCount': function() {
console.log('windowSizeCount');
this.setWindowSize(); this.setWindowSize();
}, },
$route() { $route() {
@ -281,7 +280,6 @@ export default {
this.clearCheckLogin(); this.clearCheckLogin();
}); });
console.log('mounted');
await this.setWindowSize(); await this.setWindowSize();
await this.initLoadData(); await this.initLoadData();
}, },

2
src/views/newMap/jlmapNew/index.vue
View File

@ -410,7 +410,7 @@ export default {
setShowMode(showMode) { setShowMode(showMode) {
if (this.showMode !== showMode) { if (this.showMode !== showMode) {
this.setShowStation(''); this.setShowStation('');
this.$refs.switchStation.inintShowStation(); this.localStationShow && this.$refs.switchStation.inintShowStation();
} }
this.showMode = showMode; this.showMode = showMode;
const nameList = Object.keys(this.$store.state.map.map || {}); const nameList = Object.keys(this.$store.state.map.map || {});

4
src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
View File

@ -118,8 +118,8 @@
<el-form-item label="侧防列表:"> <el-form-item label="侧防列表:">
<el-select v-model="addModel.flankProtectionList" clearable multiple filterable :placeholder="$t('map.pleaseSelect')"> <el-select v-model="addModel.flankProtectionList" clearable multiple filterable :placeholder="$t('map.pleaseSelect')">
<el-option <el-option
v-for="item in flankProtectList" v-for="(item,index) in flankProtectList"
:key="item.code" :key="index"
:label="`${item.number}-${item.name}`" :label="`${item.number}-${item.name}`"
:value="item.code" :value="item.code"
/> />

2
src/views/newMap/newMapdraft/index.vue
View File

@ -502,6 +502,8 @@ export default {
} }
.back_box{ .back_box{
left: 150px; left: 150px;
display: inline-block;
width: 57px;
} }
.map-draft{ .map-draft{