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

Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1

Browse Source
This commit is contained in:
fan 2023-02-06 16:11:28 +08:00
commit 33554fd4fb
3 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/jmapNew/theme/datie_02/menus/menuSignal.vue
View File

@ -26,7 +26,7 @@ import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordIn
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import DrawSelect from './dialog/drawSelect'; import DrawSelect from './dialog/drawSelect';
import { EventBus } from '@/scripts/event-bus'; import { EventBus } from '@/scripts/event-bus';
import {UserOperationType} from "../../../../scripts/ConstDic"; import {UserOperationType} from '../../../../scripts/ConstDic';
export default { export default {
name: 'SignalMenu', name: 'SignalMenu',
@ -62,34 +62,40 @@ export default {
label: '办理 通过进路', label: '办理 通过进路',
handler: this.arrangementRoute, handler: this.arrangementRoute,
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
type: 'separator' type: 'separator',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '列车 办理进路', label: '列车 办理进路',
handler: this.arrangementRoute, handler: this.arrangementRoute,
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '取消进路', label: '取消进路',
handler: this.cancelTrainRoute, handler: this.cancelTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '信号重开', label: '信号重开',
handler: this.reopenSignal, handler: this.reopenSignal,
cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '封锁/解封', label: '封锁/解封',
handler: this.lockOrUnlock, handler: this.lockOrUnlock,
cmdType: '', cmdType: '',
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
// cmdType: CMD.Signal.CMD_SIGNAL_BLOCK // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
}, },
@ -97,22 +103,26 @@ export default {
label: '总人解', label: '总人解',
handler: this.humanTrainRoute, handler: this.humanTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE,
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
type: 'separator' type: 'separator',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '引导', label: '引导',
handler: this.guide, handler: this.guide,
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '坡道解锁', label: '坡道解锁',
handler: '', handler: '',
cmdType: '', cmdType: '',
isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
} }
], ],
menuForce: [ menuForce: [

45
src/jmapNew/theme/datie_02/menus/menuSwitch.vue
View File

@ -63,71 +63,86 @@ export default {
label: '定操', label: '定操',
handler: this.locate, handler: this.locate,
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION, cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '反操', label: '反操',
handler: this.reverse, handler: this.reverse,
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION, cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '单锁', label: '单锁',
handler: this.lock, handler: this.lock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '单解', label: '单解',
handler: this.unlock, handler: this.unlock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '道岔钩锁', label: '道岔钩锁',
handler: this.hookLock, handler: this.hookLock,
cmdType: CMD.Switch.CMD_SWITCH_HOOK_LOCK, cmdType: CMD.Switch.CMD_SWITCH_HOOK_LOCK,
isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '封锁/解封', label: '封锁/解封',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '区故解', label: '区故解',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '岔前 分路不良', label: '岔前 分路不良',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '定位 分路不良', label: '定位 分路不良',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '反位 分路不良', label: '反位 分路不良',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '接触网定位无电', label: '接触网定位无电',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '接触网反位无电', label: '接触网反位无电',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '添加调机号', label: '添加调机号',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '删除调机号', label: '删除调机号',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
}, },
{ {
label: '修改调机号', label: '修改调机号',
handle: '' handle: '',
isShow: (section, work) => work === 'dispatchWork'
} }
], ],
menuForce: [ menuForce: [

11
src/views/newMap/display/terminals/abnormalTrain/index.vue
View File

@ -2,12 +2,12 @@
<div> <div>
<el-tabs v-model="activeName" type="card"> <el-tabs v-model="activeName" type="card">
<el-tab-pane label="填写" name="write"> <el-tab-pane label="填写" name="write">
<div class="write-box"> <div class="write-box" :style="{height: boxHeight + 'px'}">
<ControlTable :is-creat="true" @creat="creatData" /> <ControlTable :is-creat="true" @creat="creatData" />
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="查询" name="search"> <el-tab-pane label="查询" name="search">
<div v-if="activeName == 'search'" class="search-box"> <div v-if="activeName == 'search'" class="search-box" :style="{height: boxHeight + 'px'}">
<div v-for="(item, index) in searchList" :key="index" class="search-item"> <div v-for="(item, index) in searchList" :key="index" class="search-item">
<ControlTable :is-creat="false" :info="item" /> <ControlTable :is-creat="false" :info="item" />
</div> </div>
@ -35,6 +35,12 @@ export default {
computed: { computed: {
group() { group() {
return this.$route.query.group; return this.$route.query.group;
},
boxHeight() {
const allH = this.$store.state.app.height;
let h = allH - 103 - 39 - 30 - 41 - 15;
h = h > 0 ? h : 0;
return h;
} }
}, },
watch: { watch: {
@ -57,7 +63,6 @@ export default {
sendCommandNew(this.group, 'KEY_LINK_CONTROL_INFO_SAVE', obj).then((res) => { sendCommandNew(this.group, 'KEY_LINK_CONTROL_INFO_SAVE', obj).then((res) => {
console.log(res, '---res'); console.log(res, '---res');
}).catch(error => { }).catch(error => {
console.log('🚀 ~ file: index.vue:51 ~ sendCommandNew ~ error', error);
this.$messageBox('提交失败：' + error.message); this.$messageBox('提交失败：' + error.message);
}); });
} }