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

merge

Browse Source
This commit is contained in:
Yuan 2022-07-29 13:56:02 +08:00
commit 838559280d
99 changed files with 6254 additions and 531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/simulation.js
View File

@ -284,6 +284,15 @@ export function getEveryDayRunPlanNew(group) {
});
}
/** 大铁线路 修改系统时间 */
export function modifySystemTime(data, group) {
return request({
url: `simulation/${group}/modifySystemTime`,
method: 'PUT',
data: data
});
}
/** 新版地图按计划行车 */
export function ranAsPlan(data, group) {
return request({
@ -513,3 +522,10 @@ export function queryIscsResourcesByGroup(group, params) {
params
});
}
/** 获取机器人驾驶参数 */
export function getRobotDrivingParam(simulationId, groupNumber) {
return request({
url: `/simulation/${simulationId}/driveParam/${groupNumber}`,
method: 'get'
});
}

12
src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
View File

@ -165,10 +165,11 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
function trainRunNew(data){
let code = data.code;
// console.log(rails.sectionrail[data.section],data.section,code,'--------')
if(rails.sectionrail[data.section]){
if(trainlisttest.list[code].right != data.right){
if(data.right == "0"){
console.log('right==0')
trainlisttest.list[code].right = "0";
trainlisttest.list[code].rotation.y = Math.PI;
let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@ -210,6 +211,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
}
if(data.right == "1"){
console.log('right==1')
trainlisttest.list[code].right = "1";
trainlisttest.list[code].rotation.y = 0;
let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@ -250,8 +252,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
}
// console.log(data);
if(trainlisttest.list[code].dispose == "0"){
console.log(trainlisttest.list[code].dispose,'88888888');
if(trainlisttest.list[code].dispose == "0") {
console.log(trainlisttest.list[code].dispose,'-----------');
if (data.right == '1') { // 向右
trainlisttest.list[code].right = '1';
trainlisttest.list[code].progress = data.offset;
@ -434,7 +437,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
}
}
console.log(code,trainlisttest.list[code].position.x,trainlisttest.list[code].position.y,trainlisttest.list[code].position.z, '666666')
}else{
// console.log(code,'trainlisttest.list[code].position.x = -1000000')
trainlisttest.list[code].position.x = -1000000;
}
@ -564,6 +569,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
trainlisttest.list[code].position.y = 0;
// trainlisttest.list[code].progress = 0;
trainlisttest.list[code].dispose = "0";
debugger
trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
trainlisttest.list[code].nextcode = null;
trainlisttest.list[code].curve = null;

3
src/jmapNew/config/skinCode/datie_02.js
View File

@ -89,7 +89,7 @@ class SkinCode extends defaultStyle {
unCommunicationOccupiedColor: '#FF0000', // 区段非通讯车占用颜色 （红色）
routeLockColor: '#FFFFFF', // 区段进路锁定颜色 （白色）
faultLockColor: '#006400', // 区段故障锁定颜色
faultLockColor: '#00FF00', // 区段故障锁定颜色
undefinedColor: '#0071C1', // 区段未定义颜色
blockColor: '#00FF00', // 区段封锁颜色
@ -196,6 +196,7 @@ class SkinCode extends defaultStyle {
defaultText: 0
},
lamp: {
notBlock:true, // 封锁不设置颜色
bgShow: false, // 是否被选中
guidName: 'singleRY', // 成都三号线引导类型
borderVariable: false, // 信号灯边框可变

1146
src/jmapNew/config/skinCode/datie_02_1.js Normal file
View File

File diff suppressed because it is too large Load Diff

1
src/jmapNew/config/skinCode/datie_jd1a.js
View File

@ -196,6 +196,7 @@ class SkinCode extends defaultStyle {
defaultText: 0
},
lamp: {
notBlock:true, // 封锁不设置颜色
bgShow: false, // 是否被选中
guidName: 'singleRY', // 成都三号线引导类型
borderVariable: false, // 信号灯边框可变

13
src/jmapNew/config/skinCode/datie_tky.js
View File

@ -96,11 +96,15 @@ class SkinCode extends defaultStyle {
isAlignCenter: false, // 信号字体对其方式
fontSize: 11, // 信号机名称字体大小
fontWeight: 'bold', // 信号机名称字体粗细
defaultColor: '#FFFFFF', // 信号灯字体默认色
blockColor: '#FFFFFF', // 信号灯字体锁定颜色
defaultColor: 'rgb(192,192,192)', // 信号灯字体默认色
// '#FFFFFF'
blockColor: 'rgb(192,192,192)', // 信号灯字体锁定颜色
checkColor: '#00FF00' // 信号保护区段检查颜色
},
remainTimeColor: '#F00',
dtTextNearSignalOffset:{x:35, y:5}, // 人工解锁延时时间坐标靠近信号机名称
lamp: {
notBlock:true, // 封锁不设置颜色
bgShow: false, // 是否被选中
guidName: 'singleRY', // 成都三号线引导类型
borderVariable: false, // 信号灯边框可变
@ -350,8 +354,9 @@ class SkinCode extends defaultStyle {
fpLockColor:'#f00', // 道岔侧防文字背景颜色
guideMasterLockColor:'#f00', // 道岔引导总锁文字背景颜色
locateColor: '#808080', // 道岔定位颜色 ok
inversionColor: '#808080', // 道岔反位颜色 ok
// #808080
locateColor: 'rgb(192,192,192)', // 道岔定位颜色 ok
inversionColor: 'rgb(192,192,192)', // 道岔反位颜色 ok
monolockLocationColor: '#f00', // 道岔单锁'定位'颜色 (绿色)
monolockInversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)

13
src/jmapNew/map.js
View File

@ -84,9 +84,22 @@ class Jlmap {
return selectLineCode(lineCode);
}
reloadStyle(lineCode) {
if (this.lineCode !== lineCode) {
this.reloadModelData(this.lineCode, lineCode);
}
this.lineCode = lineCode;
this.style = selectLineCode(lineCode);
this.$zr.dom.style.backgroundColor = this.style.backgroundColor || '#000';
}
// 处理私有属性
reloadModelData(oldLineCode, lineCode) {
const propConvert = lineCode ? Vue.prototype.$theme.loadPropConvert(lineCode) : null;
const oldPropConvert = oldLineCode ? Vue.prototype.$theme.loadPropConvert(oldLineCode) : null;
for (const deviceCode in this.mapDevice) {
oldPropConvert.deletePrivateProps(this.mapDevice[deviceCode]);
propConvert.initPrivateProps(this.mapDevice[deviceCode]);
}
}
loadDefaultState() { // 加载默认状态
const defaultStateDict = {};

26
src/jmapNew/shape/graph/Signal/index.js
View File

@ -375,13 +375,23 @@ class Signal extends Group {
});
const timeNameY = computedPosition.y + model.positionPoint.y - posit * 15;
// 人工解锁延时时间坐标靠近信号机名称 大铁III型
let remainX = sigNameX;
let remainY = timeNameY;
if (style.Signal.dtTextNearSignalOffset) {
remainX = computedPosition.x + style.Signal.dtTextNearSignalOffset.x * drict;
remainY = sigNameY + style.Signal.dtTextNearSignalOffset.y * posit;
}
this.remainTimeName = new ESigName({
zlevel: this.zlevel,
z: this.z,
silent: false,
style: style,
x: sigNameX,
y: timeNameY,
x: remainX,
// + offsetX,sigNameX
y: remainY,
// + offsetY,timeNameY
text: model.remainTime || 0,
fontWeight: style.Signal.text.fontWeight,
fontSize: 12,
@ -734,7 +744,9 @@ class Signal extends Group {
}
// 封锁
block() {
this.lamps[0].setColor(this.style.Signal.lamp.redColor);
if (!this.style.Signal.lamp.notBlock) { // 大铁线路 对信号机封锁操作，不影响信号显示 其他线路正常
this.lamps[0].setColor(this.style.Signal.lamp.redColor);
}
if (this.style.Signal.post.blockColor) { // 设置底座颜色
this.sigPost.setColor(this.style.Signal.post.blockColor);
}
@ -936,7 +948,9 @@ class Signal extends Group {
}
});
if (this.model.type === 'SHUNTING') {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
if (!this.style.Signal.dtTextNearSignalOffset) {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
}
}
}
setAshShow() {
@ -1070,6 +1084,8 @@ class Signal extends Group {
}
}
// model.remainTime = 26;
// this.setDelayUnlock();
if (model.remainTime) {
this.showRemainTime(model.remainTime);
} else {
@ -1149,7 +1165,7 @@ class Signal extends Group {
// 灯颜色状态显示
exec(SignalAspectMap[model.signalAspect], this.lamps, this.style);
// 灯是否点灯显示
this.lamps.forEach(lamp => { lamp.setStop(model.signalLight); });
// this.lamps.forEach(lamp => { lamp.setStop(model.signalLight); });
}
if (model.hasSelected) {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);

36
src/jmapNew/shape/graph/SignalButton/index.js
View File

@ -46,29 +46,7 @@ export default class SignalButton extends Group {
const model = this.model
const computedPosition = this.computedPosition
const fillColor = this.getTypeColor()
const queryList = window.location.search.substring(1).split('&')
const queryCtc = queryList.find(item => {
return item.includes('ctc')
})
const ctcArcList = ['OCCLUSION', 'RECOVERY', 'CHANGE_DIRECTION', 'ACCIDENT', 'DEPART_ASSIST', 'PICK_ASSIST', 'ASSIST']
if (queryCtc && ctcArcList.includes(model.type)) {
this.arcShape = new Arc({
zlevel: this.zlevel,
z: this.z,
shape: {
cx: computedPosition.x + 7,
cy: computedPosition.y + 7,
r: 7
},
style: {
stroke: '#69666E',
lineWidth: 1,
fill: fillColor
}
})
this.add(this.arcShape)
} else if (this.style.SignalButton && this.style.SignalButton.shape === 'roundWithDock' && typeList.includes(model.type)) {
if (this.style.SignalButton && this.style.SignalButton.shape === 'roundWithDock' && typeList.includes(model.type)) {
const circle1 = new Circle({
zlevel: this.zlevel,
z: this.z + 2,
@ -308,20 +286,14 @@ export default class SignalButton extends Group {
if (this.rectButton) {
if (model.pressDown) {
this.rectButton.setStyle({ fill: '#FFFF00' })
// this.arcFlash.show();
// const style = this.style;
// this.arcFlash.animateStyle(true)
// .when(0, { fill: style.backgroundColor })
// .when(500, { fill: '#FFFF00' })
// .when(1000, { fill: style.backgroundColor })
// .start();
} else {
this.rectButton.setStyle({ fill: this.getTypeColor() })
// this.arcFlash.stopAnimation(false);
// this.arcFlash.hide();
}
}
}
// let
// { value: 'PICK', label: '接车按钮' },
// { value: 'SHUNT_TERMINAL', label: '调车终端按钮' },
if (!store.getters['map/checkDeviceShow'](this._code)) {
this.buttonText && this.buttonText.hide()
this.rectButton && this.rectButton.hide()

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

@ -246,16 +246,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -450,7 +450,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

18
src/jmapNew/theme/beijing_01/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -159,16 +159,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -346,7 +346,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

18
src/jmapNew/theme/chengdu_01/model.js
View File

@ -46,9 +46,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -59,9 +59,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -69,6 +69,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -142,16 +142,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -317,7 +317,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

18
src/jmapNew/theme/chengdu_03/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

63
src/jmapNew/theme/components/menus/dialog/setFault.vue
View File

@ -16,6 +16,20 @@
<el-row>
<el-form ref="form" :model="formModel" :rules="rules">
<el-col :span="24">
<el-form-item prop="speedLimit" label="限速：">
<el-input v-model="formModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
<span>km/h</span>
<el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，不填为取消限速" placement="top-start">
<i class="el-icon-warning" />
</el-tooltip>
</el-form-item>
<el-form-item prop="through" label="">
<el-radio-group v-model="formModel.through">
<el-radio :label="1">越红灯行驶</el-radio>
<el-radio :label="2">越引导行驶</el-radio>
<el-radio :label="0">无</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="targetDeviceCode" label="目的地:">
<el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
<el-option
@ -85,6 +99,7 @@ import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import { getRobotDrivingParam } from '@/api/simulation';
export default {
name: 'SwitchControl',
@ -109,6 +124,8 @@ export default {
faultList: [],
form: { faultType: ''},
formModel: {
speedLimit: '',
through: 0,
targetDeviceCode: ''
},
groupNumber: '',
@ -146,7 +163,7 @@ export default {
} else if (this.operation == OperationEvent.MixinCommand.cancelStoppage.menu.operation) {
return '取消故障';
} else if (this.operation == OperationEvent.MixinCommand.collocation.menu.operation) {
return '驾驶至';
return '驾驶';
}
return '';
}
@ -201,12 +218,13 @@ export default {
{label: '计轴故障', value: 'FAULT'},
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
];
} else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm'){
this.faultList = [
{label: '计轴故障', value: 'FAULT'},
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
];
} else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') {
} else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm') {
this.faultList = [
{label: '电路故障', value: 'FAULT'},
{label: '故障锁闭', value: 'FAULT_LOCK'}
// {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
];
} else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') {
this.faultList = [
{label: '失表', value: 'SPLIT'},
{label: '定位失表', value: 'NORMAL_SPLIT'},
@ -215,16 +233,16 @@ export default {
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: '计轴故障', value: 'AXLE_FAULT'}
];
} else if(selected._type === 'Switch' && this.popClass === 'datie-02__systerm') {
this.faultList = [
{label: '失表', value: 'SPLIT'},
{label: '定位失表', value: 'NORMAL_SPLIT'},
{label: '反位失表', value: 'REVERSE_SPLIT'},
{label: '挤岔', value: 'SQUEEZE'},
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: '红光带故障', value: 'AXLE_FAULT'}
];
} else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') {
} else if (selected._type === 'Switch' && this.popClass === 'datie-02__systerm') {
this.faultList = [
{label: '失表', value: 'SPLIT'},
{label: '定位失表', value: 'NORMAL_SPLIT'},
{label: '反位失表', value: 'REVERSE_SPLIT'},
{label: '挤岔', value: 'SQUEEZE'},
// {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: '电路故障', value: 'AXLE_FAULT'}
];
} else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') {
this.faultList = [
{label: '红光带故障', value: 'FAULT'},
{label: '粉光带故障', value: 'CBTC_OCCUPIED_FAULT'},
@ -277,6 +295,11 @@ export default {
if (judge) {
this.judge = judge;
this.groupNumber = selected.groupNumber;
getRobotDrivingParam(this.$route.query.group, this.groupNumber).then(resp => {
this.formModel.speedLimit = resp.data.speedLimit ? resp.data.speedLimit : '';
this.formModel.through = resp.data.through;
this.formModel.targetDeviceCode = resp.data.targetDeviceCode ? resp.data.targetDeviceCode : '';
});
}
}
if (selected._type) {
@ -344,7 +367,11 @@ export default {
cmdType: menuOperate.Common.collocation.cmdType,
param: {
groupNumber: this.groupNumber,
targetDeviceCode: this.formModel.targetDeviceCode
param: {
speedLimit: this.formModel.speedLimit,
through: this.formModel.through,
targetDeviceCode: this.formModel.targetDeviceCode
}
}
};
this.sendCommand(setp);

62
src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
View File

@ -45,7 +45,7 @@
<script>
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
// import { commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
import {menuOperate, commitOperate} from '../../utils/menuOperate';
export default {
name: 'SwitchHookLock',
@ -125,37 +125,37 @@ export default {
},
commit() {
this.loading = true;
if (this.operation) {
commitOperate(menuOperate.Switch.hookLock, {normal: this.normal}, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
}
}).catch((error) => {
this.loading = false;
// if (this.operation) {
commitOperate(menuOperate.Switch.hookLock, {normal: this.normal, switchCode: this.selected.code}, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
console.error(error);
this.$refs.noticeInfo.doShow();
});
} else {
const group = this.$route.query.group;
const param = {
commandType: 'Switch_Hook_Lock',
// Switch_Hook_Lock
targetMemberId: this.targetMemberId,
params: {
switchCode: this.selected.code,
normal: this.normal
}
};
commitTrainSend(group, param).then(({valid, operate})=>{
this.doClose();
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
this.doClose();
});
}
}
}).catch((error) => {
this.loading = false;
this.doClose();
console.error(error);
this.$refs.noticeInfo.doShow();
});
// } else {
// const group = this.$route.query.group;
// const param = {
// commandType: 'Switch_Hook_Lock',
// // Switch_Hook_Lock
// targetMemberId: this.targetMemberId,
// params: {
// switchCode: this.selected.code,
// normal: this.normal
// }
// };
// commitTrainSend(group, param).then(({valid, operate})=>{
// this.doClose();
// }).catch((error) => {
// console.error(error);
// this.$refs.noticeInfo.doShow();
// this.doClose();
// });
// }
}
}

4
src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
View File

@ -15,7 +15,7 @@
<div style="width: 96%;">
<el-form-item label="限速值:" label-width="95px" prop="speedLimit">
<div style="display: flex;align-items: center;">
<el-input v-model="addModel.speedLimit" style="width: 130px;margin-right: 10px;" size="small" />
<el-input v-model="addModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
<span>km/h</span>
<el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，-1为取消限速" placement="top-start">
<i class="el-icon-warning" />
@ -135,7 +135,7 @@ export default {
};
commitTrainSend(group, param).then(({valid, operate})=>{
this.doClose();
}).catch((error) => {
}).catch(() => {
this.$refs.noticeInfo.doShow();
this.doClose();
});

133
src/jmapNew/theme/components/menus/dialog/trainStop.vue Normal file
View File

@ -0,0 +1,133 @@
<template>
<el-dialog
v-dialogDrag
:class="popClass"
class="stand-stop-time"
:title="title"
:visible.sync="show"
width="340px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<el-form ref="form" size="small" label-width="80px" :model="addModel" @submit.native.prevent>
<div style="width: 96%;">
<el-form-item label="是否EB:" label-width="95px" prop="speedLimit">
<div style="display: flex;align-items: center;">
<el-checkbox v-model="addModel.eb" />
</div>
</el-form-item>
</div>
</el-form>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
<el-button type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button @click="doClose">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" :pop-class="popClass" />
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import NoticeInfo from '../childDialog/noticeInfo';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'TrainAddPlan',
components: {
NoticeInfo
},
props: {
popClass: {
type: String,
default() {
return '';
}
}
},
data() {
return {
selected: {},
addModel: {
eb: false // 限速值
},
dialogShow: false,
loading: false
};
},
computed: {
...mapGetters('training', [
'memberList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
title() {
return '输入限速值';
}
},
watch:{
'$store.state.map.keyboardEnterCount': function (val) {
if (this.dialogShow && this.popClass === 'ningbo-01__systerm') {
this.commit();
}
}
},
mounted() {
},
methods: {
doShow(operate, selected) {
this.selected = selected;
this.groupNumber = selected.groupNumber;
this.addModel = { eb:false };
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$root.$emit('dialogClose', this.selected);
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
},
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
console.log(this.groupNumber, '----------');
commitOperate(menuOperate.Train.driverStop, {groupNumber:this.groupNumber, eb: this.addModel.eb}, 3)
.then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
}
})
.catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow();
});
} else {
return false;
}
});
}
}
};
</script>
<style scoped>
.foshan-01__systerm .el-dialog .base-label {
background: rgba(0, 0, 0, x);
position: relative;
left: -5px;
top: -18px;
padding: 0 5px;
background-color: #F0F0F0;
}
</style>

4
src/jmapNew/theme/components/utils/menuOperate.js
View File

@ -526,6 +526,10 @@ export const menuOperate = {
// 删车次号 (大铁线路 车组号)
operation: OperationEvent.Train.removeTrip.menu.operation,
cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE
},
driverStop: {
operation: OperationEvent.Train.driverStop.menu.operation,
cmdType: CMD.Driver.CMD_DRIVER_STOP
}
},
CTC: {

3
src/jmapNew/theme/datie_01/menus/menuTrain.vue
View File

@ -173,7 +173,8 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {
// if (!this.$store.state.scriptRecord.bgSet) {
if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'DRIVER') {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];

20
src/jmapNew/theme/datie_01/model.js
View File

@ -43,22 +43,21 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
}
return model;
}
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +65,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

2
src/jmapNew/theme/datie_02/menus/index.vue
View File

@ -33,7 +33,7 @@
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
</div>
</div>
<div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1405px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
<div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1560px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
<div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
<div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + ' ' + dateString + ' ' + time }}</div>
</div>

59
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -71,16 +71,16 @@
<center><b>道岔解封</b></center>
</span>
</button>
<!--<button :id="Signal.signalLight.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalLight.menuButton.operation, ['Signal'])">-->
<!--<span style="color: black">-->
<!--<center><b>点灯</b></center>-->
<!--</span>-->
<!--</button>-->
<!--<button :id="Signal.signalDestroy.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalDestroy.menuButton.operation, ['Signal'])">-->
<!--<span style="color:#800000">-->
<!--<center><b>灭灯</b></center>-->
<!--</span>-->
<!--</button>-->
<!-- <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">-->
<!-- <span style="color: black">-->
<!-- <center><b>点灯</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">-->
<!-- <span style="color:#800000">-->
<!-- <center><b>灭灯</b></center>-->
<!-- </span>-->
<!-- </button>-->
<button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
<span style="color: #800000">
<center><b>S引导总锁</b></center>
@ -213,7 +213,7 @@ export default {
return this.$store.state.map.stationSGuideMasterLock;
},
xGuideMasterLock() {
return this.$store.state.map.stationXGuideMasterLock;
return this.$store.state.map.stationXGuideMasterLock;
},
isShowBtn() {
return this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '10';
@ -243,6 +243,10 @@ export default {
return CMD.Signal.CMD_SIGNAL_SET_ROUTE;
case this.Signal.guide.button.operation: // 办理引导
return CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
case this.Signal.signalTurnOn.menuButton.operation:
return CMD.Signal.CMD_SIGNAL_TURN_ON;
case this.Signal.signalTurnOff.menuButton.operation:
return CMD.Signal.CMD_SIGNAL_TURN_OFF;
}
return '';
}
@ -275,7 +279,7 @@ export default {
}
},
'$store.state.map.showCentralizedStationCode': function(val) {
if (val) {
if (val) {
const station = this.$store.getters['map/getDeviceByCode'](val);
this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock);
}
@ -408,7 +412,8 @@ export default {
operation: operation
};
// 以下 会弹出密码框 （总人解，区故解） 铅封按钮
const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation];
const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation,
this.Signal.signalTurnOff.menuButton.operation];
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.operation = operation;
@ -558,7 +563,7 @@ export default {
val: model.code,
cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
};
const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
// const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
if (model._type === 'SignalButton' && model.type === 'PICK') {
operate.param = {signalCode: model.signalCode};
this.sendCommand(operate);
@ -656,6 +661,28 @@ export default {
this.sendCommand(operate);
}
},
handleSignalTurnOn(model) {
const operate = {
over: true,
code: model.code,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: CMD.Signal.CMD_SIGNAL_TURN_ON,
param: {signalCode: model.code}
};
this.sendCommand(operate);
},
handleSignalTurnOff(model) {
if (model.type === 'PICK') {
const operate = {
over: true,
code: model.code,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: CMD.Signal.CMD_SIGNAL_TURN_OFF,
param: {signalCode: model.signalCode}
};
this.sendCommand(operate);
}
},
// CHANGE_DIRECTION
selectedChange() {
// 按钮按下时
@ -687,6 +714,10 @@ export default {
this.handelFaultSection(model);
} else if (buttonOperation === this.Section.defectiveShunting.button.operation) {
this.handelDefectiveShunting(model);
} else if (buttonOperation === this.Signal.signalTurnOn.menuButton.operation) {
this.handleSignalTurnOn(model);
} else if (buttonOperation === this.Signal.signalTurnOff.menuButton.operation) {
this.handleSignalTurnOff(model);
} else {
this.clearOperate();
}

169
src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
View File

@ -66,7 +66,7 @@
<center><b>按</b><b>钮</b></center>
</span>
</button>
<button :id="MixinCommand.functionButton.button.domId" class="button_box" @click="buttonDown(MixinCommand.functionButton.button.operation, ['StationStand', 'Station'])">
<button :id="MixinCommand.functionButton.button.domId" class="button_box" @click="buttonDown(MixinCommand.functionButton.button.operation, ['StationStand', 'Station','SignalButton'])">
<span :style="{color: operation === MixinCommand.functionButton.button.operation ? '#ccc':'black'}">
<center><b>功</b><b>能</b></center>
<center><b>按</b><b>钮</b></center>
@ -673,6 +673,7 @@ export default {
// this.handleGuideLock(model);
// this.handleGuideSignal(model);
// } else
debugger;
if (buttonOperation && this.commandTypeList.includes(model._type)) {
if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
this.handelTotalCancel(model);
@ -691,22 +692,37 @@ export default {
this.arrangementRouteOperation(this.deviceList);
} else if (buttonOperation === this.Signal.guide.button.operation ) {
this.handleGuideSignal(model);
} else if (buttonOperation === this.MixinCommand.functionButton.button.operation) {
const signalButtonList = ['ASSIST', 'CHANGE_DIRECTION', 'PICK_ASSIST', 'DEPART_ASSIST', 'OCCLUSION', 'RECOVERY', 'ACCIDENT'];
if (model._type === 'SignalButton' && signalButtonList.includes(model.type)) {
// 改方操作 总辅助操作 接辅助操作 发辅助操作
this.assistOperateOrChange(model);
}
} else {
this.clearOperate();
}
} else if (!buttonOperation) {
if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
this.handleGuideSignal(model);
} else if (model._type === 'SignalButton' && model.type === 'CHANGE_DIRECTION') {
// 改方操作
// this.changeDirection(model);
this.clearOperate();
} else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
this.deviceList.push(model);
this.arrangementRouteOperation(this.deviceList);
} else {
this.clearOperate();
}
// if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
// this.handleGuideSignal(model);
// } else if (model._type === 'SignalButton' && model.type === 'CHANGE_DIRECTION') {
// // 改方操作
// // this.changeDirection(model);
// this.clearOperate();
// } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
// this.deviceList.push(model);
// this.arrangementRouteOperation(this.deviceList);
// } else {
// this.clearOperate();
// }
// if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
// this.handleGuideSignal(model);
// } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
// this.deviceList.push(model);
// this.arrangementRouteOperation(this.deviceList);
// } else {
// this.clearOperate();
// }
} else { this.clearOperate(); }
if (this.timeNode) { this.timeNode = 0; }
},
@ -791,6 +807,133 @@ export default {
},
commandClear() {
this.clearOperate();
},
assistOperateOrChange(model) {
// mode.type==
const modelTypeMap = {
// 总辅助按钮
'ASSIST':{
operation:this.CTCCommand.assistPressMainAssist.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_MAIN_ASSIST,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode,
pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
}
},
// 改方
'CHANGE_DIRECTION':{
operation:this.CTCCommand.assistPressDownTurnDirection.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode,
pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
}
},
// 接辅助按钮
'PICK_ASSIST':{
// this.CTCCommand.assistPressDownTurnDirection.menu.operation
operation:this.CTCCommand.assistPressReceiveAssist.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RECEIVE_ASSIST,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode
}
},
// 发辅助按钮
'DEPART_ASSIST':{
operation:this.CTCCommand.assistPressDeliverAssist.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DELIVER_ASSIST,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode
}
},
// 事故按钮
'ACCIDENT':{
operation:this.CTCCommand.assistPressAccident.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_ACCIDENT,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode
}
}
};
const noPasswordModelTypeMap = {
// 闭塞按钮
'OCCLUSION':{
operation:this.CTCCommand.assistPressBlock.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_BLOCK,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode
}
},
// 复原按钮
'RECOVERY':{
operation:this.CTCCommand.assistPressRestore.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RESTORE,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode
}
}
};
if (noPasswordModelTypeMap[model.type]) {
const operate = {
over:true,
operation: noPasswordModelTypeMap[model.type].operation,
code: model.code,
param: noPasswordModelTypeMap[model.type].param,
cmdType : noPasswordModelTypeMap[model.type].nextCmdType
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.clearOperate();
} else {
this.$refs.noticeInfo.doShow();
}
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
} else {
const operate = {
operation: modelTypeMap[model.type].operation,
code: model.code,
param: modelTypeMap[model.type].param
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
operate.nextCmdType = modelTypeMap[model.type].nextCmdType;
operate['operateNext'] = this.Command.close.password.operation;
this.$refs.password.doShow(operate);
}
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
}
// const operate = {
// over: true,
// code: model.code,
// operation: this.CTCCommand.assistPressDownTurnDirection.menu.operation,
// cmdType: CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
// param: {
// labelEnum:model.labelEnum,
// stationCode:model.stationCode
// }
// };
// this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
// // this.clearOperate();
// }).catch((error) => {
// // this.clearOperate();
// console.error(error);
// this.$refs.noticeInfo.doShow();
// });
}
}
};

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

@ -145,7 +145,7 @@ export default {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
this.menu.forEach(item => { item.disabled = true; });
} else { this.menu.forEach(item => { item.disabled = false; }); }
} else {

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

@ -86,9 +86,15 @@ export default {
},
{
label: '封锁/解封',
handler: '',
cmdType: ''
handler: this.lockOrUnlock
// cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
},
// {
// label: '解封',
// handler: '',
// cmdType: ''
// },
{
label: '总人解',
handler: this.humanTrainRoute,
@ -210,7 +216,7 @@ export default {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
this.menu.forEach(item => { item.disabled = true; });
} else { this.menu.forEach(item => { item.disabled = false; }); }
// 故障模式菜单列表
@ -312,14 +318,14 @@ export default {
});
},
lockOrUnlock() {
if (this.selected.lock) {
commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
if (this.selected.blockade) {
commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
if (valid) {
this.$refs.routeControl.doShow(operate, this.selected);
}
});
} else {
commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
if (valid) {
this.$refs.routeControl.doShow(operate, this.selected);
}

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

@ -200,12 +200,12 @@ export default {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
this.menu.forEach(item => { item.disabled = true; });
} else { this.menu.forEach(item => { item.disabled = false; }); }
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {
if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'STATION_SWITCH_MAN') {
const menuHook = [{
label: '道岔钩锁',
handler: this.hookLock

43
src/jmapNew/theme/datie_02/menus/menuTrain.vue
View File

@ -9,6 +9,8 @@
<train-delete-number ref="trainDeleteNumber" />
<train-detail-info ref="trainDetailInfo" />
<set-fault ref="setFault" pop-class="chengdou-03__systerm" />
<speed-limit ref="speedLimit" pop-class="chengdou-03__systerm" />
<train-stop ref="trainStop" pop-class="chengdou-03__systerm" />
<!-- <train-set-plan ref="trainSetPlan" /> -->
<update-trip ref="updateTrip" />
</div>
@ -33,6 +35,8 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
export default {
name: 'MenuTrain',
@ -46,7 +50,9 @@ export default {
TrainDeleteNumber,
TrainDetailInfo,
SetFault,
UpdateTrip
UpdateTrip,
SpeedLimit,
TrainStop
// TrainSetPlan
},
mixins: [
@ -191,9 +197,13 @@ export default {
handler: this.handleOverEedLight
},
// {
// label: '驾驶至',
// handler: this.handleDriveTo
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '驾驶',
handler: this.handleDriveTo
},
{
label: '换端',
handler: this.handleTurnDirection
@ -239,12 +249,12 @@ export default {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
this.menu.forEach(item => { item.disabled = true; });
} else { this.menu.forEach(item => { item.disabled = false; }); }
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {
if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'DRIVER') {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
@ -312,6 +322,9 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 限速行驶
limitSpeed() {
const operate = {
@ -539,7 +552,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
@ -575,18 +588,11 @@ export default {
});
},
handleParkingTrain() {
const group = this.$route.query.group;
const param = {
commandType: 'Parking_Train',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.trainStop.doShow(operate, this.selected);
}
});
},
modifyTripNumber() {
commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
@ -597,8 +603,7 @@ export default {
},
removeTripNumber() {
commitOperate(menuOperate.Train.removeTrip, {groupNumber:this.selected.groupNumber}, 3).then(({valid, operate})=>{
if (valid) {
}
// if (valid) {}
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();

3
src/jmapNew/theme/datie_02/menus/runplanPane.vue
View File

@ -654,6 +654,9 @@ export default {
},
'$store.state.training.roleDeviceCode':function(newVal, oldVal) {
if (oldVal) {
this.filterSectionList = this.sectionList.filter(section=>{
return section.standTrack && section.belongStation == newVal;
});
this.loadData();
}
},

19
src/jmapNew/theme/datie_02/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

140
src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
View File

@ -7,7 +7,7 @@
<switch-hook-lock ref="switchHookLock" pop-class="chengdou-03__systerm" />
<set-fault ref="setFault" pop-class="datie-02__systerm" />
<draw-select ref="drawSelect" />
<route-cancel ref="routeCancel" />
<route-cancel ref="routeCancel" />
</div>
</template>
@ -36,7 +36,7 @@ export default {
SetFault,
SwitchHookLock,
DrawSelect,
RouteCancel
RouteCancel
},
mixins: [
CancelMouseState
@ -54,72 +54,72 @@ export default {
menu: [],
menuNormal: {
Local: [
{
label: '定操',
handler: this.locate,
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
},
{
label: '反操',
handler: this.reverse,
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
},
{
label: '单锁',
handler: this.lock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
},
{
label: '单解',
handler: this.unlock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
},
{
label: '封锁',
handle: this.block,
{
label: '定操',
handler: this.locate,
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
},
{
label: '反操',
handler: this.reverse,
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
},
{
label: '单锁',
handler: this.lock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
},
{
label: '单解',
handler: this.unlock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
},
{
label: '封锁',
handle: this.block,
cmdType: CMD.Switch.CMD_SWITCH_BLOCK
},
{
label: '解封',
handle: this.unblock,
{
label: '解封',
handle: this.unblock,
cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
},
{
label: '区故解',
handle: ''
},
{
label: '岔前 分路不良',
handle: ''
},
{
label: '定位 分路不良',
handle: ''
},
{
label: '反位 分路不良',
handle: ''
},
{
label: '接触网定位无电',
handle: ''
},
{
label: '接触网反位无电',
handle: ''
},
{
label: '添加调机号',
handle: ''
},
{
label: '删除调机号',
handle: ''
},
{
label: '修改调机号',
handle: ''
}
},
{
label: '区故解',
handle: ''
},
{
label: '岔前 分路不良',
handle: ''
},
{
label: '定位 分路不良',
handle: ''
},
{
label: '反位 分路不良',
handle: ''
},
{
label: '接触网定位无电',
handle: ''
},
{
label: '接触网反位无电',
handle: ''
},
{
label: '添加调机号',
handle: ''
},
{
label: '删除调机号',
handle: ''
},
{
label: '修改调机号',
handle: ''
}
],
Center: [
// {
@ -193,7 +193,7 @@ export default {
},
watch: {
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && (!this.buttonOperation || this.$route.query.ctc)) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && (!this.buttonOperation || this.$route.query.ctc)) {
this.doShow(this.$store.state.menuOperation.menuPosition);
} else {
this.doClose();
@ -207,7 +207,7 @@ export default {
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {
if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'STATION_SWITCH_MAN') {
const menuHook = [{
label: '道岔钩锁',
handler: this.hookLock
@ -270,7 +270,7 @@ export default {
},
// 道岔封锁
block() {
debugger
debugger;
commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
if (valid) {
this.$refs.switchControl.doShow(operate, this.selected);
@ -306,7 +306,7 @@ export default {
commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
// this.$refs.switchControl.doShow(operate, this.selected);
this.$refs.routeCancel.doShow(operate, this.selected);
this.$refs.routeCancel.doShow(operate, this.selected);
}
});
},
@ -315,7 +315,7 @@ export default {
commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
// this.$refs.switchControl.doShow(operate, this.selected);
this.$refs.routeCancel.doShow(operate, this.selected);
this.$refs.routeCancel.doShow(operate, this.selected);
}
});
},

27
src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
View File

@ -11,6 +11,7 @@
<set-fault ref="setFault" pop-class="chengdou-03__systerm" />
<!-- <train-set-plan ref="trainSetPlan" /> -->
<update-trip ref="updateTrip" />
<train-stop ref="trainStop" pop-class="chengdou-03__systerm" />
</div>
</template>
@ -33,6 +34,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
export default {
name: 'MenuTrain',
@ -46,7 +48,8 @@ export default {
TrainDeleteNumber,
TrainDetailInfo,
SetFault,
UpdateTrip
UpdateTrip,
TrainStop
// TrainSetPlan
},
mixins: [
@ -191,7 +194,7 @@ export default {
handler: this.handleOverEedLight
},
// {
// label: '驾驶至',
// label: '驾驶',
// handler: this.handleDriveTo
// },
{
@ -241,7 +244,8 @@ export default {
console.log(this.menu, '================');
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {
// if (!this.$store.state.scriptRecord.bgSet) {
if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'DRIVER') {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
@ -536,7 +540,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
@ -572,18 +576,11 @@ export default {
});
},
handleParkingTrain() {
const group = this.$route.query.group;
const param = {
commandType: 'Parking_Train',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.trainStop.doShow(operate, this.selected);
}
});
},
modifyTripNumber() {
commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{

19
src/jmapNew/theme/datie_jd1a/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

332
src/jmapNew/theme/datie_tky/menus/dialog/trainControl.vue Normal file
View File

@ -0,0 +1,332 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm train-control"
:title="title"
:visible.sync="show"
width="480px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div class="el-dialog-div">
<el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="stationName">
<span slot="label">车站</span>
<el-input v-model="addModel.stationName" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item v-if="operation != '70c'" prop="sectionCode">
<span slot="label">轨道</span>
<el-input v-model="addModel.sectionCode" />
</el-form-item>
<el-form-item v-else prop="trainWindowCode">
<span slot="label">车次窗</span>
<el-input v-model="addModel.trainWindowCode" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="车组号:" prop="groupNumber">
<el-select v-model="addModel.groupNumber" filterable>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.groupNumber"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item v-if="operation == '708'" prop="serviceNumber">
<span slot="label">服务号</span>
<el-input v-model="addModel.serviceNumber" />
</el-form-item>
<el-form-item v-else-if="operation == '70c'" prop="targetCode">
<span slot="label">目的地</span>
<el-input v-model="addModel.targetCode" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item v-if="operation == '708'" prop="trainCode">
<span slot="label">序列号</span>
<el-input v-model="addModel.trainCode" />
</el-form-item>
<el-form-item v-else-if="operation == '70c'" prop="serviceNumber">
<span slot="label">服务号</span>
<el-input v-model="addModel.serviceNumber" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item v-if="operation == '70c'" prop="trainType">
<span slot="label">运行模式</span>
<br>
<el-radio-group v-model="addModel.runningMode" style="margin-left: 15px;">
<el-radio :label="'01'">普通</el-radio>
<el-radio :label="'02'">专列</el-radio>
<el-radio :label="'03'">不停站直达</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<confirm-train ref="confirmTrain" />
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
import ConfirmTrain from './childDialog/confirmTrain';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
export default {
name: 'TrainControl',
components: {
ConfirmTrain,
NoticeInfo
},
mixins: [
CancelMouseState
],
data() {
return {
trainList: [],
selected: null,
addModel: {
stationName: '',
sectionCode: '',
trainWindowCode: '',
groupNumber: '',
serviceNumber: '',
targetCode: '',
trainCode: '',
runningMode: ''
},
rules: {
stationName: [
{ required: true, message: '请输入车站', trigger: 'blur'}
],
sectionCode: [
{ required: true, message: '请输入轨道', trigger: 'blur'}
],
trainWindowCode: [
{ required: true, message: '请输入车次窗', trigger: 'blur'}
],
groupNumber: [
{ required: true, message: '请选择车组号', trigger: 'change' }
],
serviceNumber: [
{ required: true, message: '请输入服务号', trigger: 'blur'}
],
targetCode: [
{ required: true, message: '请输入目的地号', trigger: 'blur'}
],
trainCode: [
{ required: true, message: '请输入序列号', trigger: 'blur'}
],
runningMode: [
{ required: true, message: '请选择运行模式', trigger: 'blur'}
]
},
operation: null,
dialogShow: false,
loading: false,
direction: 0
};
},
computed: {
...mapGetters('map', [
'map'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
if (this.dialogShow) {
if (this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
/* 设目的地*/
return OperationEvent.Train.destinationTrainId.menu.domId;
} else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation) {
/* 设计划车*/
return OperationEvent.Train.setPlanTrainId.menu.domId;
} else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation) {
/* 设人工车*/
return OperationEvent.Train.artificialTrainId.menu.domId;
}
return '';
}
return '';
},
title() {
if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
return '设目的地车';
} else if ( this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
return '设计划车';
} else if ( this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
return '设人工车';
}
return '';
}
},
methods: {
loadInitData(map) {
},
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.operation = operate.operation;
}
this.addModel = {
tripNumber: '',
groupNumber: '',
trainType: '01',
serviceNumber: '',
targetCode: ''
};
/** 加载列车数据*/
this.loadInitData(this.map);
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
this.mouseCancelState(this.selected);
},
commit() {
if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation ) {
this.destinationTrainId();
} else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
this.setPlanTrainId();
} else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
this.artificialTrainId();
}
},
// 设目的地车
destinationTrainId() {
this.$refs['form'].validate((valid) => {
if (valid) {
const operate = {
operation: OperationEvent.Train.destinationTrainId.menu.operation,
message: [`设目的地车：成功`],
val: ''
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.doClose();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow();
});
} else {
return false;
}
});
},
// 设计划车
setPlanTrainId() {
this.$refs['form'].validate((valid) => {
if (valid) {
const operate = {
operation: OperationEvent.Train.setPlanTrainId.menu.operation,
message: [`设计划车：成功`],
val: ''
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.doClose();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow();
});
} else {
return false;
}
});
},
// 设人工车
artificialTrainId() {
this.$refs['form'].validate((valid) => {
if (valid) {
const operate = {
operation: OperationEvent.Train.artificialTrainId.menu.operation,
message: [`设人工车：成功`],
val: ''
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.doClose();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow();
});
} else {
return false;
}
});
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => {
this.doClose();
});
}
}
};
</script>
<style scoped>
.el-dialog-div {
height: 400px;
overflow: auto;
}
</style>

181
src/jmapNew/theme/datie_tky/menus/dialog/trainCreateNumber.vue Normal file
View File

@ -0,0 +1,181 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm stand-stop-time"
:title="title"
:visible.sync="show"
width="480px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div class="el-dialog-div">
<el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="stationName">
<span slot="label">车站</span>
<el-input v-model="addModel.stationName" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="trainWindowCode">
<span slot="label">车次窗</span>
<el-input v-model="addModel.trainWindowCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="车 组 号:" prop="groupNumber">
<el-select v-model="addModel.groupNumber" filterable>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.groupNumber"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
export default {
name: 'TrainCreateNumber',
mixins: [
CancelMouseState
],
data() {
return {
trainNoList: [],
trainList: [],
selected: null,
addModel: {
stationName:'',
trainWindowCode: '',
groupNumber:''
},
rules: {
groupNumber: [
{ required: true, message: '请输入车组号', trigger: 'blur'}
]
},
dialogShow: false,
loading: false
};
},
computed: {
...mapGetters('map', [
'stationStandList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
},
title() {
return '新建车组号';
}
},
methods: {
loadInitData(map) {
},
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.addModel = {
stationName:'',
trainWindowCode: '',
groupNumber:''
};
}
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
this.mouseCancelState(this.selected);
},
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
const operate = {
send: true,
operation: OperationEvent.Train.createTrainNo.menu.operation
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
}
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow();
});
} else {
return false;
}
});
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); });
}
}
};
</script>
<style scoped>
.chengdou-03__systerm .el-dialog .base-label {
background: rgba(0, 0, 0, x);
position: relative;
left: -5px;
top: -18px;
padding: 0 5px;
background-color: #F0F0F0;
}
.el-dialog-div {
height: 400px;
overflow: auto;
}
</style>

176
src/jmapNew/theme/datie_tky/menus/dialog/trainDeleteNumber.vue Normal file
View File

@ -0,0 +1,176 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm stand-stop-time"
:title="title"
:visible.sync="show"
width="480px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div class="el-dialog-div">
<el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="stationName">
<span slot="label">车站</span>
<el-input v-model="addModel.stationName" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="trainWindowCode">
<span slot="label">车次窗</span>
<el-input v-model="addModel.trainWindowCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="车 组 号:" prop="groupNumber">
<el-select v-model="addModel.groupNumber" filterable disabled>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.groupNumber"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
export default {
name: 'TrainDeleteNumber',
mixins: [
CancelMouseState
],
data() {
return {
trainNoList: [],
trainList: [],
selected: null,
addModel: {
stationName:'',
trainWindowCode: '',
groupNumber:''
},
dialogShow: false,
loading: false
};
},
computed: {
...mapGetters('map', [
'stationStandList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
},
title() {
return '删除车组号';
}
},
methods: {
loadInitData(map) {
},
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.addModel = {
stationName:'',
trainWindowCode: '',
groupNumber:''
};
}
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
this.mouseCancelState(this.selected);
},
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
const operate = {
send: true,
operation: OperationEvent.Train.deleteTrainNo.menu.operation
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
}
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow();
});
} else {
return false;
}
});
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); });
}
}
};
</script>
<style scoped>
.chengdou-03__systerm .el-dialog .base-label {
background: rgba(0, 0, 0, x);
position: relative;
left: -5px;
top: -18px;
padding: 0 5px;
background-color: #F0F0F0;
}
.el-dialog-div {
height: 400px;
overflow: auto;
}
</style>

378
src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo copy.vue Normal file
View File

@ -0,0 +1,378 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm stand-stop-time"
:title="title"
:visible.sync="show"
width="480px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div class="el-dialog-div">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane :id="domIdBasicInfo" label="基本信息" name="first">
<el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="groupNumber">
<span slot="label">车组号</span>
<el-input v-model="addModel.groupNumber" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="type">
<span slot="label">服务类型</span>
<el-input v-model="addModel.type" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="serviceNumber">
<span slot="label">服务号</span>
<el-input v-model="addModel.serviceNumber" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="trainCode">
<span slot="label">序列号</span>
<el-input v-model="addModel.trainCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="driverCode">
<span slot="label">司机号</span>
<el-input v-model="addModel.driverCode" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="targetCode">
<span slot="label">目的地号</span>
<el-input v-model="addModel.targetCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="stationName">
<span slot="label">车站</span>
<el-input v-model="addModel.stationName" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="sectionCode">
<span slot="label">轨道</span>
<el-input v-model="addModel.sectionCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="nextStation">
<span slot="label">下一站</span>
<el-input v-model="addModel.nextStation" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="targetName">
<span slot="label">目的地</span>
<el-input v-model="addModel.targetName" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="trackingMode">
<span slot="label">跟踪模式</span>
<el-input v-model="addModel.trackingMode" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="runStatus">
<span slot="label">运行状态</span>
<el-input v-model="addModel.runStatus" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="departureTime">
<span slot="label">出发时刻</span>
<el-input v-model="addModel.departureTime" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="arrivedTime">
<span slot="label">到达时刻</span>
<el-input v-model="addModel.arrivedTime" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="planDeviation">
<span slot="label">计划偏离</span>
<el-input v-model="addModel.planDeviation" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane :id="domIdMarshalInfo" label="编组信息" name="second">
<el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="marshallingNo">
<span slot="label">编组号</span>
<el-input v-model="addModel.marshallingNo" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="carNo1">
<span slot="label">车头号1</span>
<el-input v-model="addModel.carNo1" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="carNo2">
<span slot="label">车头号2</span>
<el-input v-model="addModel.carNo2" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table :data="tableData" style="width: 100%" height="250">
<el-table-column prop="carriage" label="车厢" width="80" />
<el-table-column prop="carriageNumber" label="车厢号" width="80" />
</el-table>
</el-tab-pane>
<el-tab-pane :id="domIdAtpInfo" label="ATP信息" name="third">
<el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="trainId">
<span slot="label">车载ID</span>
<el-input v-model="addModel.trainId" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="directionType">
<span slot="label">运行方向</span>
<el-input v-model="addModel.directionType" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="drivingMode">
<span slot="label">驾驶模式</span>
<el-input v-model="addModel.drivingMode" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="speed">
<span slot="label">速度</span>
<el-input v-model="addModel.speed" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="stopQuasiState">
<span slot="label">停准状态</span>
<el-input v-model="addModel.stopQuasiState" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="doorStatus">
<span slot="label">车门状态</span>
<el-input v-model="addModel.doorStatus" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="runLevel">
<span slot="label">运行等级</span>
<el-input v-model="addModel.runLevel" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="stopState">
<span slot="label">停跳状态</span>
<el-input v-model="addModel.stopState" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="position">
<span slot="label">车头位置</span>
<el-input v-model="addModel.position" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="loadingRate">
<span slot="label">载重率</span>
<el-input v-model="addModel.loadingRate" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane :id="domIdCarAlarm" label="车辆报警" name="fourth" />
</el-tabs>
</div>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="19">
<el-button :id="domIdCancel" @click="cancel">退出</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
export default {
name: 'TrainDetailInfo',
mixins: [
CancelMouseState
],
data() {
return {
trainNoList: [],
trainList: [],
selected: null,
addModel: {
stationName:'',
groupNumber:'',
type:'',
serviceNumber:'',
trainCode:'',
driverCode:'',
targetCode:'',
sectionCode:'',
nextStation:'',
targetName:'',
trackingMode:'',
runStatus:'',
departureTime:'',
arrivedTime:'',
planDeviation:'',
marshallingNo:'',
carNo1:'',
carNo2:'',
trainId:'',
directionType:'',
drivingMode:'',
speed:'',
stopQuasiState:'',
doorStatus:'',
runLevel:'',
stopState:'',
position:'',
loadingRate:''
},
activeName:'first',
dialogShow: false,
loading: false,
tableData:[
{carriage:'1', carriageNumber:'101'},
{carriage:'2', carriageNumber:'102'},
{carriage:'3', carriageNumber:'103'},
{carriage:'4', carriageNumber:'104'},
{carriage:'5', carriageNumber:'105'},
{carriage:'6', carriageNumber:'106'}
]
};
},
computed: {
...mapGetters('map', [
'stationStandList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdCarAlarm() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.carAlarm.domId : '';
},
domIdBasicInfo() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.basicInfo.domId : '';
},
domIdMarshalInfo() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.marshalInfo.domId : '';
},
domIdAtpInfo() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.atpInfo.domId : '';
},
title() {
return '列车信息显示';
}
},
methods: {
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.addModel = {
stationName:'',
tripNumber: '',
groupNumber:''
};
}
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
this.mouseCancelState(this.selected);
},
handleClick() {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); });
}
}
};
</script>
<style scoped>
.chengdou-03__systerm .el-dialog .base-label {
background: rgba(0, 0, 0, x);
position: relative;
left: -5px;
top: -18px;
padding: 0 5px;
background-color: #F0F0F0;
}
.el-dialog-div {
height: 400px;
overflow: auto;
}
</style>

378
src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo.vue Normal file
View File

@ -0,0 +1,378 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm stand-stop-time"
:title="title"
:visible.sync="show"
width="480px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div class="el-dialog-div">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane :id="domIdBasicInfo" label="基本信息" name="first">
<el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="groupNumber">
<span slot="label">车组号</span>
<el-input v-model="addModel.groupNumber" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="type">
<span slot="label">服务类型</span>
<el-input v-model="addModel.type" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="serviceNumber">
<span slot="label">服务号</span>
<el-input v-model="addModel.serviceNumber" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="trainCode">
<span slot="label">序列号</span>
<el-input v-model="addModel.trainCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="driverCode">
<span slot="label">司机号</span>
<el-input v-model="addModel.driverCode" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="targetCode">
<span slot="label">目的地号</span>
<el-input v-model="addModel.targetCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="stationName">
<span slot="label">车站</span>
<el-input v-model="addModel.stationName" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="sectionCode">
<span slot="label">轨道</span>
<el-input v-model="addModel.sectionCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="nextStation">
<span slot="label">下一站</span>
<el-input v-model="addModel.nextStation" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="targetName">
<span slot="label">目的地</span>
<el-input v-model="addModel.targetName" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="trackingMode">
<span slot="label">跟踪模式</span>
<el-input v-model="addModel.trackingMode" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="runStatus">
<span slot="label">运行状态</span>
<el-input v-model="addModel.runStatus" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="departureTime">
<span slot="label">出发时刻</span>
<el-input v-model="addModel.departureTime" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="arrivedTime">
<span slot="label">到达时刻</span>
<el-input v-model="addModel.arrivedTime" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="planDeviation">
<span slot="label">计划偏离</span>
<el-input v-model="addModel.planDeviation" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane :id="domIdMarshalInfo" label="编组信息" name="second">
<el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="marshallingNo">
<span slot="label">编组号</span>
<el-input v-model="addModel.marshallingNo" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="carNo1">
<span slot="label">车头号1</span>
<el-input v-model="addModel.carNo1" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="carNo2">
<span slot="label">车头号2</span>
<el-input v-model="addModel.carNo2" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table :data="tableData" style="width: 100%" height="250">
<el-table-column prop="carriage" label="车厢" width="80" />
<el-table-column prop="carriageNumber" label="车厢号" width="80" />
</el-table>
</el-tab-pane>
<el-tab-pane :id="domIdAtpInfo" label="ATP信息" name="third">
<el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="trainId">
<span slot="label">车载ID</span>
<el-input v-model="addModel.trainId" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="directionType">
<span slot="label">运行方向</span>
<el-input v-model="addModel.directionType" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="drivingMode">
<span slot="label">驾驶模式</span>
<el-input v-model="addModel.drivingMode" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="speed">
<span slot="label">速度</span>
<el-input v-model="addModel.speed" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="stopQuasiState">
<span slot="label">停准状态</span>
<el-input v-model="addModel.stopQuasiState" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="doorStatus">
<span slot="label">车门状态</span>
<el-input v-model="addModel.doorStatus" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="runLevel">
<span slot="label">运行等级</span>
<el-input v-model="addModel.runLevel" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="stopState">
<span slot="label">停跳状态</span>
<el-input v-model="addModel.stopState" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="position">
<span slot="label">车头位置</span>
<el-input v-model="addModel.position" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="loadingRate">
<span slot="label">载重率</span>
<el-input v-model="addModel.loadingRate" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane :id="domIdCarAlarm" label="车辆报警" name="fourth" />
</el-tabs>
</div>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="19">
<el-button :id="domIdCancel" @click="cancel">退出</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
export default {
name: 'TrainDetailInfo',
mixins: [
CancelMouseState
],
data() {
return {
trainNoList: [],
trainList: [],
selected: null,
addModel: {
stationName:'',
groupNumber:'',
type:'',
serviceNumber:'',
trainCode:'',
driverCode:'',
targetCode:'',
sectionCode:'',
nextStation:'',
targetName:'',
trackingMode:'',
runStatus:'',
departureTime:'',
arrivedTime:'',
planDeviation:'',
marshallingNo:'',
carNo1:'',
carNo2:'',
trainId:'',
directionType:'',
drivingMode:'',
speed:'',
stopQuasiState:'',
doorStatus:'',
runLevel:'',
stopState:'',
position:'',
loadingRate:''
},
activeName:'first',
dialogShow: false,
loading: false,
tableData:[
{carriage:'1', carriageNumber:'101'},
{carriage:'2', carriageNumber:'102'},
{carriage:'3', carriageNumber:'103'},
{carriage:'4', carriageNumber:'104'},
{carriage:'5', carriageNumber:'105'},
{carriage:'6', carriageNumber:'106'}
]
};
},
computed: {
...mapGetters('map', [
'stationStandList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdCarAlarm() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.carAlarm.domId : '';
},
domIdBasicInfo() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.basicInfo.domId : '';
},
domIdMarshalInfo() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.marshalInfo.domId : '';
},
domIdAtpInfo() {
return this.dialogShow ? OperationEvent.Train.detailTrainInfo.atpInfo.domId : '';
},
title() {
return '列车信息显示';
}
},
methods: {
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.addModel = {
stationName:'',
tripNumber: '',
groupNumber:''
};
}
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
this.mouseCancelState(this.selected);
},
handleClick() {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); });
}
}
};
</script>
<style scoped>
.chengdou-03__systerm .el-dialog .base-label {
background: rgba(0, 0, 0, x);
position: relative;
left: -5px;
top: -18px;
padding: 0 5px;
background-color: #F0F0F0;
}
.el-dialog-div {
height: 400px;
overflow: auto;
}
</style>

174
src/jmapNew/theme/datie_tky/menus/dialog/trainEditNumber.vue Normal file
View File

@ -0,0 +1,174 @@
<template>
<el-dialog v-dialogDrag class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<div class="el-dialog-div">
<el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
<el-form-item>
<el-col :span="11">
<el-form-item prop="stationName">
<span slot="label">车站</span>
<el-input v-model="addModel.stationName" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="trainWindowCode">
<span slot="label">车次窗</span>
<el-input v-model="addModel.trainWindowCode" :disabled="true" />
</el-form-item>
</el-col>
</el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="旧车组号" prop="oldGroupNumber">
<el-select v-model="addModel.oldGroupNumber" filterable disabled>
<el-option v-for="train in trainList" :key="train.oldGroupNumber" :label="train.oldGroupNumber" :value="train.oldGroupNumber" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item label="新车组号" prop="newGroupNumber">
<el-select v-model="addModel.newGroupNumber">
<el-option v-for="train in trainList" :key="train.newGroupNumber" :label="train.newGroupNumber" :value="train.newGroupNumber" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<el-row justify="center" class="button-group-train">
<el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
export default {
name: 'TrainEditNumber',
mixins: [
CancelMouseState
],
data() {
return {
trainNoList: [],
trainList: [],
selected: null,
addModel: {
stationName: '',
trainWindowCode: '',
oldGroupNumber: '',
newGroupNumber: ''
},
rules: {
newGroupNumber: [
{ required: true, message: '请输入新车组号', trigger: 'blur'}
]
},
dialogShow: false,
loading: false
};
},
computed: {
...mapGetters('map', [
'stationStandList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
},
title() {
return '修改车组号';
}
},
methods: {
loadInitData(map) {
},
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.addModel = {
stationName: '',
trainWindowCode: '',
oldGroupNumber: '',
newGroupNumber: ''
};
}
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
this.mouseCancelState(this.selected);
},
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
const operate = {
send: true,
operation: OperationEvent.Train.editTrainNo.menu.operation
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
}
}).catch(() => {
this.loading = false;
this.doClose();
});
} else {
return false;
}
});
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); });
}
}
};
</script>
<style scoped>
.chengdou-03__systerm .el-dialog .base-label {
background: rgba(0, 0, 0, x);
position: relative;
left: -5px;
top: -18px;
padding: 0 5px;
background-color: #F0F0F0;
}
.el-dialog-div {
height: 400px;
overflow: auto;
}
</style>

193
src/jmapNew/theme/datie_tky/menus/dialog/trainMoveNumber.vue Normal file
View File

@ -0,0 +1,193 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm stand-stop-time"
:title="title"
:visible.sync="show"
width="480px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div class="el-dialog-div">
<el-form ref="form" size="small" label-width="90px" :model="addModel" label-position="left">
<el-row>
<el-col :span="11">
<el-form-item prop="stationName">
<span slot="label">车站</span>
<el-input v-model="addModel.stationName" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="trainWindowCode">
<span slot="label">车次窗</span>
<el-input v-model="addModel.trainWindowCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="车 组 号:" prop="groupNumber">
<el-select v-model="addModel.groupNumber" filterable disabled>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.groupNumber"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="purposeStationName">
<span slot="label">车站</span>
<el-input v-model="addModel.purposeStationName" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item prop="purposeTrainWindowCode">
<span slot="label">目的车次窗</span>
<el-input v-model="addModel.purposeTrainWindowCode" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
export default {
name: 'TrainMoveNumber',
mixins: [
CancelMouseState
],
data() {
return {
trainNoList: [],
trainList: [],
selected: null,
addModel: {
stationName: '',
trainWindowCode: '',
groupNumber: '',
purposeStationName: '',
purposeTrainWindowCode: ''
},
dialogShow: false,
loading: false
};
},
computed: {
...mapGetters('map', [
'stationStandList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
},
title() {
return '移动车组号';
}
},
methods: {
loadInitData(map) {
},
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.addModel = {
stationName: '',
trainWindowCode: '',
groupNumber: '',
purposeStationName: '',
purposeTrainWindowCode: ''
};
}
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
this.mouseCancelState(this.selected);
},
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
const operate = {
send: true,
operation: OperationEvent.Train.moveTrainNo.menu.operation
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
}
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow();
});
} else {
return false;
}
});
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); });
}
}
};
</script>
<style scoped>
.chengdou-03__systerm .el-dialog .base-label {
background: rgba(0, 0, 0, x);
position: relative;
left: -5px;
top: -18px;
padding: 0 5px;
background-color: #F0F0F0;
}
.el-dialog-div {
height: 400px;
overflow: auto;
}
</style>

155
src/jmapNew/theme/datie_tky/menus/dialog/updateTrip.vue Normal file
View File

@ -0,0 +1,155 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm updateTrip"
:title="title"
:visible.sync="show"
width="300px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div style="display: inline-block;margin-left:22px;">
<span class="tripNumberName">车次号:</span>
<div class="tripNumberClass">
<el-input v-model="tripNumber" size="mini" @blur="handleTripNumber" />
<div class="tripNumberTips">{{ messageTip1 }}</div>
</div>
</div>
<el-row justify="center" class="button-group">
<el-col :span="8" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
</el-dialog>
</template>
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'UpdateTrip',
components: {
NoticeInfo
},
data() {
return {
dialogShow:false,
tripNumber: '',
messageTip1:'',
loading: false
};
},
computed: {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Train.updateTrip.confirm.domId : '';
},
domIdChangeTripNumber() {
return this.dialogShow ? OperationEvent.Train.updateTrip.changeTripNumber.domId : '';
},
title() {
return '修改车次号';
}
},
methods: {
doShow(operate, tripNumber) {
this.tripNumber = tripNumber;
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
handleTripNumber() {
this.judgeTripNumber();
},
judgeTripNumber() {
const figuresOfServiceMinNumber = 2;
const figuresOfServiceMaxNumber = 6;
// this.$store.state.map.mapConfig.figuresOfServiceNumber;
const tripNumber = this.tripNumber;
const judge = /^[a-zA-Z0-9]*[\d]$/.test(this.tripNumber);
let result = false;
if (judge) {
if (tripNumber.toString().length > figuresOfServiceMaxNumber || tripNumber.toString().length < figuresOfServiceMinNumber) {
this.messageTip1 = '车次号长度' + figuresOfServiceMinNumber + '-' + figuresOfServiceMaxNumber + '位';
result = false;
} else {
this.messageTip1 = '';
result = true;
}
} else {
this.tripNumber = '';
this.messageTip1 = '请输入车次号(最后一位数字)';
}
return result;
},
commit() {
const result = this.judgeTripNumber();
if (this.tripNumber && result) {
const params = {
tripNumber: this.tripNumber
};
this.messageTip1 = '';
this.loading = true;
commitOperate(menuOperate.Train.updateTripCommit, params, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
}
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow();
});
}
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.tripNumber = '';
this.$store.dispatch('training/emitTipFresh');
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.tripNumberClass{
display: inline-block;
width:140px
}
.tripNumberName{
margin-left: 5px;
height: 22px;
vertical-align: top;
margin-right:10px;
display: inline-block;
}
.tripNumberTips{
margin-top: 10px;
color: #f00;
font-size: 13px;
text-align: left;
}
</style>

67
src/jmapNew/theme/datie_tky/menus/menuSignal.vue
View File

@ -2,18 +2,23 @@
<div>
<pop-menu ref="popMenu" :menu="menu" />
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
<password-box ref="passwordBox" pop-class="chengdou-03__systerm" @checkOver="passWordCommit" />
</div>
</template>
<script>
import { mapGetters } from 'vuex';
import PopMenu from '@/components/PopMenu';
// OperateMode
import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox';
import { DeviceMenu } from '@/scripts/ConstDic';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'SignalMenu',
components: {
PopMenu,
PasswordBox,
NoticeInfo
},
props: {
@ -57,8 +62,13 @@ export default {
},
{
label: '加封',
handler: this.seal
// cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
handler: this.lock,
cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
},
{
label: '解封',
handler: this.unlock,
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
}
]
}
@ -101,13 +111,44 @@ export default {
this.$refs.popMenu.resetShowPosition(point);
}
},
// 输入密码正确回调
passWordCommit(data) {
let operate = {};
if (data.nextCmdType) {
operate = {
over: true,
operation: data.operateNext,
cmdType: data.nextCmdType
};
}
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 总取消
signalTotalCancle() {
const model = this.selected; // 选择设备
commitOperate(menuOperate.Signal.signalTotalCancle, { signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 3).then(({valid, operate}) => {
if (valid) {
//
}
});
},
// 总人解
humanTrainRoute() {
const model = this.selected; // 选择设备
commitOperate(menuOperate.Signal.humanTrainRoute, { signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 0).then(({valid, operate}) => {
if (valid) {
operate['operateNext'] = this.Command.close.password.operation;
operate['nextCmdType'] = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
this.$refs.passwordBox.doShow(operate);
}
});
},
// 开放引导信号
signalRouteGuide() {
@ -118,8 +159,22 @@ export default {
},
// 加封
seal() {
lock() {
const model = this.selected; // 选择设备
commitOperate(menuOperate.Signal.lock, {signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 3).then(({valid, operate}) => {
if (valid) {
//
}
});
},
// 解封
unlock() {
const model = this.selected; // 选择设备
commitOperate(menuOperate.Signal.unlock, {signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 3).then(({valid, operate}) => {
if (valid) {
//
}
});
},
doClose() {
if (this.$refs && this.$refs.popMenu) {

25
src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
View File

@ -7,8 +7,7 @@
</template>
<script>
import PopMenu from '@/components/PopMenu';
// OperateMode
import { DeviceMenu } from '@/scripts/ConstDic';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@ -196,17 +195,17 @@ export default {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
// if (this.operatemode === OperateMode.FAULT) {
// if (!this.$store.state.scriptRecord.bgSet) {
// const menuHook = [{
// label: '道岔钩锁',
// handler: this.hookLock
// }];
// this.menu = [...this.menuForce, ...menuHook];
// } else {
// this.menu = this.menuForce;
// }
// }
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'STATION_SWITCH_MAN') {
const menuHook = [{
label: '道岔钩锁',
handler: this.hookLock
}];
this.menu = [...this.menuForce, ...menuHook];
} else {
this.menu = this.menuForce;
}
}
}
}

622
src/jmapNew/theme/datie_tky/menus/menuTrain.vue Normal file
View File

@ -0,0 +1,622 @@
<template>
<div>
<pop-menu ref="popMenu" :menu="menu" />
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
<train-control ref="trainControl" />
<train-edit-number ref="trainEditNumber" />
<train-create-number ref="trainCreateNumber" />
<train-move-number ref="trainMoveNumber" />
<train-delete-number ref="trainDeleteNumber" />
<train-detail-info ref="trainDetailInfo" />
<set-fault ref="setFault" pop-class="chengdou-03__systerm" />
<speed-limit ref="speedLimit" pop-class="chengdou-03__systerm" />
<train-stop ref="trainStop" pop-class="chengdou-03__systerm" />
<!-- <train-set-plan ref="trainSetPlan" /> -->
<update-trip ref="updateTrip" />
</div>
</template>
<script>
import PopMenu from '@/components/PopMenu';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import TrainControl from './dialog/trainControl';
import TrainEditNumber from './dialog/trainEditNumber';
import TrainMoveNumber from './dialog/trainMoveNumber';
import TrainCreateNumber from './dialog/trainCreateNumber';
import TrainDeleteNumber from './dialog/trainDeleteNumber';
import TrainDetailInfo from './dialog/trainDetailInfo';
// import TrainSetPlan from './dialog/trainSetPlan';
import UpdateTrip from './dialog/updateTrip';
import CancelMouseState from '@/mixin/CancelMouseState';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
export default {
name: 'MenuTrain',
components: {
PopMenu,
NoticeInfo,
TrainControl,
TrainEditNumber,
TrainMoveNumber,
TrainCreateNumber,
TrainDeleteNumber,
TrainDetailInfo,
SetFault,
UpdateTrip,
SpeedLimit,
TrainStop
// TrainSetPlan
},
mixins: [
CancelMouseState
],
props: {
selected: {
type: Object,
default() {
return null;
}
}
},
data() {
return {
menu: [],
menuNormal: {
Local: [
// {
// label: '设置计划车',
// handler: this.setPlanTrain,
// cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
// },
{
label: '变更车次号',
handler: this.modifyTripNumber,
cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
},
{
label: '删车次号',
handler: this.removeTripNumber,
cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE
}
],
Center: [
{
label: '变更车次号',
handler: this.modifyTripNumber,
cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
}
// {
// label: '设置计划车',
// handler: this.setPlanTrain,
// cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
// }
// {
// label: '新建车组号',
// handler: this.createTrainNo
// },
// {
// label: '移动车组号',
// handler: this.moveTrainNo
// },
// {
// label: '删除车组号',
// handler: this.deleteTrainNo
// },
// {
// label: '修改车组号',
// handler: this.editTrainNo
// },
// {
// label: '设计划车',
// handler: this.setPlanTrainId
// },
// {
// label: '设目的地',
// handler: this.destinationTrainId
// },
// {
// label: '设人工车',
// handler: this.artificialTrainId
// },
// {
// label: '设特殊人工车',
// handler: this.undeveloped
// },
// {
// label: '详细列车信息',
// handler: this.detailTrainInfo
// },
// {
// label: '属性',
// handler: this.undeveloped
// }
]
},
menuForce: [
{
label: '设置故障',
handler: this.setStoppage
},
{
label: '取消故障',
handler: this.cancelStoppage
},
{
label: '触发故障管理',
handler: this.triggerFaultManagement
}
],
menuDirective: [
{
label: '切换驾驶模式',
children: [
{
label: '转AM-C模式',
handler: this.handlerApplyAmcMode
},
{
label: '转SM-C模式',
handler: this.handlerApplySmcMode
},
{
label: '转AM-I模式',
handler: this.handlerApplyAmiMode
},
{
label: '转SM-I模式',
handler: this.handlerApplySmiMode
},
{
label: '转RM模式',
handler: this.handlerApplyRmMode
}
]
},
{
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '驾驶',
handler: this.handleDriveTo
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '发车',
handler: this.handleDepartTrain
},
{
label: '停车',
handler: this.handleParkingTrain
}
],
menuSpeed: [
{
label: '确认运行至前方站',
handler: this.limitSpeed
}
]
};
},
computed: {
...mapGetters('training', [
'mode',
'operatemode',
'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
])
},
watch: {
'$store.state.menuOperation.menuCount': function () {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && (!this.buttonOperation || this.$route.query.ctc)) {
this.doShow(this.$store.state.menuOperation.menuPosition);
} else {
this.doClose();
}
}
},
methods: {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
this.menu.forEach(item => { item.disabled = true; });
} else { this.menu.forEach(item => { item.disabled = false; }); }
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'DRIVER') {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {
this.initMenu();
if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
this.$refs.popMenu.resetShowPosition(point);
}
},
doClose() {
if (this.$refs && this.$refs.popMenu) {
this.$refs.popMenu.close();
}
},
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
},
triggerFaultManagement() {
this.$store.dispatch('training/setTriggerFaultCount', this.selected);
},
nextStation() {
this.trainSend('Drive_Ahead');
},
routeBlockRun() {
this.trainSend('Route_Block_Drive');
},
handleOverFuideSignal() {
this.trainSend('Drive_Through_The_Guide_Signal');
},
handleOverEedLight() {
this.trainSend('Drive_Through_The_Red_Light');
},
trainSend(type) {
const group = this.$route.query.group;
const param = {
commandType: type,
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 限速行驶
limitSpeed() {
const operate = {
start: true,
send: true,
code: this.selected.code,
operation: OperationEvent.Train.limitSpeed.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} else {
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
// 设置计划车
// setPlanTrain() {
// const operate = {
// start: true,
// code: this.selected.code,
// operation: OperationEvent.Train.editTrainId.menu.operation,
// param: {}
// };
// this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
// if (valid) {
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// this.$refs.trainSetPlan.doShow(operate, this.selected);
// }
// });
// },
// 设计划车
setPlanTrainId() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.setPlanTrainId.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainControl.doShow(operate, this.selected);
} else {
this.$refs.noticeInfo.doShow();
}
});
},
// 设目的地车
destinationTrainId() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.destinationTrainId.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainControl.doShow(operate, this.selected);
} else {
this.$refs.noticeInfo.doShow();
}
});
},
// 设人工车
artificialTrainId() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.artificialTrainId.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainControl.doShow(operate, this.selected);
} else {
this.$refs.noticeInfo.doShow();
}
});
},
// 详细列车信息
detailTrainInfo() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.detailTrainInfo.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainDetailInfo.doShow(operate, this.selected);
} else {
this.$refs.noticeInfo.doShow();
}
});
},
// 创建车组号
createTrainNo() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.createTrainNo.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainCreateNumber.doShow(operate, this.selected);
}
});
},
// 删除车组号
deleteTrainNo() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.deleteTrainNo.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainDeleteNumber.doShow(operate, this.selected);
}
});
},
// 修改车组号
editTrainNo() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.editTrainNo.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainEditNumber.doShow(operate, this.selected);
}
});
},
// 移动车组号
moveTrainNo() {
const operate = {
start: true,
code: this.selected.code,
operation: OperationEvent.Train.moveTrainNo.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainMoveNumber.doShow(operate, this.selected);
}
});
},
handlerApplyAmcMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Change_Preselection_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: { preselectionMode: 'AM_C' }
};
commitTrainSend(group, param).then(({ valid, operate }) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handlerApplySmcMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Change_Preselection_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: { preselectionMode: 'SM_C' }
};
commitTrainSend(group, param).then(({ valid, operate }) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handlerApplyAmiMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Change_Preselection_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: { preselectionMode: 'AM_I' }
};
commitTrainSend(group, param).then(({ valid, operate }) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handlerApplySmiMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Change_Preselection_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: { preselectionMode: 'SM_I' }
};
commitTrainSend(group, param).then(({ valid, operate }) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handlerApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Change_Preselection_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: { preselectionMode: 'RM' }
};
commitTrainSend(group, param).then(({ valid, operate }) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleDepartTrain() {
const group = this.$route.query.group;
const param = {
commandType: 'Depart_Train',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleParkingTrain() {
commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.trainStop.doShow(operate, this.selected);
}
});
},
modifyTripNumber() {
commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.updateTrip.doShow(operate, this.selected.tripNumber);
}
});
},
removeTripNumber() {
commitOperate(menuOperate.Train.removeTrip, {groupNumber:this.selected.groupNumber}, 3).then(({valid, operate})=>{
// if (valid) {}
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
undeveloped() {
this.doClose();
this.$alert('实现中......', '提示', {
confirmButtonText: '确定',
callback: action => {
}
});
}
}
};
</script>

19
src/jmapNew/theme/datie_tky/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -150,16 +150,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -330,7 +330,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

19
src/jmapNew/theme/foshan_01/model.js
View File

@ -45,9 +45,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -58,9 +58,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -68,6 +68,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -124,16 +124,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -325,7 +325,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

19
src/jmapNew/theme/fuzhou_01/model.js
View File

@ -45,9 +45,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -58,9 +58,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -68,6 +68,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -91,16 +91,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -295,7 +295,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

19
src/jmapNew/theme/haerbin_01/model.js
View File

@ -44,9 +44,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -57,9 +57,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,6 +67,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

12
src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
View File

@ -91,16 +91,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -294,7 +294,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

19
src/jmapNew/theme/nanjing_02/model.js
View File

@ -44,9 +44,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -57,9 +57,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,6 +67,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -230,16 +230,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -406,7 +406,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

19
src/jmapNew/theme/ningbo_01/model.js
View File

@ -54,9 +54,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,9 +67,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -77,6 +77,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

12
src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
View File

@ -231,16 +231,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -406,7 +406,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

19
src/jmapNew/theme/ningbo_03/model.js
View File

@ -54,9 +54,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,9 +67,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -77,6 +77,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

12
src/jmapNew/theme/race_01/menus/menuTrain.vue
View File

@ -233,10 +233,10 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -254,7 +254,7 @@ export default {
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -519,7 +519,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

18
src/jmapNew/theme/race_01/model.js
View File

@ -54,9 +54,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,9 +67,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -77,6 +77,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

12
src/jmapNew/theme/xian_01/menus/menuTrain.vue
View File

@ -175,16 +175,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -464,7 +464,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

18
src/jmapNew/theme/xian_01/model.js
View File

@ -45,9 +45,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -58,9 +58,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -68,6 +68,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -253,16 +253,16 @@ export default {
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
// {
// label: '限速指令',
// handler: this.handleSpeedLimit
// },
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
label: '驾驶',
handler: this.handleDriveTo
},
{
@ -436,7 +436,7 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
// 驾驶（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {

21
src/jmapNew/theme/xian_02/model.js
View File

@ -48,29 +48,38 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
}
return model;
}
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
}
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

9
src/scripts/ConstConfig.js
View File

@ -74,7 +74,14 @@ export default {
{label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '},
{label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department'},
{label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING', enLabel: 'Parking Signal Building'},
{label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant'}
{label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant'},
{label: '车站站长', value: 'STATION_MASTER', enLabel: 'StationMaster'},
{label: '车站信号员', value: 'STATION_SIGNALER', enLabel: 'StationSignaler'},
{label: '车站客运员', value: 'STATION_PASSENGER', enLabel: 'StationPassenger'},
{label: '车站扳道员', value: 'STATION_SWITCH_MAN', enLabel: 'StationSwitchMan'},
{label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator'},
{label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker'},
{label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager'}
],
releaseReview: [

10
src/scripts/ConstDic.js
View File

@ -168,7 +168,15 @@ export const SimulationType = {
STATION_SUPERVISOR: '车站值班员',
DRIVER: '司机',
MAINTAINER: '通号',
STATION_ASSISTANT: '车站助理'
STATION_ASSISTANT: '车站助理',
STATION_MASTER:'车站站长',
STATION_SIGNALER:'车站信号员',
STATION_PASSENGER:'车站客运员',
STATION_SWITCH_MAN:'车站扳道员',
STATION_FACILITATOR:'车站引导员',
STATION_WORKER:'车站工务工',
DEVICE_MANAGER:'设备管理员'
};
export const UrlConfig = {
displayNew: '/displayNew',

30
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -91,7 +91,8 @@ export default {
CMD_DRIVER_PRESELECTION_MODE_UP:{value:'Driver_Preselection_Mode_Up', label:'列车预选模式升'},
CMD_DRIVER_DOOR_MODE:{value:'Driver_Door_Mode', label:'列车门模式'},
CMD_DRIVER_DOOR_SELECTION:{value:'Driver_Door_Selection', label:'列车门选择'},
CMD_DRIVER_CONFIRM:{value:'Driver_Confirm', label:'确认'}
CMD_DRIVER_CONFIRM:{value:'Driver_Confirm', label:'确认'},
CMD_DRIVER_STOP:{value: 'Driver_Stop', label: '停车'}
},
// 信号机操作
@ -139,7 +140,11 @@ export default {
/** 设置保护 */
CMD_SIGNAL_SET_OVERLAP : {value: 'Signal_Set_Overlap', label: '设置保护'},
/** 冲突进路办理 */
CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM:{value: 'Signal_Conflict_Route_Set_Confirm', label: '冲突进路办理'}
CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM:{value: 'Signal_Conflict_Route_Set_Confirm', label: '冲突进路办理'},
/** 信号机点灯 */
CMD_SIGNAL_TURN_ON: {value: 'Signal_Turn_On', label: '信号机点灯'},
/** 信号机灭灯 */
CMD_SIGNAL_TURN_OFF: {value: 'Signal_Turn_Off', label: '信号机灭灯'}
},
// 物理区段操作
@ -391,25 +396,27 @@ export default {
CTC_CANCEL_DEPARTURE_NOTICE: {value: 'CTC_CANCEL_DEPARTURE_NOTICE', label: '取消发预'},
CTC_FINISH_DEPARTURE: {value: 'CTC_FINISH_DEPARTURE', label: '完成发点'},
CTC_CANCEL_DEPARTURE: {value: 'CTC_CANCEL_DEPARTURE', label: '取消发点'},
CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION:{value:'ASSIST_PRESS_DOWN_TURN_DIRECTION', label:'改方'},
CTC_AUTO_TRIGGER: {value: 'CTC_AUTO_TRIGGER', label: '自动触发'},
CTC_ASSIST_PRESS_MAIN_ASSIST:{value: 'ASSIST_PRESS_MAIN_ASSIST', label: '总辅助'},
CTC_ASSIST_PRESS_RECEIVE_ASSIST:{value: 'ASSIST_PRESS_RECEIVE_ASSIST', label: '接辅助'},
CTC_ASSIST_PRESS_DELIVER_ASSIST:{value: 'ASSIST_PRESS_DELIVER_ASSIST', label: '发辅助'},
CTC_ASSIST_PRESS_BLOCK:{value: 'ASSIST_PRESS_BLOCK', label: '阻塞'},
CTC_ASSIST_PRESS_RESTORE:{value: 'ASSIST_PRESS_RESTORE', label: '复原'},
CTC_ASSIST_PRESS_ACCIDENT:{value: 'ASSIST_PRESS_ACCIDENT', label: '事故'},
CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION:{value:'ASSIST_PRESS_DOWN_TURN_DIRECTION', label:'改方'},
// CTC_BATCH_MODIFY_RUN_PLAN:{value: 'CTC_BATCH_MODIFY_RUN_PLAN', label: '批量修改股道'},
CTC_MODIFY_SECTION:{value: 'CTC_MODIFY_SECTION', label: '修改股道'},
CTC_STATION_SEND_OUT_RUN_PLAN:{value: 'CTC_STATION_SEND_OUT_RUN_PLAN', label: '车站发送计划'},
CTC_CANCEL_TWINKLE:{value: 'CTC_CANCEL_TWINKLE', label: '车站取消红闪'},
// CTC_REMOVE_RUN_PLAN:{value: 'CTC_REMOVE_RUN_PLAN', label: '移除行车日志'},
CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'},
CTC_MODIFY_TRIP_NUMBER:{value: 'CTC_MODIFY_TRIP_NUMBER', label: '修改车次号(大铁CTC)'},
CTC_SEND_NOTICE:{value: 'CTC_SEND_NOTICE', label: '发送发车预告'},
CTC_AGREE_NOTICE:{value: 'CTC_AGREE_NOTICE', label: '同意发车预告'},
CTC_LOG_CANCEL_ARRIVE:{value: 'CTC_LOG_CANCEL_ARRIVE', label: '取消到达'},
CTC_LOG_CANCEL_DEPARTURE:{value: 'CTC_LOG_CANCEL_DEPARTURE', label: '取消出发'},
CTC_LOG_CANCEL_BLOCK:{value: 'CTC_LOG_CANCEL_BLOCK', label: '取消闭塞'},
@ -428,17 +435,22 @@ export default {
CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'CTC_RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'},
CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'},
CTC_ZONE_SAVE_RUN_PLAN:{value:'CTC_ZONE_SAVE_RUN_PLAN', label: '调度台添加行车计划'},
CTC_ZONE_DELETE_RUN_PLAN:{value:'CTC_ZONE_DELETE_RUN_PLAN', label: '调度台删除行车计划'},
CTC_ZONE_RELEASE_ALL_RUN_PLAN:{value:'CTC_ZONE_RELEASE_ALL_RUN_PLAN', label: '调度台发布所有行车计划'},
CTC_ZONE_RELEASE_STATION_RUN_PLAN:{value:'CTC_ZONE_RELEASE_STATION_RUN_PLAN', label: '调度台发布车站行车计划'},
CTC_STATION_SIGN_RUN_PLAN:{value:'CTC_STATION_SIGN_RUN_PLAN', label: '车站签收阶段计划'},
CTC_ZONE_SAVE_TRACK_SECTION:{value:'CTC_ZONE_SAVE_TRACK_SECTION', label: '调度台行车计划修改股道'},
CTC_ZONE_SAVE_TRIP_NUMBER:{value:'CTC_ZONE_SAVE_TRIP_NUMBER', label: '调度台行车计划修改车次'},
CTC_ZONE_SAVE_PLAN_TIME:{value:'CTC_ZONE_SAVE_PLAN_TIME', label: '调度台行车计划修改时间'},
CTC_ZONE_SAVE_DIRECTION:{value:'CTC_ZONE_SAVE_DIRECTION', label: '调度台行车计划修改出入口'},
CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'}
CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'},
CTC_ZONE_SAVE_RUN_PLAN:{value:'CTC_ZONE_SAVE_RUN_PLAN', label: '调度台添加行车计划'},
CTC_ZONE_DELETE_RUN_PLAN:{value:'CTC_ZONE_DELETE_RUN_PLAN', label: '调度台删除行车计划'},
CTC_ZONE_RELEASE_ALL_RUN_PLAN:{value:'CTC_ZONE_RELEASE_ALL_RUN_PLAN', label: '调度台发布所有行车计划'},
CTC_ZONE_RELEASE_STATION_RUN_PLAN:{value:'CTC_ZONE_RELEASE_STATION_RUN_PLAN', label: '调度台发布车站行车计划'},
CTC_QUERY_DISPATCH_COMMAND:{value:'CTC_QUERY_DISPATCH_COMMAND', label: '调度台命令查询'},
CTC_SEND_DISPATCH_COMMAND:{value:'CTC_SEND_DISPATCH_COMMAND', label: '调度台命令下达'},
CTC_SIGN_DISPATCH_COMMAND:{value:'CTC_SIGN_DISPATCH_COMMAND', label: '调度台命令签收'},
CTC_READ_DISPATCH_COMMAND:{value:'CTC_READ_DISPATCH_COMMAND', label: '调度台命令已读'}
},
RAIL: {

6
src/scripts/cmdPlugin/CommandHandler.js
View File

@ -46,7 +46,7 @@ class CommandHandle {
// },
Train_Trust: {
operate: 'Train_Trust',
paramList:[{name: 'groupNumber'}, {name: 'targetDeviceCode'}],
paramList:[{name: 'groupNumber'}, {name: 'param'}],
simulationRole: 'Center',
controlMode: ['OperateCenterControl'],
conditionList: []
@ -73,6 +73,10 @@ class CommandHandle {
Train_Calculate_Interval: {
operate: 'Train_Calculate_Interval',
paramList: [{name: 'calculateParam'}]
},
Driver_Stop: {
operate: 'Driver_Stop',
paramList: [{name: 'groupNumber'}, {name: 'eb'}]
}
}
};

14
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -1774,17 +1774,17 @@ export const OperationEvent = {
}
},
// 点灯 （大铁）
signalLight: {
signalTurnOn: {
menuButton: {
operation: '3231',
domId: '_Tips-Signal-signalLight-MenuButton{BOTTOM}'
domId: '_Tips-Signal-signalTurnOn-MenuButton{BOTTOM}'
}
},
// 灭灯 （大铁）
signalDestroy: {
signalTurnOff: {
menuButton: {
operation: '3232',
domId: '_Tips-Signal-signalDestroy-MenuButton{BOTTOM}'
domId: '_Tips-Signal-signalTurnOff-MenuButton{BOTTOM}'
}
}
},
@ -3431,6 +3431,12 @@ export const OperationEvent = {
operation: '70v',
domId: '_Tips-Train-removeTrip-Menu'
}
},
driverStop: {
menu: {
operation: '70w',
domId: '_Tips-Train-driverStop-Menu'
}
}
},

14
src/utils/baidu_tts_cors.js
View File

@ -13,7 +13,7 @@
* onTimeout {Function} 超时后调用，默认超时时间为60秒
*/
export function btts(param, options) {
var url = 'http://tsn.baidu.com/text2audio';
var url = process.env.NODE_ENV === 'development' ? 'http://tsn.baidu.com/text2audio' : 'https://tsn.baidu.com/text2audio';
var opt = options || {};
var p = param || {};
@ -49,7 +49,7 @@ export function btts(param, options) {
// 创建form参数
var data = {};
for (var p in param) {
data[p] = param[p]
data[p] = param[p];
}
// 赋值预定义参数
@ -60,7 +60,7 @@ export function btts(param, options) {
// 序列化参数列表
var fd = [];
for(var k in data) {
for (var k in data) {
fd.push(k + '=' + encodeURIComponent(data[k]));
}
@ -70,7 +70,7 @@ export function btts(param, options) {
xhr.send(fd.join('&'));
// 用timeout可以更兼容的处理兼容超时
var timer = setTimeout(function(){
var timer = setTimeout(function() {
xhr.abort();
isFunction(opt.onTimeout) && opt.onTimeout();
}, timeout);
@ -90,7 +90,7 @@ export function btts(param, options) {
if (opt.autoDestory) {
audio.onended = function() {
document.body.removeChild(audio);
}
};
}
isFunction(opt.onSuccess) && opt.onSuccess(audio);
@ -98,7 +98,7 @@ export function btts(param, options) {
// 用来处理错误
if (xhr.response.type === 'application/json') {
frd.onload = function(){
frd.onload = function() {
var text = frd.result;
isFunction(opt.onError) && opt.onError(text);
};
@ -106,7 +106,7 @@ export function btts(param, options) {
}
}
}
}
};
// 判断是否是函数
function isFunction(obj) {

9
src/views/dispatcherStationManage/cmdManage.vue
View File

@ -181,7 +181,7 @@ export default {
},
beforeDestroy() {},
mounted() {
this.searchCmd();
// this.searchCmd();
},
methods:{
tableRowClassName({row, rowIndex}) {
@ -205,7 +205,8 @@ export default {
this.currentInfo = obj;
if (!this.getSignInfo(obj.receiverInfos).receivedTime) {
const data = {
commandId: obj.id
commandId: obj.id,
title: obj.title
};
sendCommandNew(this.group, 'CTC_READ_DISPATCH_COMMAND', data).then((res) => {
console.log(res, '---res');
@ -241,7 +242,7 @@ export default {
},
signCmd(status) {
if (!this.commandId) { return; }
const signInfo = { commandId: this.commandId, signedBy: this.getActiveUser.memberId, signedStatus: status };
const signInfo = { commandId: this.commandId, signedBy: this.getActiveUser.memberId, signedStatus: status, title: this.currentInfo.title };
const data = {
signInfo: signInfo
};
@ -290,7 +291,7 @@ export default {
},
searchCmd() {
this.cmdTableData = [];
sendCommandNew(this.group, 'CTC_QUERY_DISPATCH_COMMAND').then((res) => {
sendCommandNew(this.group, 'CTC_QUERY_DISPATCH_COMMAND', {}).then((res) => {
console.log(res, '---res');
if (res.code == 200) {
this.cmdTableData = res.data;

2
src/views/dispatcherStationManage/dispatchCmd.vue
View File

@ -823,7 +823,7 @@ export default {
},
searchCmd() {
return new Promise((resolve, reject) => {
sendCommandNew(this.group, 'CTC_QUERY_DISPATCH_COMMAND').then((res) => {
sendCommandNew(this.group, 'CTC_QUERY_DISPATCH_COMMAND', {}).then((res) => {
console.log(res, '---res----');
this.seachData = res.data;
resolve();

5
src/views/dispatcherStationManage/signedCmd.vue
View File

@ -223,7 +223,8 @@ export default {
hasReadCmd() {
if (!this.commandId) { return; }
const data = {
commandId: this.commandId
commandId: this.commandId,
title: this.signedData.title
};
sendCommandNew(this.group, 'CTC_READ_DISPATCH_COMMAND', data).then((res) => {
console.log(res, '---res');
@ -233,7 +234,7 @@ export default {
},
signCmd(status) {
if (!this.commandId) { return; }
const signInfo = { commandId: this.commandId, signedBy: this.signedId, signedStatus: status };
const signInfo = { commandId: this.commandId, signedBy: this.signedId, signedStatus: status, title: this.signedData.title };
const data = {
signInfo: signInfo
};

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

@ -388,6 +388,14 @@ export default {
const maintainerList = {};
const parentDepartmentList = {};
const parkingLotSignalBuilding = {};
const stationAssistant = {};
const stationMaster = {};
const stationSignaler = {};
const stationPassenger = {};
const stationSwitchMan = {};
const stationFacilitator = {};
const stationWorker = {};
const deviceManager = {};
val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
this.memberData[item.id]['active'] = false;
@ -436,6 +444,46 @@ export default {
this.memberData[item.id].labelName = '停车场信号楼' + (item.name || '');
parkingLotSignalBuilding[item.id] = this.memberData[item.id];
break;
case 'STATION_ASSISTANT':
this.memberData[item.id].label = '车站助理-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '车站助理-' + device.name + ( item.name || '');
stationAssistant[item.id] = this.memberData[item.id];
break;
case 'STATION_MASTER':
this.memberData[item.id].label = '车站站长-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name || '');
stationMaster[item.id] = this.memberData[item.id];
break;
case 'STATION_SIGNALER':
this.memberData[item.id].label = '车站信号员-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '车站信号员-' + device.name + (item.name || '');
stationSignaler[item.id] = this.memberData[item.id];
break;
case 'STATION_PASSENGER':
this.memberData[item.id].label = '车站客运员-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '车站客运员-' + device.name + (item.name || '');
stationPassenger[item.id] = this.memberData[item.id];
break;
case 'STATION_SWITCH_MAN':
this.memberData[item.id].label = '车站扳道员-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '车站扳道员-' + device.name + (item.name || '');
stationSwitchMan[item.id] = this.memberData[item.id];
break;
case 'STATION_FACILITATOR':
this.memberData[item.id].label = '车站引导员-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '车站引导员-' + device.name + (item.name || '');
stationFacilitator[item.id] = this.memberData[item.id];
break;
case 'STATION_WORKER':
this.memberData[item.id].label = '车站工务工-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name || '');
stationWorker[item.id] = this.memberData[item.id];
break;
case 'DEVICE_MANAGER':
this.memberData[item.id].label = '设备管理员-' + device.name + (item.name || '');
this.memberData[item.id].labelName = '设备管理员-' + device.name + (item.name || '');
deviceManager[item.id] = this.memberData[item.id];
break;
}
});
// { label: '全部集中站', value: 'allConcentrateStation', active: false, sign: 'DEVICE_STATION' },
@ -483,7 +531,56 @@ export default {
id: 'parkingLotSignalBuilding',
type: 'role',
children: parkingLotSignalBuilding
}];
},
{
label: '车站助理',
id: 'stationAssistant',
type: 'role',
children: stationAssistant
},
{
label: '车站站长',
id: 'stationMaster',
type: 'role',
children: stationMaster
},
{
label: '车站信号员',
id: 'stationSignaler',
type: 'role',
children: stationSignaler
},
{
label: '车站客运员',
id: 'stationPassenger',
type: 'role',
children: stationPassenger
},
{
label: '车站扳道员',
id: 'stationSwitchMan',
type: 'role',
children: stationSwitchMan
},
{
label: '车站引导员',
id: 'stationFacilitator',
type: 'role',
children: stationFacilitator
},
{
label: '车站工务工',
id: 'stationWorker',
type: 'role',
children: stationWorker
},
{
label: '设备管理员',
id: 'deviceManager',
type: 'role',
children: deviceManager
}
];
this.initCommonMemberList();
this.filterNode();
// this.$nextTick(() => {
@ -804,10 +901,10 @@ export default {
// 停止录制 发送语音
stopRecording() {
this.audioPlay = true;
clearInterval(this.inter);
this.seconds = 0;
const that = this;
this.recorders.stopRecording(function(blobURL) {
clearInterval(that.inter);
that.seconds = 0;
const blob = that.recorders.getBlob();
const fd = new FormData();
fd.append('file', blob);
@ -1016,6 +1113,14 @@ export default {
const temMaintainerList = [];
const temDriverList = [];
const temDepotDispatcherList = [];
const temStationAssistList = [];
const temStationMasterList = [];
const temStationSignalerList = [];
const temStationPassengerList = [];
const temStationSwitchManList = [];
const temStationFacilitatorList = [];
const temStationWorkerList = [];
const temDeviceManagerList = [];
this.$store.state.training.memberList.forEach(item =>{
switch (item.type) {
case 'DISPATCHER':
@ -1033,9 +1138,35 @@ export default {
case 'DEPOT_DISPATCHER':
temDepotDispatcherList.push({memberId: item.id, connect:true });
break;
case 'STATION_ASSISTANT':
temStationAssistList.push({memberId: item.id, connect:true });
break;
case 'STATION_MASTER':
temStationMasterList.push({memberId: item.id, connect:true });
break;
case 'STATION_SIGNALER':
temStationSignalerList.push({memberId: item.id, connect:true });
break;
case 'STATION_PASSENGER':
temStationPassengerList.push({memberId: item.id, connect:true });
break;
case 'STATION_SWITCH_MAN':
temStationSwitchManList.push({memberId: item.id, connect:true });
break;
case 'STATION_FACILITATOR':
temStationFacilitatorList.push({memberId: item.id, connect:true });
break;
case 'STATION_WORKER':
temStationWorkerList.push({memberId: item.id, connect:true });
break;
case 'DEVICE_MANAGER':
temDeviceManagerList.push({memberId: item.id, connect:true });
break;
}
});
this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList];
this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList,
...temStationAssistList, ...temStationMasterList, ...temStationSignalerList, ...temStationPassengerList, ...temStationSwitchManList,
...temStationFacilitatorList, temStationWorkerList, temDeviceManagerList];
if (this.userRole == 'AUDIENCE' || this.commonConversation) {
this.conversitionMemberList = [];
this.messageList = [...this.commonMessageList];

4
src/views/newMap/displayCity/utils.js
View File

@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
lastData = JSON.parse(lastData);
const lastMemberList = [];
// const electricDispatcherList = [];
const deviceListData = [[], [], [], [], [], [], [], []];
const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
const driverList = [];
lastData.forEach((member, index)=>{
if (member.userId && member.userId == store.state.user.id) {
@ -37,7 +37,7 @@ export function covertMemberData (activeTrainList, resp) {
member.label = member.type + name + userName;
member.normalName = member.type + name;
}
const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼'];
const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员'];
const deviceTypeIndex = deviceType.indexOf(member.type);
if (deviceTypeIndex >= 0) {
if (deviceTypeIndex == 3) {

86
src/views/newMap/displayNew/demon/modifyTime.vue Normal file
View File

@ -0,0 +1,86 @@
<template>
<el-dialog v-dialogDrag :title="title" :visible.sync="show" width="550px" :before-close="doClose">
<el-form ref="form" label-width="120px" :model="formModel" :rules="rules">
<el-form-item :label="$t('display.setTime.systemTime')" prop="time">
<el-time-picker
v-model="formModel.time"
:picker-options="pickerOptions"
:placeholder="$t('display.setTime.anyTime')"
/>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="show = false">{{ $t('global.cancel') }}</el-button>
<el-button type="primary" :loading="status" @click="handleSure">{{ $t('global.confirm') }}</el-button>
</span>
</el-dialog>
</template>
<script>
import { modifySystemTime } from '@/api/simulation';
import { prefixIntrger } from '@/utils/date';
// 修改系统时间
export default {
data() {
return {
show: false,
formModel: {
time: new Date()
},
maxNumber: 1,
pickerOptions: { selectableRange: '00:00:00 - 23:59:59' },
status: false
};
},
computed: {
title() {
return '修改系统时间';
},
group() {
return this.$route.query.group;
},
rules() {
return {
time: [
{ required: true, message: this.$t('display.setTime.selectSystemTime'), trigger: 'change' }
]
};
}
},
methods: {
doShow() {
// this.formModel.time = new Date(this.$store.state.training.initTime || null);
this.show = true;
},
doClose() {
this.status = false;
this.show = false;
},
formatTime(time) {
const hh = prefixIntrger(time.getHours(), 2);
const mm = prefixIntrger(time.getMinutes(), 2);
const ss = prefixIntrger(time.getSeconds(), 2);
return `${hh}:${mm}:${ss}`;
},
handleSure() {
this.$refs.form.validate((valid) => {
if (valid) {
this.status = true;
const model = {
time: this.formatTime(this.formModel.time)
};
modifySystemTime(model, this.group).then(resp => {
this.status = false;
this.$message.success('修改系统时间成功！');
}).catch(() => {
this.status = false;
this.$messageBox('修改系统时间失败，请稍后再试');
});
this.doClose();
}
});
}
}
};
</script>

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

@ -5,7 +5,7 @@
<el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
<!-- 地图错误判断 -->
<!-- 设备视图 -->
<el-button v-if="jl3dmodelShow && !isContest && project !== 'bjd' && project !== 'teaching'" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
<el-button v-if="jl3dmodelShow && !isContest && project !== 'bjd' && $route.query.lineCode !== '16' && project !== 'teaching'" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
<!-- 三维视图/数字沙盘 -->
<el-button v-if="jl3dnameShow && !isContest && project !== 'bjd' && $route.query.lineCode !== '16' && project !== 'teaching'" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
<!-- cctv视图 -->

73
src/views/newMap/displayNew/dispatherContest/sceneList.vue
View File

@ -193,6 +193,79 @@ export default {
}
case 'PARKING_LOT_SIGNAL_BUILDING': {
member.label = '停车场信号楼' + (member.name ? member.name : '');
break;
}
case 'STATION_ASSISTANT': {
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '车站助理-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
// member.label = '车站助理' + (member.name ? member.name : '');
break;
}
case 'STATION_MASTER': {
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '车站站长-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
// member.label = '车站站长' + (member.name ? member.name : '');
break;
}
case 'STATION_SIGNALER': {
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '车站信号员-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
// member.label = '车站信号员' + (member.name ? member.name : '');
break;
}
case 'STATION_PASSENGER': {
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '车站客运员-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
// member.label = '车站客运员' + (member.name ? member.name : '');
break;
}
case 'STATION_SWITCH_MAN': {
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '车站扳道员-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
// member.label = '车站扳道员' + (member.name ? member.name : '');
break;
}
case 'STATION_FACILITATOR': {
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '车站引导员-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
// member.label = '车站引导员' + (member.name ? member.name : '');
break;
}
case 'STATION_WORKER': {
// member.label = '车站工务工' + (member.name ? member.name : '');
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '车站工务工-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
break;
}
case 'DEVICE_MANAGER': {
const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (device) {
member.label = '设备管理员-' + device.name + (member.name ? member.name : '');
member.deviceName = device.name;
}
// member.label = '设备管理员' + (member.name ? member.name : '');
break;
}
}
});

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

@ -1,17 +1,21 @@
<template>
<div class="main" :style="{width: canvasWidth+'px',height:'100%',position:'absolute',overflow:'hidden'}">
<div class="main" :style="{width: canvasWidth+'px'}">
<template>
<transition name="el-zoom-in-bottom">
<map-system-draft ref="mapCanvas" @back="back" />
<map-system-draft v-show="!specialDispatch" ref="mapCanvas" @back="back" />
</transition>
<menu-demon v-if="isDemon" ref="menuDemon" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" @start="start" @end="end" />
<menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" :tip-bottom="tipBottom" />
<menu-exam v-if="isExam" ref="menuExam" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" />
<menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :offset="offset" :text-status-height="textStatusHeight" :data-error="dataError" @start="start" @end="end" />
<menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :offset="offset" :text-status-height="textStatusHeight" :data-error="dataError" @start="start" @end="end" @changeShowMap="changeShowMap" />
<menu-dispather-contest v-if="isContest" ref="menuDispatherContest" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" @start="start" @end="end" />
<div v-if="lineCode === '16'" v-show="prdType === '02'&& !showMap" style="position:absolute;width: 100%;top:0;left:0;">
<!-- && (isScript || isDemon) -->
<dispatcher-station ref="dispatcherStation" @changeShowMap="changeShowMap" />
</div>
</template>
<menu-train-list v-if="isDemon||isContest||isScript" />
<menu-system-time v-if="$route.query.lineCode !== '16'" ref="menuSystemTime" :offset="offset" :group="group" />
<menu-system-time v-if="lineCode !== '16'" ref="menuSystemTime" :offset="offset" :group="group" />
</div>
</template>
<script>
@ -29,6 +33,7 @@ import MenuTrainList from '@/views/newMap/displayNew/menuTrainList';
import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
import { clearSimulation, getSimulationInfoNew, ranAsPlan, exitRunPlan } from '@/api/simulation';
import { loadMapDataById } from '@/utils/loaddata';
import DispatcherStation from '../jointTrainingNew/dispatcherStation';
import { EventBus } from '@/scripts/event-bus';
export default {
@ -41,7 +46,8 @@ export default {
MenuSystemTime,
MenuTrainList,
MenuDispatherContest,
MenuScript
MenuScript,
DispatcherStation
},
data() {
return {
@ -51,7 +57,8 @@ export default {
textStatusHeight: 0,
planRunning:false,
dataError: false,
group:''
group:'',
showMap: false
};
},
computed:{
@ -87,6 +94,15 @@ export default {
},
height() {
return this.$store.state.app.height;
},
prdType() {
return this.$store.state.training.prdType;
},
lineCode() {
return this.$route.query.lineCode;
},
specialDispatch() {
return (this.lineCode === '14' && this.$store.state.training.prdType === '02') || (this.lineCode === '16' && this.$store.state.training.prdType === '02' && !this.showMap);
}
},
watch:{
@ -201,7 +217,6 @@ export default {
this.group = this.$route.query.group;
this.$store.dispatch('training/reset');
this.loadSimulationInfo();
this.loadMapData();
},
// 新版地图根据仿真group获取仿真基础信息
async loadSimulationInfo() {
@ -221,6 +236,10 @@ export default {
if (resp.data.planRunning) {
this.$store.commit('training/start');
}
if (this.isScript) {
this.$store.dispatch('training/setPrdType', '02');
}
this.loadMapData();
} else {
this.$messageBox('此地图数据正在维护中,无法运行！');
}
@ -321,7 +340,20 @@ export default {
}).catch(() => {
this.$messageBox(this.$t('display.demon.endSimulationFail'));
});
},
changeShowMap(flag) {
this.showMap = flag;
}
}
};
</script>
<style scoped lang="scss" rel="stylesheep/scss">
.main {
display: block;
width: 100% !important;
height: 100%;
overflow: hidden;
position: relative;
background: #000000;
}
</style>

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

@ -29,6 +29,9 @@
<template v-if="isScriptRun">
<el-button type="danger" size="small" @click="handleQuitQuest">退出剧本</el-button>
</template>
<template v-if="$route.query.lineCode == '16'">
<el-button type="primary" size="small" @click="modifySystemTime">修改系统时间</el-button>
</template>
<template v-else-if="!projectDevice">
<el-button v-if="project !== 'srsandbox' && $route.query.lineCode !== '16' " type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
<!-- isDisable&& -->
@ -51,6 +54,7 @@
/>
<set-time ref="setTime" @ConfirmSelectBeginTime="start" />
<modify-time v-if="$route.query.lineCode == '16'" ref="modifySysTime" />
</div>
</template>
@ -58,6 +62,7 @@
<!-- 单人仿真 -->
<script>
import SetTime from './demon/setTime';
import ModifyTime from './demon/modifyTime';
import DemonMenu from './demonMenu';
import DemonChat from './demonChat';
import { Notification } from 'element-ui';
@ -80,6 +85,7 @@ export default {
name: 'MenuDemon',
components: {
SetTime,
ModifyTime,
DemonChat,
MenuSchema,
DemonMenu,
@ -306,6 +312,10 @@ export default {
this.$messageBox(this.$t('display.demon.exitTaskFail'));
});
},
// 修改系统时间
modifySystemTime() {
this.$refs.modifySysTime.doShow();
},
// 选择脚本
async selectQuest({row, id, mapLocation, roleName}) {
try {

138
src/views/newMap/displayNew/menuSchema.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<div style="height:100%;">
<div class="schema" :style="{top: offset+'px'}">
<select-station v-show="!$route.query.joint" v-if="isShowSelectStation && !isScript" ref="selectStation" :style-css="'width: 100px;'" />
<el-select v-model="speed" style="width: 100px;" size="small" @change="speedChange">
@ -12,9 +12,12 @@
</el-select>
<template v-if="!dataError">
<el-button-group v-if="project !== 'bjd'">
<el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'" size="small" @click="goCtc">CTC</el-button>
<el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'&&isLocalStation" size="small" @click="goCtc">车务终端</el-button>
<el-button v-if="$route.query.lineCode ==='16'&&isLocalStation" size="small" @click="showTrainTicket">路票</el-button>
<el-button v-if="$route.query.lineCode === '16'&&isLocalStation" size="small" @click="showRegisterBook">簿册</el-button>
<!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goRpManage">管理终端</el-button> -->
<!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goDsManage">调度台</el-button> -->
<el-button v-if="showDispatcherStation" size="small" @click="changeShowMap">调度台</el-button>
<el-button v-if="isLocalStation && $route.query.lineCode!='08' && $route.query.lineCode!='16' && project !== 'teaching'" size="small" @click="goIbp">IBP盘</el-button>
<el-button v-if="isScheduling && isDepot && project !== 'teaching'" size="small" type="primary" @click="runPlanEditShow">运行图编辑</el-button>
<!-- 加载剧本 -->
@ -37,6 +40,8 @@
<!-- 加载剧本列表弹窗 -->
<add-quest ref="addQuest" @selectQuest="selectQuest" />
<line-board ref="lineBoard" />
<train-ticket ref="trainTicket" />
<register-book ref="registerBook" />
<!-- <run-plan-edit v-if="isScheduling && isDepot" ref="runPlanEdit" /> -->
</div>
</template>
@ -56,6 +61,8 @@ import { getIbpInfoByStation } from '@/api/ibp';
import { loadRunPlanData } from '@/utils/loaddata';
import { EventBus } from '@/scripts/event-bus';
import { timesSpeedPlayback } from '@/api/rtSimulation';
import TrainTicket from '../trainTicket/index';
import RegisterBook from '../registerBook/index';
// 右上角操作
export default {
@ -67,7 +74,9 @@ export default {
AddQuest,
// RunPlanEdit,
SelectStation,
LineBoard
LineBoard,
TrainTicket,
RegisterBook
},
props: {
offset: {
@ -89,7 +98,9 @@ export default {
swch: '02',
isScriptCommand:false,
faultMode: false,
speed: 1
speed: 1,
centralizedstationList: [],
centralizedStationMap: {}
// firstLoad: true
};
},
@ -130,12 +141,18 @@ export default {
isDepot() {
return this.$route.query.type === 'DEPOT';
},
showDispatcherStation() {
return this.$route.query.lineCode === '16' && this.$store.state.training.prdType === '02';
},
isContest() {
return this.project.includes('drts');
},
isAdmin() {
return this.$store.state.user.roles.includes('04') || this.$store.state.user.roles.includes('05');
},
userId() {
return this.$store.state.user ? this.$store.state.user.id : '';
},
speedList() {
return this.isAdmin ? [
{ value: 1, label: '1倍速' },
@ -189,6 +206,21 @@ export default {
},
'$store.state.socket.simulationSpeed': function (val) {
this.speed = val;
},
'$store.state.map.map': function (map) {
if (map) {
this.setCentralizedstationList(map); // 获取集中站列表
}
},
'$store.state.training.simulationUserList': function(list) {
if (list && list.length && this.$route.query.lineCode == '16' && this.isCtc && !this.$route.query.joint) {
this.checkRoleInit(list);
}
},
'$store.state.socket.simulationRoleList':function(list) {
if (list && list.length && this.$route.query.lineCode == '16' && this.isCtc && !this.$route.query.joint) {
this.checkRoleChange(list);
}
}
},
mounted() {
@ -220,24 +252,116 @@ export default {
showLineBoard() {
this.$refs.lineBoard.doShow();
},
changeShowMap() {
this.$emit('changeShowMap', false);
},
goCtc() {
// const routeData = this.$router.resolve({
// path:'/displayNew/demon',
// query:{
// lineCode:this.$route.query.lineCode,
// group: this.$route.query.group,
// prdType: this.$store.state.training.prdType,
// mapId:this.$route.query.mapId,
// project: this.project,
// newApi: this.$route.query.newApi,
// ctc: true,
// try: this.$route.query.try,
// token:getToken(),
// noPreLogout: true
// }
// });
const routeData = this.$router.resolve({
path:'/displayNew/demon',
query:{
lineCode:this.$route.query.lineCode,
group: this.$route.query.group,
prdType: this.$route.query.prdType,
prdType: '01',
mapId:this.$route.query.mapId,
project: this.project,
newApi: this.$route.query.newApi,
newApi: false,
// joint: true,
ctc: true,
try: this.$route.query.try,
try: this.$route.query.try || 0,
token:getToken(),
noPreLogout: true
}
});
window.open(routeData.href, '_blank');
},
showTrainTicket() {
const stationSupervisorList = [];
for (const memberId in this.$store.state.training.memberData) {
const item = this.$store.state.training.memberData[memberId];
if (item.type === 'STATION_SUPERVISOR') {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
const memberData = { labelName: '值班员-' + device.name + (item.name ? `-${item.name }` : ''), id:item.id, userId:item.userId };
stationSupervisorList.push(memberData);
}
}
EventBus.$emit('trainTicketMember', stationSupervisorList);
this.$refs.trainTicket.doShow();
},
showRegisterBook() {
this.$refs.registerBook.doShow();
},
checkRoleInit(data) {
const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
data.forEach(item => {
if ((item.admin && item.online) && item.userId == this.userId && stationRoleList.includes(item.type)) {
this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
this.deviceCode = item.deviceCode;
this.setShowStation(item.deviceCode);
this.$store.dispatch('training/setPrdType', '01');
}
});
},
checkRoleChange(data) {
const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
data.forEach(item => {
if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && stationRoleList.includes(item.type)) {
// this.userRole = item.type || 'AUDIENCE';
this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
this.deviceCode = item.deviceCode;
// this.setShowStation(item.deviceCode);
this.setShowStation(item.deviceCode);
this.$store.dispatch('training/setPrdType', '01');
// this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
// this.$nextTick(() => {
// if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }
// });
}
});
},
setShowStation(stationCode) {
const showStation = this.centralizedStationMap[stationCode];
const list = [];
const mapDevice = this.$store.state.map.mapDevice;
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowStation(list, showStation);
this.$nextTick(()=>{
this.$jlmap.setCenter(showStation);
});
},
setCentralizedstationList(map) {
this.centralizedstationList = [];
(map.stationList || []).forEach(item => {
if (item.centralized) {
this.centralizedstationList.push({value: item.code, name: item.name});
this.centralizedStationMap[item.code] = item.code;
item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
this.centralizedStationMap[ele] = item.code;
});
}
});
// if (this.centralizedstationList.length && !this.showStation) {
// this.showStation = this.centralizedstationList[0].value;
// }
},
// goRpManage() {
// const routeData = this.$router.resolve({
// path:'/bigTrainRunplanManage',

339
src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
View File

@ -1,6 +1,7 @@
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import store from '@/store/index';
import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
import { transfiniteList, trainTypeList } from '@/scripts/ConstDic';
// 操作
export const operateEnum = {
Set_Fault:{
@ -155,7 +156,42 @@ export const operateEnum = {
},
Station:{
code:'stationCode',
type:'车站'
type:'车站',
// 总辅助
ASSIST_PRESS_MAIN_ASSIST:{
isList:true,
params:[
{
code:'labelEnum',
name:'区间'
},
{
code:'pressDown',
name:'按钮',
result:[
{data:1, name:'按下', judge:'='},
{data:0, name:'弹起', judge:'='}
]
}
]
},
// 接辅助
ASSIST_PRESS_RECEIVE_ASSIST:{
code:'labelEnum',
name:'区间为'
},
// 发辅助
ASSIST_PRESS_DELIVER_ASSIST:{
code:'labelEnum',
name:'区间为'
}
// param:{
// labelEnum:model.labelEnum,
// stationCode:model.stationCode
// }
// labelEnum:model.labelEnum,
// stationCode:model.stationCode,
// pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
},
Driver:{
code:'groupNumber',
@ -236,6 +272,186 @@ export const operateEnum = {
}
]
}
},
CTC: {
function: getCTCDevicename,
CTC_READ_DISPATCH_COMMAND: {
isList:true,
name:'读取调度命令',
params:[
{
code:'title',
name:'命令标题'
}
]
},
CTC_SIGN_DISPATCH_COMMAND: {
code:'signInfo',
name:'签收调度命令',
isList:true,
params:[
{
code:'title',
name:'命令标题'
},
{
code:'signedBy',
name:'签收人',
function: getUserNameById
},
{
code:'signedStatus',
name:'签收状态',
result:[
{data:'SIGNED', name:'签收', judge:'='},
{data:'REFUSE', name:'拒签', judge:'='}
]
}
]
},
CTC_SEND_DISPATCH_COMMAND: {
code:'command',
name:'发送调度命令',
isList:true,
params:[
{
code:'title',
name:'命令标题'
},
{
code:'number',
name:'命令号'
},
{
code:'transferNumber',
name:'中转识别号'
},
{
code:'sendTime',
name:'发令时间'
},
{
code:'senderName',
name:'发令人'
},
{
code:'companyOfSender',
name:'发令单位'
},
{
code:'authorizationTime',
name:'授权时间'
},
{
code:'authorizationStatus',
name:'授权状态'
},
{
code:'finalizationTime',
name:'定稿时间'
},
{
code:'reviewerId',
name:'审核人',
function: getUserNameById
},
{
code:'author',
name:'拟令人',
function: getUserNameById
},
{
code:'type',
name:'命令分类',
result:[
{data:'NORMAL', name:'正常调度命令', judge:'='}
]
},
{
code:'content',
name:'命令正文'
},
{
code:'receiverIds',
name:'受令单位',
function: getStationNamList
}
]
}
}
};
// 调度台操作
export const ctcZoneMap = {
CTC_ZONE_SAVE_RUN_PLAN:{
name:'添加行车计划',
isList:true,
objName:'planParam',
params:[
{
code:'stationCode',
name:'车站',
function:getStationNameById
},
{
code:'trainType',
name:'列车类型',
result:trainTypeList
},
{
code:'runType',
name:'运行类型',
result:[
{code:'FAST_PASSENGER_TRAIN', name:'快速旅客列车'}
]
},
{
code:'arriveTripNumber',
name:'到达车次'
},
{
code:'arriveDirectionCode',
name:'接车口'
},
{
code:'arriveSectionCode',
name:'接车股道'
},
{
code:'arrivePlanTime',
name:'到达时间'
},
{
code:'startRunPlan',
name:' 始发'
},
{
code:'transfinite',
name:' 超限',
result:transfiniteList
}
//
]
// planParam: Object
// arriveDirectionCode: "Station32295_SF"
// arrivePlanTime: "2022-07-27 17:12"
// arriveSectionCode: "T97"
// arriveTripNumber: "2056"
// departDirectionCode: ""
// departPlanTime: ""
// departSectionCode: ""
// departTripNumber: ""
// electrical: true
// endRunPlan: true
// entryOutDiscordant: false
// passenger: true
// runType: "FAST_PASSENGER_TRAIN"
// startRunPlan: false
// stationCode: "Station32295"
// trackDiscordant: true
// trainType: "LOCAL_EXPRESS_PASSENGER_TRAIN"
// transfinite: "NO"
}
};
@ -268,6 +484,71 @@ export function covertOperate(operationType, operationParamMap) {
});
return tip;
} else if (operationType.includes('CTC_ZONE')) {
let tip = '请点击运行图';
// let operateName = null;
// Object.keys(CMD).forEach(key => {
// Object.values(CMD[key]).forEach(el => {
// if (el.value == operationType) {
// operateName = el;
// return;
// }
// });
// });
// tip += ',执行【' + operateName.label + '】操作';
let operationParam = operationParamMap;
const paramInfo = ctcZoneMap[operationType];
tip += ',执行【' + paramInfo.name + '】操作';
if (paramInfo.objName) {
operationParam = operationParamMap[paramInfo.objName];
}
if (paramInfo.isList) {
tip += ',参数:【';
paramInfo.params.forEach(param=>{
if (param.result) {
param.result.forEach(result=>{
if (result.code == operationParam[param.code]) {
tip += param.name + '为' + result.name + '，';
}
});
} else if (param.function) {
tip += param.name + '为' + covertFunction(param.function, operationParam[param.code]) + '，';
} else {
tip += param.name + '为' + operationParam[param.code] + '，';
}
});
tip += '】';
}
debugger;
// operationParamMap[]
// if (paramInfo) {
// if (paramInfo.isDevice) {
// if (paramInfo.isList) {
// paramName += '【' + paramInfo.name + ' ';
// const deviceList = operationParamMap[paramInfo.code];
// deviceList.forEach((device, index)=>{
// paramName += covertFunction(paramInfo.function, device);
// if (index != deviceList.length - 1) {
// paramName += '，';
// }
// });
// paramName += '】';
// } else {
// operationParamMap[]
return tip;
// ctcZoneMap[operationType]
// 调度台添加行车计划
// CTC_ZONE_SAVE_TRACK_SECTION:{value:'CTC_ZONE_SAVE_TRACK_SECTION', label: '调度台行车计划修改股道'},
// CTC_ZONE_SAVE_TRIP_NUMBER:{value:'CTC_ZONE_SAVE_TRIP_NUMBER', label: '调度台行车计划修改车次'},
// CTC_ZONE_SAVE_PLAN_TIME:{value:'CTC_ZONE_SAVE_PLAN_TIME', label: '调度台行车计划修改时间'},
// CTC_ZONE_SAVE_DIRECTION:{value:'CTC_ZONE_SAVE_DIRECTION', label: '调度台行车计划修改出入口'},
// CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'},
// CTC_ZONE_SAVE_RUN_PLAN:{value:'CTC_ZONE_SAVE_RUN_PLAN', label: '调度台添加行车计划'},
// CTC_ZONE_DELETE_RUN_PLAN:{value:'CTC_ZONE_DELETE_RUN_PLAN', label: '调度台删除行车计划'},
// CTC_ZONE_RELEASE_ALL_RUN_PLAN:{value:'CTC_ZONE_RELEASE_ALL_RUN_PLAN', label: '调度台发布所有行车计划'},
// CTC_ZONE_RELEASE_STATION_RUN_PLAN:{value:'CTC_ZONE_RELEASE_STATION_RUN_PLAN', label: '调度台发布车站行车计划'},
} else {
let device = operationType.split('_')[0];
if (device == 'CM') {
@ -276,6 +557,9 @@ export function covertOperate(operationType, operationParamMap) {
if (operationType == 'Train_Load_Spare_Train') {
device = 'Section';
}
if (operationType.includes('ASSIST')) {
device = 'Station';
}
const list = ['Train_Update_Type',
'Train_Add_Train_Trace',
'Train_Remove_Train_Trace',
@ -342,6 +626,25 @@ function covertDeviceName(deviceInfo, deviceType) {
return deviceName;
}
function getCTCDevicename(operationType) {
let deviceName = '';
if (operationType == 'CTC_QUERY_DISPATCH_COMMAND') {
const roles = store.state.training.roles;
if (roles == 'DISPATCHER') {
deviceName = '调度命令';
} else {
deviceName = '车务终端 --> 调度命令';
}
} else if (operationType == 'CTC_READ_DISPATCH_COMMAND') {
deviceName = '调度命令';
} else if (operationType == 'CTC_SIGN_DISPATCH_COMMAND') {
deviceName = '车务终端 --> 调度命令';
} else if (operationType == 'CTC_SEND_DISPATCH_COMMAND') {
deviceName = '调度命令';
}
return deviceName;
}
function covertOperation(deviceType, operationParamMap, operationType) {
let deviceName = '【';
let paramName = '';
@ -364,10 +667,12 @@ function covertOperation(deviceType, operationParamMap, operationType) {
// } else {
// }
deviceName += '】';
} else if (operateEnum[deviceType].type) {
deviceName += operateEnum[deviceType].type + '】';
deviceName += operateEnum[deviceType].type;
} else if (operateEnum[deviceType].function) {
deviceName += covertFunction(operateEnum[deviceType].function, operationType);
}
deviceName += '】';
const paramInfo = operateEnum[deviceType][operationType];
if (paramInfo) {
if (paramInfo.isDevice) {
@ -392,7 +697,11 @@ function covertOperation(deviceType, operationParamMap, operationType) {
paramName += '【';
params.forEach((param, index)=>{
paramName += ' ' + param.name;
const data = operationParamMap[param.code];
let opMap = operationParamMap;
if (paramInfo.code) {
opMap = operationParamMap[paramInfo.code];
}
const data = opMap[param.code];
if (param.result) {
param.result.forEach(result=>{
switch (result.judge) {
@ -441,6 +750,18 @@ function covertFunction(func, device) {
return func(device);
}
function getUserNameById(id) {
let name = '';
const userList = store.state.training.simulationUserList;
const user = userList.find(item=>{
return item.memberId == id;
});
if (user) {
name = user.nickName;
}
return name;
}
function getRouteNameById(routeId) {
const routeList = store.state.map.routeList;
const route = routeList.find(route=>{
@ -453,6 +774,16 @@ function getStationNameById(stationId) {
const station = store.getters['map/getDeviceByCode'](stationId) || {};
return station.name;
}
function getStationNamList(list) {
const nameList = [];
list.sort().forEach(stationId => {
const station = store.getters['map/getDeviceByCode'](stationId) || {};
if (station.name) {
nameList.push(station.name);
}
});
return nameList.join(',');
}
function getStationResultById(stationResult) {
const station = store.getters['map/getDeviceByCode'](stationResult.stationCode) || {};
let param = '不同意';

59
src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
View File

@ -2,13 +2,14 @@
<div class="main" :style="{width: canvasWidth+'px'}">
<div v-show="panelShow" :panelShow="panelShow">
<transition name="el-zoom-in-bottom">
<map-system-draft ref="mapCanvas" @back="back" />
<map-system-draft v-show="userRole != 'DISPATCHER'" ref="mapCanvas" @back="back" />
</transition>
<script-button-group
ref="scriptButtonGroup"
:offset="offset"
:text-status-height="textStatusHeight"
:group="group"
:user-role.sync="userRole"
@viewScriptRoles="viewScriptRoles"
@viewRunPlan="viewRunPlan"
@loadRunPlan="loadRunPlan"
@ -19,7 +20,12 @@
@setTreeData="setTreeData"
@changeScriptMode="changeScriptMode"
@setMapLocation="setMapLocation"
@changeShowMap="changeShowMap"
@quitQuest="quitQuest"
/>
<div v-if="lineCode === '16'" v-show="userRole === 'DISPATCHER' && !showMap">
<dispatcher-station ref="dispatcherStation" @changeShowMap="changeShowMap" />
</div>
<script-preview-chat ref="chatbox" :group="group" :user-role="userRole" :offset="offset" />
<menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
</div>
@ -49,6 +55,7 @@ import { loadDraftScriptNew } from '@/api/designPlatform';
import Vue from 'vue';
import { ScriptMode } from '@/scripts/ConstDic';
import ConstConfig from '@/scripts/ConstConfig';
import DispatcherStation from '@/views/newMap/jointTrainingNew/dispatcherStation.vue';
export default {
name: 'DisplayDraft',
@ -60,6 +67,7 @@ export default {
FaultChoose,
MenuSystemTime,
SelectRole,
DispatcherStation,
ScriptButtonGroup
},
data() {
@ -73,6 +81,7 @@ export default {
mapLocation:{},
showStation: '',
group: '',
lineCode: '',
prdTypeMap: {
'01': '01', // 现地 => 现地
'02': '02', // 行调 => 行调
@ -80,9 +89,12 @@ export default {
'05': '' // 派班 => null
},
userRole:'',
showMap: false,
isDrive: this.prdType == '04',
treeData:[],
memberList:[],
centralizedstationList: [],
centralizedStationMap: {},
scriptMode: ScriptMode.TEACH
};
},
@ -117,6 +129,11 @@ export default {
this.showStation = code;
}
},
'$store.state.map.map': function (map) {
if (map) {
this.setCentralizedstationList(map); // 获取集中站列表
}
},
'$store.state.training.prdType':function(val) {
this.setPosition();
// this.setMode();
@ -129,8 +146,12 @@ export default {
},
created() {
this.group = this.$route.query.group || '';
this.lineCode = this.$route.query.lineCode;
},
methods: {
changeShowMap(flag) {
this.showMap = flag;
},
back() {
this.$refs.scriptButtonGroup.back();
},
@ -190,6 +211,9 @@ export default {
prdType = '';
}
this.switchMode(prdType);
if (role.type == '行值') {
this.setShowStation(role.deviceCode);
}
this.memberData.map(member=>{
if (member.id == role.id) {
member.userId = this.$store.state.user.id;
@ -274,6 +298,38 @@ export default {
}
this.$store.dispatch('map/setShowCentralizedStationCode', this.showStation);
this.$store.dispatch('map/setShowCentralizedStationNum');
},
quitQuest() {
this.userRole = '';
this.setShowStation('');
},
setShowStation(stationCode) {
const showStation = this.centralizedStationMap[stationCode];
const list = [];
const mapDevice = this.$store.state.map.mapDevice;
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowStation(list, showStation);
this.$nextTick(()=>{
this.$jlmap.setCenter(showStation);
});
},
setCentralizedstationList(map) {
this.centralizedstationList = [];
(map.stationList || []).forEach(item => {
if (item.centralized) {
this.centralizedstationList.push({value: item.code, name: item.name});
this.centralizedStationMap[item.code] = item.code;
item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
this.centralizedStationMap[ele] = item.code;
});
}
});
console.log(this.centralizedStationMap, '----this.centralizedStationMap--');
// if (this.centralizedstationList.length && !this.showStation) {
// this.showStation = this.centralizedstationList[0].value;
// }
}
}
};
@ -285,6 +341,7 @@ export default {
width: 100%;
height: 100%;
overflow: hidden;
background: #000000;
-moz-user-select: none;
-o-user-select: none;

117
src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
View File

@ -20,6 +20,10 @@
<template v-if="!dataError">
<el-button-group>
<el-button size="small" :disabled="viewDisabled || isscriptRun" type="success" @click="viewScriptRoles">{{ $t('display.schema.selectRoles') }}</el-button>
<el-button v-if="userRole=== 'STATION_SUPERVISOR'&&$route.query.lineCode ==='16'" size="small" @click="goCtc">车务终端</el-button>
<el-button v-if="$route.query.lineCode ==='16'&&$store.state.training.prdType === '01'" size="small" @click="showTrainTicket">路票</el-button>
<el-button v-if="$route.query.lineCode === '16'&&$store.state.training.prdType ==='01'" size="small" @click="showRegisterBook">簿册</el-button>
<el-button v-if="showDispatcherStation && userRole === 'DISPATCHER'" size="small" @click="changeShowMap">调度台</el-button>
<!-- 运行图加载 -->
<el-button v-if="running" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
<el-button v-if="!running" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
@ -40,6 +44,8 @@
:driver-show="isDriver"
:all-style="'top:'+(offset+textStatusHeight)+'px'"
/>
<train-ticket ref="trainTicket" />
<register-book ref="registerBook" />
</div>
</template>
<script>
@ -58,10 +64,15 @@ import ConstConfig from '@/scripts/ConstConfig';
import { loadRunPlanData } from '@/utils/loaddata';
import Cookies from 'js-cookie';
import { Notification } from 'element-ui';
import { getToken } from '@/utils/auth';
import TrainTicket from '@/views/newMap/trainTicket/index.vue';
import RegisterBook from '@/views/newMap/registerBook/index.vue';
export default {
name:'ScriptButtonGroup',
components:{
DemonMenu
DemonMenu,
TrainTicket,
RegisterBook
},
props:{
offset: {
@ -72,6 +83,10 @@ export default {
type: String,
required: true
},
userRole: {
type: String,
required: true
},
textStatusHeight: {
type: Number,
default() {
@ -110,6 +125,9 @@ export default {
isStation() {
return this.$store.state.training.prdType == '01';
},
showDispatcherStation() {
return this.$route.query.lineCode === '16' && this.$store.state.training.prdType === '02';
},
scriptModeList() {
return ScriptMode;
},
@ -149,6 +167,34 @@ export default {
this.$store.dispatch('map/resetActiveTrainList', true);
},
methods:{
goCtc() {
const routeData = this.$router.resolve({
path:'/displayNew/demon',
query:{
lineCode:this.$route.query.lineCode,
group: this.$route.query.group,
prdType: '01',
mapId:this.$route.query.mapId,
project: this.project,
newApi: false,
joint: true,
ctc: true,
try: this.$route.query.try || 0,
token:getToken(),
noPreLogout: true
}
});
window.open(routeData.href, '_blank');
},
showTrainTicket() {
this.$refs.trainTicket.doShow();
},
showRegisterBook() {
this.$refs.registerBook.doShow();
},
changeShowMap() {
this.$emit('changeShowMap', false);
},
// 加载地图数据
async initLoadData() {
this.changeScriptMode(this.scriptMode);
@ -258,7 +304,72 @@ export default {
id: 'parkingLotSignalBuilding',
type: 'role',
children: result.deviceListData[7]
}];
},
{
label: '车站助理',
id: 'stationAssistant',
type: 'role',
children: result.deviceListData[8]
},
{
label: '车站站长',
id: 'stationMaster',
type: 'role',
children: result.deviceListData[9]
},
{
label: '车站信号员',
id: 'stationSignaler',
type: 'role',
children: result.deviceListData[10]
},
{
label: '车站客运员',
id: 'stationPassenger',
type: 'role',
children: result.deviceListData[11]
},
{
label: '车站扳道员',
id: 'stationSwitchMan',
type: 'role',
children: result.deviceListData[12]
},
{
label: '车站引导员',
id: 'stationFacilitator',
type: 'role',
children: result.deviceListData[13]
},
{
label: '车站工务工',
id: 'stationWorker',
type: 'role',
children: result.deviceListData[14]
},
{
label: '设备管理员',
id: 'deviceManager',
type: 'role',
children: result.deviceListData[15]
}
];
/**
* 车站助理
*/
// STATION_ASSISTANT,
// STATION_MASTER:'车站站长',
// STATION_SIGNALER:'车站信号员',
// STATION_PASSENGER:'车站客运员',
// STATION_SWITCH_MAN:'车站扳道员',
// STATION_FACILITATOR:'车站引导员',
// STATION_WORKER:'车站工务工'
// stationMaster
// stationSignaler
// stationPassenger
// stationSwitchMan
// stationFacilitator
// stationWorker
const lastMemberList = result.lastMemberList;
this.$emit('setTreeData', treeData);
this.$emit('setMemberData', lastMemberList);
@ -340,6 +451,7 @@ export default {
this.$store.dispatch('training/setRoles', '');
this.$store.dispatch('training/setPrdType', '');
this.$emit('clearAllData');
this.$emit('quitQuest');
// if (resp.data.planRunning) {
// this.$store.dispatch('training/start');// 仿真开始按计划行车
// } else {
@ -404,6 +516,7 @@ export default {
.trainingButton{
position: absolute;
left: 5px;
z-index: 1;
}
.display-draft{
position: absolute;

88
src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<div style="width:100%;height:100%;">
<div class="display-draft">
<el-button-group>
<el-button v-if="!isReplaceBg" type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
@ -25,6 +25,7 @@
:offset="offset"
:data-error="dataError"
:offset-bottom="offsetBottom"
@changeShowMap="changeShowMap"
/>
<set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@ -93,7 +94,9 @@ export default {
return {
isScriptCommand:false,
isReplaceBg: false,
userRole:''
userRole:'',
centralizedstationList: [],
centralizedStationMap: {}
};
},
@ -118,6 +121,9 @@ export default {
},
isDisable() {
return this.$store.state.training.started;
},
userId() {
return this.$store.state.user ? this.$store.state.user.id : '';
}
},
watch: {
@ -129,6 +135,11 @@ export default {
this.$store.dispatch('map/setShowCentralizedStationNum');
});
},
'$store.state.map.map': function (map) {
if (map) {
this.setCentralizedstationList(map); // 获取集中站列表
}
},
'$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识
getSimulationMemberList(this.group).then(resp => {
this.$store.dispatch('training/setMemberList', {memberList:resp.data, userId:this.$store.state.user.id});
@ -137,8 +148,10 @@ export default {
return mem.userId != '' && mem.userId != undefined;
});
if (member) {
const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT', 'ELECTRIC_DISPATCHER', 'PARKING_LOT_SIGNAL_BUILDING'];
const prdTypeList = ['01', '02', '04', '', '05', '', ''];
const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT',
'ELECTRIC_DISPATCHER', 'PARKING_LOT_SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
const prdTypeList = ['01', '02', '04', '', '05', '', '', '', '', '', '01', '', '', '', '', ''];
const index = memberType.indexOf(member.type);
let prdType;
if (index >= 0) {
@ -156,7 +169,18 @@ export default {
},
'$store.state.scriptRecord.userRole':function (val) {
this.userRole = val;
},
// '$store.state.training.roleDeviceCode':function (val) {
// if (val) {
// this.setShowStation(val);
// }
// },
'$store.state.socket.simulationRoleList':function(list) {
if (list && list.length && this.$route.query.lineCode == '16') { // 人员变化监控
this.checkRoleChange(list);
}
}
},
beforeDestroy() {
// this.clearAutoSave();
@ -192,6 +216,62 @@ export default {
},
setReplace(isRp) {
this.isReplaceBg = isRp;
},
changeShowMap() {
this.$emit('changeShowMap', false);
},
checkRoleChange(data) {
const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
data.forEach(item => {
if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && (stationRoleList.includes(item.type) )) {
// this.userRole = item.type || 'AUDIENCE';
this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
this.deviceCode = item.deviceCode;
if (item.type == 'STATION_SUPERVISOR' || item.type == 'STATION_SIGNALER') {
this.setShowStation(item.deviceCode);
this.$store.dispatch('training/setPrdType', '01');
} else {
const showStation = this.centralizedStationMap[item.deviceCode];
this.setShowStation('');
this.$jlmap.setCenter(showStation);
}
// this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
// this.$nextTick(() => {
// if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }
// });
}
});
},
setShowStation(stationCode) {
const showStation = this.centralizedStationMap[stationCode];
const list = [];
const mapDevice = this.$store.state.map.mapDevice;
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowStation(list, showStation);
this.$nextTick(()=>{
this.$jlmap.setCenter(showStation);
});
},
setCentralizedstationList(map) {
this.centralizedstationList = [];
(map.stationList || []).forEach(item => {
if (item.centralized) {
this.centralizedstationList.push({value: item.code, name: item.name});
this.centralizedStationMap[item.code] = item.code;
item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
this.centralizedStationMap[ele] = item.code;
});
}
});
// if (this.centralizedstationList.length && !this.showStation) {
// this.showStation = this.centralizedstationList[0].value;
// }
}
}
};

41
src/views/newMap/displayNew/selectStation.vue
View File

@ -69,16 +69,27 @@ export default {
const member = this.$store.state.training.memberData[val];
const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (station) {
this.showStation = station.code;
const showStationCode = this.stationCentralizedMap[station.code];
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
const pictureLineCodeList = ['16'];
if (pictureLineCodeList.includes(this.$route.query.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === station.code && picture.type === 'chainStation');
if (picture) {
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
const deviceList = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
deviceList.push(key);
}
this.$jlmap.updateShowStation(list, '');
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
this.$jlmap.updatePicture(deviceList);
this.$jlmap.updateTransform(picture.scaling, picture.origin);
} else {
this.jmapShowStation(station);
}
} else {
this.jmapShowStation(station);
}
this.$store.dispatch('training/setRoleDeviceCode', station.code);
this.$jlmap.updateShowStation(list, showStationCode || station.code);
this.setCenter(showStationCode);
}
}).catch((err) => {
console.log(err);
@ -86,6 +97,18 @@ export default {
this.$message.error('调整角色成员失败！');
});
},
jmapShowStation(station) {
this.showStation = station.code;
const showStationCode = this.stationCentralizedMap[station.code];
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$store.dispatch('training/setRoleDeviceCode', station.code);
this.$jlmap.updateShowStation(list, showStationCode || station.code);
this.setCenter(showStationCode);
},
setCenter(code) {
if (this.$store.state.training.prdType === '09' && this.$store.state.map.map.displayList && this.$store.state.map.map.displayList.length) {
const tempData = this.$store.state.map.map.displayList.find(item => { return item.stationCodeList.includes(code) && item.type === 'DEPOT_IL'; });

23
src/views/newMap/displayNew/utils.js
View File

@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
lastData = JSON.parse(lastData);
const lastMemberList = [];
// const electricDispatcherList = [];
const deviceListData = [[], [], [], [], [], [], [], []];
const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
const driverList = [];
lastData.forEach((member, index)=>{
if (member.userId && member.userId == store.state.user.id) {
@ -37,7 +37,26 @@ export function covertMemberData (activeTrainList, resp) {
member.label = member.type + name + userName;
member.normalName = member.type + name;
}
const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼'];
const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员'];
/**
* 车站助理
*/
// STATION_ASSISTANT,
// STATION_MASTER:'车站站长',
// STATION_SIGNALER:'车站信号员',
// STATION_PASSENGER:'车站客运员',
// STATION_SWITCH_MAN:'车站扳道员',
// STATION_FACILITATOR:'车站引导员',
// STATION_WORKER:'车站工务工'
// stationMaster
// stationSignaler
// stationPassenger
// stationSwitchMan
// stationFacilitator
// stationWorker
// 设备管理员 deviceManager DEVICE_MANAGER
const deviceTypeIndex = deviceType.indexOf(member.type);
if (deviceTypeIndex >= 0) {
if (deviceTypeIndex == 3) {

25
src/views/newMap/jointTrainingNew/index.vue
View File

@ -437,6 +437,7 @@ export default {
setSimulationPrdType(deviceCode) {
// Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号
this.showStation = '';
const pictureLineCodeList = ['16'];
let tempData;
let dataZoom;
switch (this.userRole) {
@ -466,8 +467,28 @@ export default {
}
this.$jlmap.updateShowMode(list, '02');
}
this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
this.mapViewLoadedOver && this.switchStationMode(deviceCode);
if (pictureLineCodeList.includes(this.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation');
if (picture) {
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
const deviceList = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
deviceList.push(key);
}
this.$jlmap.updateShowStation(list, '');
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
this.$jlmap.updatePicture(deviceList);
this.$jlmap.updateTransform(picture.scaling, picture.origin);
} else {
this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
this.mapViewLoadedOver && this.switchStationMode(deviceCode);
}
} else {
this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
this.mapViewLoadedOver && this.switchStationMode(deviceCode);
}
this.jl3dmaintainershow = false;
this.drivingShow = false;
break;

10
src/views/newMap/jointTrainingNew/memberManage/addMember.vue
View File

@ -70,7 +70,15 @@ export default {
typeList: [
{label: '行调', value: 'DISPATCHER'},
{label: '通号', value: 'MAINTAINER'},
{label: '车站值班员', value: 'STATION_SUPERVISOR'}
{label: '车站值班员', value: 'STATION_SUPERVISOR'},
{label: '车站助理', value: 'STATION_ASSISTANT'},
{label: '车站站长', value: 'STATION_MASTER'},
{label: '车站信号员', value: 'STATION_SIGNALER'},
{label: '车站客运员', value: 'STATION_PASSENGER'},
{label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
{label: '车站引导员', value: 'STATION_FACILITATOR'},
{label: '车站工务工', value: 'STATION_WORKER'},
{label: '设备管理员', value: 'DEVICE_MANAGER'}
]
};
},

102
src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
View File

@ -120,7 +120,36 @@ export default {
}, {
labelName: '车站助理',
children: []
}]
},
{
labelName: '车站站长',
children: []
},
{
labelName: '车站信号员',
children: []
},
{
labelName: '车站客运员',
children: []
},
{
labelName: '车站扳道员',
children: []
},
{
labelName: '车站引导员',
children: []
},
{
labelName: '车站工务工',
children: []
},
{
labelName: '设备管理员',
children: []
}
]
};
},
computed: {
@ -155,6 +184,13 @@ export default {
const maintainerList = [];
const ctcOperatorList = [];
const stationAssistantList = [];
const stationMasterList = [];
const stationSignalerList = [];
const stationPassengerList = [];
const stationSwitchManList = [];
const stationFacilitatorList = [];
const stationWorkerList = [];
const deviceManagerList = [];
val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
switch (item.type) {
@ -190,6 +226,35 @@ export default {
this.memberData[item.id].labelName = '车站助理-' + device.name + (item.name ? `-${item.name }` : '');
stationAssistantList.push(this.memberData[item.id]);
break;
case 'STATION_MASTER':
this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name ? `-${item.name }` : '');
stationMasterList.push(this.memberData[item.id]);
break;
case 'STATION_SIGNALER':
this.memberData[item.id].labelName = '车站信号员-' + device.name + (item.name ? `-${item.name }` : '');
stationSignalerList.push(this.memberData[item.id]);
break;
case 'STATION_PASSENGER':
this.memberData[item.id].labelName = '车站客运员-' + device.name + (item.name ? `-${item.name }` : '');
stationPassengerList.push(this.memberData[item.id]);
break;
case 'STATION_SWITCH_MAN':
this.memberData[item.id].labelName = '车站扳道员-' + device.name + (item.name ? `-${item.name }` : '');
stationSwitchManList.push(this.memberData[item.id]);
break;
case 'STATION_FACILITATOR':
this.memberData[item.id].labelName = '车站引导员-' + device.name + (item.name ? `-${item.name }` : '');
stationFacilitatorList.push(this.memberData[item.id]);
break;
case 'STATION_WORKER':
this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name ? `-${item.name }` : '');
stationWorkerList.push(this.memberData[item.id]);
break;
case 'DEVICE_MANAGER':
this.memberData[item.id].labelName = '设备管理员-' + device.name + (item.name ? `-${item.name }` : '');
deviceManagerList.push(this.memberData[item.id]);
break;
// DEVICE_MANAGER:'设备管理员' deviceManager
}
});
this.treeData = [{
@ -224,6 +289,41 @@ export default {
labelName: '车站助理',
id: 'stationAssistant',
children: stationAssistantList
},
{
labelName: '车站站长',
id: 'stationMaster',
children: stationMasterList
},
{
labelName: '车站信号员',
id: 'stationSignaler',
children: stationSignalerList
},
{
labelName: '车站客运员',
id: 'stationPassenger',
children: stationPassengerList
},
{
labelName: '车站扳道员',
id: 'stationSwitchMan',
children: stationSwitchManList
},
{
labelName: '车站引导员',
id: 'stationFacilitator',
children: stationFacilitatorList
},
{
labelName: '车站工务工',
id: 'stationWorker',
children: stationWorkerList
},
{
labelName: '设备管理员',
id: 'deviceManager',
children: deviceManagerList
}
];
EventBus.$emit('trainTicketMember', [...stationSupervisorList, ...stationAssistantList]);

10
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -37,12 +37,16 @@
<el-button v-if="isAdministrator && !datie" v-loading="pauseLoading" :type="simulationPaused?'warning':'primary'" size="small" @click="startOrPause">{{ simulationPaused?'开始':'暂停' }}</el-button>
<el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
</template>
<template v-if="$route.query.lineCode == '16'">
<el-button type="primary" size="small" @click="modifySystemTime">修改系统时间</el-button>
</template>
</template>
<el-button type="primary" :loading="backLoading" size="small" @click="back">退出</el-button>
</el-button-group>
</div>
<qr-code ref="qrCode" />
<set-time ref="setTime" @ConfirmSelectBeginTime="start" />
<modify-time v-if="$route.query.lineCode == '16'" ref="modifySysTime" />
<equipment ref="equipment" />
<contect-us ref="contectUs" />
</div>
@ -54,6 +58,7 @@ import StatusIcon from '@/views/components/StatusIcon/statusIcon';
import ChatBox from '../chatView/chatBox';
import Equipment from '@/views/newMap/displayNew/demon/equipment';
import SetTime from '@/views/newMap/displayNew/demon/setTime';
import ModifyTime from '@/views/newMap/displayNew/demon/modifyTime';
import { ranAsPlan, exitRunPlan, clearSimulation } from '@/api/simulation';
import { exitFullscreen } from '@/utils/screen';
import { getSimulationQrcode } from '@/api/jointSimulation';
@ -71,6 +76,7 @@ export default {
ChatBox,
QrCode,
SetTime,
ModifyTime,
Equipment,
ContectUs,
StatusIcon
@ -285,6 +291,10 @@ export default {
});
}
},
// 修改系统时间
modifySystemTime() {
this.$refs.modifySysTime.doShow();
},
// 设置用户角色 Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 MAINTAINER 通号
addrolesList(list) {
list.forEach(item => {

70
src/views/newMap/mapsystemNew/index.vue
View File

@ -23,9 +23,9 @@ export default {
topic: '/user/queue/training',
stomp: null,
currentMap: null,
ierval: null,
// ierval: null,
mouseNum: 1,
mouseNumTime: 0,
// mouseNumTime: 0,
mapBoxP: null,
mode: '',
groupModel: ''
@ -78,7 +78,7 @@ export default {
this.mode = this.$route.params.mode || '';
this.currentMap = this.$refs.mapCommon;
this.groupModel = this.$route.query.group;
this.checkMouseStatusTimer(); // 鼠标样式变化检测
// this.checkMouseStatusTimer(); // 鼠标样式变化检测
this.$nextTick(() => {
setTimeout(() => {
this.$store.dispatch('config/resetCanvasOffset');
@ -88,7 +88,7 @@ export default {
beforeDestroy() {
this.clearSubscribe();
this.clearSubscribeNew();
this.clearAllTimer();
// this.clearAllTimer();
},
methods: {
async mapViewLoaded(loading) {
@ -118,11 +118,11 @@ export default {
async subscribe() {
this.clearSubscribe();
const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
creatSubscribe(getTopic('STATE', this.$route.query.group), header);
await creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
await creatSubscribe(getTopic('STATE', this.$route.query.group), header);
// if (this.$route.query.ctc == 'true') {
if (this.$route.query.lineCode == '16') {
creatSubscribe(getTopic('CTC', this.$route.query.group), header);
await creatSubscribe(getTopic('CTC', this.$route.query.group), header);
}
// $route.query.lineCode === '16';
// if (this.$route.query.dispatcherStation == 'true') {
@ -133,9 +133,9 @@ export default {
async subscribeNew() {
this.clearSubscribeNew();
const header = { 'X-Token': getToken() };
creatSubscribe(getTopic('ATS', this.$route.query.group), header);
creatSubscribe(getTopic('SYSTIME', this.$route.query.group), header);
creatSubscribe(getTopic('STATE', this.$route.query.group), header);
await creatSubscribe(getTopic('ATS', this.$route.query.group), header);
await creatSubscribe(getTopic('SYSTIME', this.$route.query.group), header);
await creatSubscribe(getTopic('STATE', this.$route.query.group), header);
await this.$store.dispatch('training/setHasSubscribed');
},
clearSubscribeNew() {
@ -161,33 +161,33 @@ export default {
this.mouseNum = 1;
},
// 清除检查在线定时器
clearAllTimer() {
if (this.ierval) {
clearInterval(this.ierval);
this.ierval = null;
}
},
// clearAllTimer() {
// if (this.ierval) {
// clearInterval(this.ierval);
// this.ierval = null;
// }
// },
// 设置手标显示状态
checkMouseStatusTimer() {
if (this.ierval) {
clearInterval(this.ierval);
}
this.ierval = setInterval(() => {
if (this.mouseNum) {
this.mouseNum = 0;
this.mouseNumTime = 0;
if (this.mapBoxP) {
this.mapBoxP.style.cursor = this.mapBoxP.style.cursor != 'none' ? this.mapBoxP.style.cursor : '';
}
} else {
this.mouseNumTime += 1;
}
if (this.mapBoxP) {
if (this.mouseNumTime >= 12) {
this.mapBoxP.style.cursor = 'none';
}
}
}, 1000);
// if (this.ierval) {
// clearInterval(this.ierval);
// }
// this.ierval = setInterval(() => {
// if (this.mouseNum) {
// this.mouseNum = 0;
// this.mouseNumTime = 0;
// if (this.mapBoxP) {
// this.mapBoxP.style.cursor = this.mapBoxP.style.cursor != 'none' ? this.mapBoxP.style.cursor : '';
// }
// } else {
// this.mouseNumTime += 1;
// }
// if (this.mapBoxP) {
// if (this.mouseNumTime >= 12) {
// this.mapBoxP.style.cursor = 'none';
// }
// }
// }, 1000);
},
initMemberUserInfo(isFirst = false) {
if (this.$route.query.newApi + '' === 'true') {

8
src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/route.vue
View File

@ -141,6 +141,13 @@
@click="hover('btnCode')"
>{{ $t('map.activate') }}</el-button>
</el-form-item>
<!-- 是否调车进路 -->
<el-form-item label="是否调车进路:" prop="shutting">
<el-radio-group v-model="addModel.shutting">
<el-radio :label="true">{{ $t('map.are') }}</el-radio>
<el-radio :label="false">{{ $t('map.deny') }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div class="bigDraft">
<el-button-group class="bigDraftBtn">
@ -209,6 +216,7 @@ export default {
code:'',
name:'',
multiRoute:false,
shutting:false,
startSignalCode:'',
signalAspect:1,
startSectionCode:'',

26
src/views/scriptManage/addScriptMember.vue
View File

@ -20,7 +20,7 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="formModel.type === 'STATION_SUPERVISOR'" label="值班车站:" prop="deviceCode">
<el-form-item v-if="stationRoleList.includes(formModel.type)" label="值班车站:" prop="deviceCode">
<el-select v-model="formModel.deviceCode" placeholder="请选择" size="small">
<el-option
v-for="item in filterStationList"
@ -60,6 +60,17 @@ export default {
name:'',
deviceCode: ''
},
stationRoleList:[
'STATION_SUPERVISOR',
'STATION_ASSISTANT',
'STATION_MASTER',
'STATION_SIGNALER',
'STATION_PASSENGER',
'STATION_SWITCH_MAN',
'STATION_FACILITATOR',
'STATION_WORKER',
'DEVICE_MANAGER'
],
filterStationList: [],
rules: {
type: [
@ -72,7 +83,15 @@ export default {
typeList: [
{label: '行调', value: 'DISPATCHER'},
{label: '通号', value: 'MAINTAINER'},
{label: '车站值班员', value: 'STATION_SUPERVISOR'}
{label: '车站值班员', value: 'STATION_SUPERVISOR'},
{label: '车站助理', value: 'STATION_ASSISTANT'},
{label: '车站站长', value: 'STATION_MASTER'},
{label: '车站信号员', value: 'STATION_SIGNALER'},
{label: '车站客运员', value: 'STATION_PASSENGER'},
{label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
{label: '车站引导员', value: 'STATION_FACILITATOR'},
{label: '车站工务工', value: 'STATION_WORKER'},
{label: '设备管理员', value: 'DEVICE_MANAGER'}
]
};
},
@ -95,7 +114,8 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
this.lodaing = true;
if (this.formModel.type !== 'STATION_SUPERVISOR') { delete this.formModel.deviceCode; }
// this.formModel.type !== 'STATION_SUPERVISOR'
if (!this.stationRoleList.includes(this.formModel.type)) { delete this.formModel.deviceCode; }
addSimulationMember(this.formModel, this.$route.query.group).then((res) => {
this.$message.success('添加仿真角色成员成功！');
this.$emit('addScriptMember', res.data);

1
src/views/scriptManage/allScriptRole.vue
View File

@ -97,6 +97,7 @@ export default {
switchMode(member) {
this.loading = true;
changeScriptRole(this.group, member.id).then(res=>{
if (member.type == '行值') { this.$store.dispatch('training/setPrdType', '01'); }
this.$emit('changeMode', member);
}).catch(()=>{
this.loading = false;

31
src/views/scriptManage/getAction.vue
View File

@ -47,7 +47,8 @@
<el-button v-if="actionInfo.visible && !actionInfo.isModify" type="primary" size="mini" style="margin-left:10px;" @click="modifyAction(actionInfo)">{{ $t('scriptRecord.modifyConversitionButton') }}</el-button>
<el-button v-if="actionInfo.visible && actionInfo.isModify" :loading="modifyTextLoading" type="danger" size="mini" style="margin-left:10px;" @click="confirmModify(actionInfo)">确定</el-button>
<el-button v-if="actionInfo.visible && actionInfo.isModify" type="" size="mini" style="margin-left:10px;" @click="cancleModify(actionInfo)">取消</el-button>
<el-button v-if="actionInfo.visible && !actionInfo.isModify" type="danger" size="mini" :loading="deleteLoading" @click="deleteAction(actionInfo.id)">删除</el-button>
<el-button v-if="actionInfo.isDelete" type="danger" size="mini" :loading="actionInfo.deleteLoading" @click="deleteAction(actionInfo)">删除</el-button>
<!-- .deleteLoading,actionInfo.id -->
</div>
</el-card>
</el-timeline-item>
@ -84,7 +85,7 @@ export default {
// isModify:false,
// modifyText:'',
modifyTextLoading:false,
deleteLoading:false,
// deleteLoading:false,
// behaviorName:"",
memberName: '',
conditionActionId: ''
@ -144,16 +145,16 @@ export default {
});
}
this.actionInfoList.push({id: element.id, isStartCoversition: true, memberName: memberName, targetName:targetNameList.toString(), condition: element.condition });
this.actionInfoList.push({id: element.id, isStartCoversition: true, memberName: memberName, targetName:targetNameList.toString(), condition: element.condition, isDelete:true, deleteLoading:false });
break;
}
case 'Drive': {
this.actionInfoList.push({id: element.id, isDrive: true, memberName: memberName, targetName:this.covertSection(element.targetSectionCode), condition: element.condition});
this.actionInfoList.push({id: element.id, isDrive: true, memberName: memberName, targetName:this.covertSection(element.targetSectionCode), isDelete:true, condition: element.condition, deleteLoading:false});
break;
}
case 'Conversation':
{
this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, reply: element.content, row: element, visible: true, isModify:false, modifyText:'', condition: element.condition});
this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, reply: element.content, row: element, visible: true, isModify:false, isDelete:true, modifyText:'', condition: element.condition, deleteLoading:false});
break;
}
// case 'Exit_Conversation': {
@ -177,18 +178,18 @@ export default {
});
});
if (operateName) {
const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车'};
const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车', CTC:'车务终端', RAIL:'票据/簿册'};
const operateTypeName = deviceTypeList[operateType];
this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false, condition: element.condition});
this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false, condition: element.condition, isDelete:true, deleteLoading:false });
}
} else {
// deviceFaultType
// element.operationParamMap.faultType;
// '(' + operateName.label + ')'
if (commandName == 'Set_Fault') {
this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '设置故障', row: element, visible: false, condition: element.condition});
this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '设置故障', row: element, visible: false, condition: element.condition, isDelete:true, deleteLoading:false });
} else if (commandName == 'Cancel_Fault') {
this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '取消故障', row: element, visible: false, condition: element.condition});
this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '取消故障', row: element, visible: false, condition: element.condition, isDelete:true, deleteLoading:false });
}
}
break;
@ -210,7 +211,7 @@ export default {
Apply_CM_Mode: '转CM模式',
Apply_AM_Mode: '转AM模式'
};
this.actionInfoList.push({id: element.id, isCommand: true, memberName: memberName, command: CommandList[element.commandInitiateVO.commandType], targetName:targetName.name, row: element, visible: false, condition: element.condition});
this.actionInfoList.push({id: element.id, isCommand: true, memberName: memberName, command: CommandList[element.commandInitiateVO.commandType], targetName:targetName.name, row: element, visible: false, condition: element.condition, deleteLoading:false});
break;
}
}
@ -281,13 +282,13 @@ export default {
}
}
},
deleteAction(actionId) {
this.deleteLoading = true;
deleteScriptAction(this.group, actionId).then(res=>{
this.deleteLoading = false;
deleteAction(actionInfo) {
actionInfo.deleteLoading = true;
deleteScriptAction(this.group, actionInfo.id).then(res=>{
actionInfo.deleteLoading = false;
this.reloadTable();
}).catch(error=>{
this.deleteLoading = false;
actionInfo.deleteLoading = false;
this.$messageBox('删除会话/动作失败：' + error.message);
});
},

3
src/views/scriptManage/home.vue
View File

@ -145,6 +145,9 @@ export default {
},
drawUp(index, row) {
scriptRecordNotifyNew(row.id).then(resp => {
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode, record: true};
this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
launchFullscreen();

94
src/views/scriptManage/tipScriptRecord.vue
View File

@ -228,6 +228,54 @@ export default {
id: 'parkingLotSignalBuilding',
type: 'role',
children: result.deviceListData[7]
},
{
label: '车站助理',
id: 'stationAssistant',
type: 'role',
children: result.deviceListData[8]
},
{
label: '车站站长',
id: 'stationMaster',
type: 'role',
children: result.deviceListData[9]
},
{
label: '车站信号员',
id: 'stationSignaler',
type: 'role',
children: result.deviceListData[10]
},
{
label: '车站客运员',
id: 'stationPassenger',
type: 'role',
children: result.deviceListData[11]
},
{
label: '车站扳道员',
id: 'stationSwitchMan',
type: 'role',
children: result.deviceListData[12]
},
{
label: '车站引导员',
id: 'stationFacilitator',
type: 'role',
children: result.deviceListData[13]
},
{
label: '车站工务工',
id: 'stationWorker',
type: 'role',
children: result.deviceListData[14]
},
{
label: '设备管理员',
id: 'deviceManager',
type: 'role',
children: result.deviceListData[15]
}
];
this.memberList = result.lastMemberList;
@ -284,7 +332,7 @@ export default {
const covertmember = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
const newMember = covertmember[0];
this.memberList.push(newMember);
const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼'];
const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员'];
const index = deviceTypeList.indexOf(newMember.type);
if (index >= 0) {
const treeDataIn = this.treeData[index];
@ -502,6 +550,39 @@ export default {
prdType = '';
role.type = 'PARKING_LOT_SIGNAL_BUILDING';
this.$store.dispatch('training/setRoles', 'PARKING_LOT_SIGNAL_BUILDING');
} else if (role.type == '车站助理') {
prdType = '';
role.type = 'STATION_ASSISTANT';
this.$store.dispatch('training/setRoles', 'STATION_ASSISTANT');
} else if (role.type == '车站站长') {
prdType = '';
role.type = 'STATION_MASTER';
this.$store.dispatch('training/setRoles', 'STATION_MASTER');
} else if (role.type == '车站信号员') {
prdType = '01';
role.type = 'STATION_SIGNALER';
this.$store.dispatch('training/setRoles', 'STATION_SIGNALER');
} else if (role.type == '车站客运员') {
prdType = '';
role.type = 'STATION_PASSENGER';
this.$store.dispatch('training/setRoles', 'STATION_PASSENGER');
} else if (role.type == '车站扳道员') {
prdType = '';
role.type = 'STATION_SWITCH_MAN';
this.$store.dispatch('training/setRoles', 'STATION_SWITCH_MAN');
} else if (role.type == '车站引导员') {
prdType = '';
role.type = 'STATION_FACILITATOR';
this.$store.dispatch('training/setRoles', 'STATION_FACILITATOR');
} else if (role.type == '车站工务工') {
prdType = '';
role.type = 'STATION_WORKER';
this.$store.dispatch('training/setRoles', 'STATION_WORKER');
} else if (role.type == '设备管理员') {
prdType = '';
role.type = 'DEVICE_MANAGER';
this.$store.dispatch('training/setRoles', 'DEVICE_MANAGER');
} else {
prdType = '';
}
@ -530,7 +611,16 @@ export default {
'DEPOT_DISPATCHER':'车辆段信号楼',
'PARENT_DEPARTMENT':'上级部门',
'ELECTRIC_DISPATCHER':'电力调度',
'PARKING_LOT_SIGNAL_BUILDING':'停车场信号楼'
'PARKING_LOT_SIGNAL_BUILDING':'停车场信号楼',
'STATION_ASSISTANT':'车站助理',
'STATION_MASTER':'车站站长',
'STATION_SIGNALER':'车站信号员',
'STATION_PASSENGER':'车站客运员',
'STATION_SWITCH_MAN':'车站扳道员',
'STATION_FACILITATOR':'车站引导员',
'STATION_WORKER':'车站工务工',
'DEVICE_MANAGER':'设备管理员'
};
newRole.type = roleTypeEnumMap[newRole.type];
this.quickChangeMember.list.push(newRole);

12
src/views/system/configLine/config.vue
View File

@ -116,7 +116,9 @@ export default {
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber',
'railway'
'railway',
'SFUCanOnlyApplyForFaultLockSection',
'signalBolckOptReflectSignal'
],
selectList: ['runMode', 'singleApproachLockCancelRoute'],
generalConfig: [
@ -166,7 +168,9 @@ export default {
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber',
'railway'
'railway',
'SFUCanOnlyApplyForFaultLockSection',
'signalBolckOptReflectSignal'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -222,7 +226,9 @@ export default {
tripNumberIsUnique: '运行图中车次号是否唯一',
standTbStrategyIsInvalid: '站台折返策略不生效',
updateTripPlanByServiceNumber: '根据服务号更新车次计划',
railway: '大铁线路'
railway: '大铁线路',
SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段',
signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示'
}
};
},