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-07-22 14:20:12 +08:00
commit 8c7a78a545
23 changed files with 420 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
View File

@ -5,6 +5,7 @@
<switch-control ref="switchControl" pop-class="beijing-01__systerm" />
<speed-limit-control ref="speedLimitControl" />
<alxe-effective ref="alxeEffective" />
<switch-hook-lock ref="switchHookLock" pop-class="beijing-01__systerm" />
<notice-info ref="noticeInfo" pop-class="beijing-01__systerm" />
<set-fault ref="setFault" pop-class="beijing-01__systerm" />
</div>
@ -17,6 +18,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SpeedLimitControl from './dialog/speedLimitControl';
import AlxeEffective from './dialog/alxeEffective';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
@ -35,7 +37,8 @@ export default {
SpeedLimitControl,
AlxeEffective,
NoticeInfo,
SetFault
SetFault,
SwitchHookLock
},
props: {
selected: {
@ -90,13 +93,15 @@ export default {
menuForce: [
{
label: '设置故障',
handler: this.setStoppage,
cmdType: CMD.Fault.CMD_SET_FAULT
handler: this.setStoppage
},
{
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -281,6 +286,10 @@ export default {
this.$refs.alxeEffective.doShow(operate, this.selected);
}
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();

34
src/jmapNew/theme/beijing_01/menus/menuTrain.vue
View File

@ -228,6 +228,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -341,7 +349,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
// 限速行驶
limitSpeed() {
const operate = {

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

@ -4,6 +4,7 @@
<notice-info ref="noticeInfo" pop-class="chengdou-01__system" />
<switch-control ref="switchControl" pop-class="chengdou-01__system" />
<create-device-label ref="createDeviceLabel" />
<switch-hook-lock ref="switchHookLock" pop-class="chengdou-01__system" />
<set-fault ref="setFault" pop-class="chengdou-01__system" />
</div>
</template>
@ -14,6 +15,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import CreateDeviceLabel from './dialog/createDeviceLabel';
import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import CancelMouseState from '@/mixin/CancelMouseState';
import { mapGetters } from 'vuex';
@ -29,7 +31,8 @@ export default {
NoticeInfo,
CreateDeviceLabel,
SwitchControl,
SetFault
SetFault,
SwitchHookLock
},
mixins: [
CancelMouseState
@ -121,13 +124,15 @@ export default {
menuForce: [
{
label: '设置故障',
handler: this.setStoppage,
cmdType: CMD.Fault.CMD_SET_FAULT
handler: this.setStoppage
},
{
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -262,6 +267,10 @@ export default {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();

34
src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
View File

@ -141,6 +141,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -248,7 +256,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
// 限速行驶
limitSpeed() {
const operate = {

19
src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
View File

@ -4,6 +4,7 @@
<section-control ref="sectionControl" pop-class="chengdou-03__systerm" />
<switch-control ref="switchControl" pop-class="chengdou-03__systerm" />
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
<switch-hook-lock ref="switchHookLock" pop-class="chengdou-03__systerm" />
<set-fault ref="setFault" pop-class="chengdou-03__systerm" />
</div>
</template>
@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import CancelMouseState from '@/mixin/CancelMouseState';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
@ -28,7 +30,8 @@ export default {
SectionControl,
SwitchControl,
NoticeInfo,
SetFault
SetFault,
SwitchHookLock
},
mixins: [
CancelMouseState
@ -93,13 +96,15 @@ export default {
menuForce: [
{
label: '设置故障',
handler: this.setStoppage,
cmdType: CMD.Fault.CMD_SET_FAULT
handler: this.setStoppage
},
{
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -230,6 +235,10 @@ export default {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();

34
src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
View File

@ -124,6 +124,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -228,7 +236,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
// 限速行驶
limitSpeed() {
const operate = {

13
src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
View File

@ -4,6 +4,7 @@
<switch-control ref="switchControl" pop-class="foshan-01__systerm" />
<switch-un-lock ref="switchUnLock" />
<speed-limit-control ref="speedLimitControl" />
<switch-hook-lock ref="switchHookLock" pop-class="foshan-01__systerm" />
<notice-info ref="noticeInfo" pop-class="foshan-01__systerm" />
<set-fault ref="setFault" pop-class="foshan-01__systerm" />
</div>
@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchUnLock from './dialog/switchUnLock';
import SpeedLimitControl from './dialog/speedLimitControl';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@ -31,7 +33,8 @@ export default {
SwitchUnLock,
SpeedLimitControl,
NoticeInfo,
SetFault
SetFault,
SwitchHookLock
},
props: {
selected: {
@ -90,6 +93,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -301,6 +308,10 @@ export default {
}).catch(error=>{
this.$refs.noticeInfo.doShow({}, error.message);
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
},
// 设置临时限速
// setSpeed() {

34
src/jmapNew/theme/foshan_01/menus/menuTrain.vue
View File

@ -133,6 +133,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -238,7 +246,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
// 限速行驶
limitSpeed() {
const step = {

19
src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
View File

@ -5,6 +5,7 @@
<switch-cmd-control ref="switchCmdControl" />
<speed-cmd-control ref="speedCmdControl" />
<notice-info ref="noticeInfo" pop-class="fuzhou-01__systerm" />
<switch-hook-lock ref="switchHookLock" pop-class="fuzhou-01__systerm" />
<set-fault ref="setFault" pop-class="fuzhou-01__systerm" />
</div>
</template>
@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchCmdControl from './dialog/switchCmdControl';
import SpeedCmdControl from './dialog/speedCmdControl';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
@ -31,7 +33,8 @@ export default {
SwitchCmdControl,
SpeedCmdControl,
NoticeInfo,
SetFault
SetFault,
SwitchHookLock
},
props: {
selected: {
@ -158,13 +161,15 @@ export default {
menuForce: [
{
label: this.$t('menu.menuSwitch.setFault'),
handler: this.setStoppage,
cmdType:CMD.Fault.CMD_SET_FAULT
handler: this.setStoppage
},
{
label: this.$t('menu.menuSwitch.cancelFault'),
handler: this.cancelStoppage,
cmdType:CMD.Fault.CMD_CANCEL_FAULT
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -329,6 +334,10 @@ export default {
this.$refs.speedCmdControl.doShow(operate, this.selected);
}
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
}
}
};

34
src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
View File

@ -101,6 +101,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -221,7 +229,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
// 限速行驶
limitSpeed() {
const step = {

13
src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
View File

@ -2,6 +2,7 @@
<div>
<pop-menu ref="popMenu" :menu="menu" pop-menu-class="haerbin-01__systerm" />
<notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
<switch-hook-lock ref="switchHookLock" pop-class="haerbin-01__systerm" />
<set-fault ref="setFault" pop-class="haerbin-01__systerm" />
</div>
</template>
@ -10,6 +11,7 @@
import PopMenu from '@/components/PopMenu';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
@ -22,7 +24,8 @@ export default {
components: {
PopMenu,
NoticeInfo,
SetFault
SetFault,
SwitchHookLock
},
props: {
selected: {
@ -51,6 +54,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -115,6 +122,10 @@ export default {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
}
}
};

32
src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
View File

@ -72,6 +72,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -190,6 +198,30 @@ export default {
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});

13
src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
View File

@ -5,6 +5,7 @@
<switch-un-lock ref="switchUnLock" />
<speed-limit-control ref="speedLimitControl" />
<alxe-effective ref="alxeEffective" />
<switch-hook-lock ref="switchHookLock" pop-class="ningbo-01__systerm" />
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
<set-fault ref="setFault" pop-class="ningbo-01__systerm" />
</div>
@ -17,6 +18,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchUnLock from './dialog/switchUnLock';
import SpeedLimitControl from './dialog/speedLimitControl';
import AlxeEffective from './dialog/alxeEffective';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
@ -34,7 +36,8 @@ export default {
SpeedLimitControl,
AlxeEffective,
NoticeInfo,
SetFault
SetFault,
SwitchHookLock
},
props: {
selected: {
@ -137,6 +140,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -289,6 +296,10 @@ export default {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
}
}
};

34
src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
View File

@ -216,6 +216,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -321,7 +329,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
// 限速行驶
limitSpeed() {
const operate = {

17
src/jmapNew/theme/xian_01/menus/menuSwitch.vue
View File

@ -102,12 +102,12 @@ export default {
label: '道岔取消限速',
handler: this.cancelSpeed,
cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
},
{
label: '道岔钩锁',
handler: this.hookLock,
cmdType:CMD.Switch.CMD_SWITCH_HOOK_LOCK
}
// {
// label: '道岔钩锁',
// handler: this.hookLock,
// cmdType:CMD.Switch.CMD_SWITCH_HOOK_LOCK
// }
],
Center: [
{
@ -179,7 +179,7 @@ export default {
{
label: '道岔钩锁',
handler: this.hookLock
},
}
]
};
},
@ -337,11 +337,6 @@ export default {
},
// 道岔钩锁
hookLock() {
// commitOperate(menuOperate.Switch.hookLock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
// if (valid) {
// this.$refs.switchHookLock.doShow(operate, this.selected);
// }
// });
this.$refs.switchHookLock.doShow(this.selected);
}
}

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

@ -5,6 +5,7 @@
<switch-un-lock ref="switchUnLock" />
<speed-limit-control ref="speedLimitControl" />
<notice-info ref="noticeInfo" pop-class="xian-02__system" />
<switch-hook-lock ref="switchHookLock" pop-class="xian-02__system" />
<set-fault ref="setFault" pop-class="xian-02__system" />
</div>
</template>
@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchUnLock from './dialog/switchUnLock';
import SpeedLimitControl from './dialog/speedLimitControl';
import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
@ -31,7 +33,8 @@ export default {
SwitchUnLock,
SpeedLimitControl,
NoticeInfo,
SetFault
SetFault,
SwitchHookLock
},
props: {
selected: {
@ -151,6 +154,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -318,6 +325,10 @@ export default {
switchCode: this.selected.code
}
});
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();

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

@ -230,6 +230,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
}
],
menuSpeed: [
@ -338,7 +346,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
handleOverEedLight() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
},
// 限速行驶
limitSpeed() {
const operate = {

2
src/views/designPlatform/bigScreen.vue
View File

@ -188,7 +188,7 @@ export default {
</script>
<style lang="scss" scoped>
.map-view {
float: left;
// float: left;
width: auto;
overflow: hidden;
}

6
src/views/newMap/chatView/chatBox.vue
View File

@ -44,7 +44,7 @@
<div class="record_tip_cancle" @click="cancleRecording()">取消</div>
</div>
</div>
<chat-member-list ref="chatMemberList" :current-member-list="currentMemberListData" />
<chat-member-list ref="chatMemberList" :current-member-list="currentMemberList" />
</div>
<div class="chat-box-footer">
<div v-if="isShow">
@ -144,10 +144,6 @@ export default {
};
},
watch:{
'currentMemberList':(val)=>{
debugger;
this.currentMemberListData = val;
},
'$store.state.map.mapViewLoadedCount':function(val) {
const object = document.querySelector('.menuButton');
if (object) {

12
src/views/newMap/chatView/chatContent.vue
View File

@ -2,19 +2,19 @@
<div class="chatcontentIn">
<div class="chatcontentInner">
<div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
<!-- <div :class="chatContent.userId?'rightUser':'leftUser'">
<div :class="chatContent.self?'rightUser':'leftUser'">
<div class="userHeader">
<div v-if="!chatContent.self" class="userName">{{ covertName(chatContent,false) }}</div>
<div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ chatContent.time }}</div>
<div v-if="!chatContent.self" class="userName">{{ chatContent.member.label }}</div>
<div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ chatContent.chatTime }}</div>
</div>
<div class="userBubble" @click="playAudio(baseUrl+chatContent.src)">
<div class="userMessage">
<span class="el-icon-video-play playicon" />
<span class="messageText">{{ chatContent.content }}</span>
<span class="messageText">{{ chatContent.message }}</span>
</div>
</div>
<audio id="audioPlay" style="display:none" />
</div> -->
</div>
</div>
</div>
</div>
@ -101,7 +101,7 @@ export default {
<style lang="scss" scoped>
.chatcontentIn{
height: 100%;
width: 380px;
width: 360px;
display: inline-block;
overflow: auto;
padding-bottom: 20px;

6
src/views/newMap/chatView/chatMemberList.vue
View File

@ -26,12 +26,6 @@ export default {
return this.$store.state.user.id;
}
},
watch:{
'currentMemberList':()=>{
debugger;
this.currentMemberList;
}
},
mounted() {
},
methods:{

6
src/views/newMap/displayNew/designIndex.vue
View File

@ -341,8 +341,10 @@ export default {
this.userRole = 'AUDIENCE';
}
const memberList = this.$store.state.training.memberData;
memberList[data.id].userId = this.$store.state.user.id;
memberList[data.id].disabled = true;
if (data.id) {
memberList[data.id].userId = this.$store.state.user.id;
memberList[data.id].disabled = true;
}
let lastData = JSON.stringify(memberList);
const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
roleTypeList.forEach(function(element) {

40
src/views/newMap/displayNew/scriptPreviewChat.vue
View File

@ -55,13 +55,13 @@ export default {
},
watch:{
'$store.state.socket.createConversition':function(val) {
this.isHasCoversition = true;
this.isStartRecord = true;
this.conversitionId = val.id;
this.scriptTip = '';
if (this.memberData.length > 0) {
const member = this.memberData.find(member=>{ return member.id == val.creatorId; });
if (member && member.userId == this.$store.state.user.id) {
this.isHasCoversition = true;
this.isStartRecord = true;
this.conversitionId = val.id;
const memberList = [];
val.memberIds.forEach(id=>{
if (val.creatorId == id) {
@ -74,7 +74,8 @@ export default {
}
});
this.currentMemberList = memberList;
} else {
this.currentMemberList = this.memberData;
}
}
//
@ -94,11 +95,13 @@ export default {
// this.conversitionId = val.id;
},
'$store.state.socket.acceptConversionInvite':function(val) {
this.currentMemberList.forEach(member => {
const memberList = this.currentMemberList.map(member => {
if (member.id == val.memberId) {
member.connect = true;
}
return member;
});
this.currentMemberList = memberList;
},
'$store.state.socket.simulationScriptTip':function(val, old) {
if (val) {
@ -135,11 +138,38 @@ export default {
this.chatContentList.push(this.addContent(simulationText.message));
}
}
},
'$store.state.socket.scriptFinish':function(val, old) {
this.$message('剧本执行完成');
},
'$store.state.socket.overConversition': function (val) {
if (val.id === this.conversitionId) {
this.conversitionId = '';
this.scriptTip = '';
this.currentMemberList = [];
this.chatContentList = [];
this.isHasCoversition = false;
this.isStartRecord = false;
}
}
},
methods:{
setScriptTip(scriptTip) {
this.scriptTip = scriptTip;
},
addContent(simulationText) {
const text = {};
const member = this.currentMemberList.find(member=>{
return member.id == simulationText.memberId;
});
if (member) {
text.self = (this.$store.state.user.id == member.userId);
text.member = member;
text.chatTime = simulationText.time;
text.src = simulationText.audioPath;
text.message = simulationText.content;
}
return text;
}
}