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

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

Browse Source
This commit is contained in:
sunzhenyu 2021-01-20 15:41:30 +08:00
commit 1286bb79ba
19 changed files with 208 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -19,4 +19,3 @@ VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
VUE_CLI_BABEL_TRANSPILE_MODULES = true
VUE_APP_SOURCE_MAP = true

1
.env.production
View File

@ -5,4 +5,3 @@ NODE_ENV = 'production'
VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
VUE_APP_SOURCE_MAP = false

1
.env.staging
View File

@ -5,4 +5,3 @@ NODE_ENV = 'test'
VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
VUE_APP_SOURCE_MAP = false

16
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -307,13 +307,14 @@ class SkinCode extends defaultStyle {
detainNormal:{
z:0,
position: 1, // 扣车标识在站台上显示方向
special:true,
text: 'H', // 扣车显示内容
insideOffset: { x: 80, y: -18 }, // 内站台扣车偏移量
outsideOffset: { x:80, y: 25 }, // 外站台扣车偏移量
insideOffset: { x: 15, y: -28 }, // 内站台扣车偏移量
outsideOffset: { x:15, y: 22 }, // 外站台扣车偏移量
centerTrainColor: '#ff0', // 中心扣车颜色
andCenterTrainColor: '#ff0', // 车站+中心扣车颜色
detainTrainTextColor: '#ff0', // 车站扣除文字颜色
fontSize: 16, // 字体大小
fontSize: 14, // 字体大小
fontWeight: 'bolder',
textVerticalAlign: 'middle' // 车站扣车 文字垂直对齐方式
},
@ -328,12 +329,13 @@ class SkinCode extends defaultStyle {
// 跳停
jump: {
z:1,
special:true,
position: 1, // 停跳方向
text: 'S', // 停跳显示内容
offset: { x: 20, y: 21 },
offset: { x: -15, y: -18 },
textColor: '#00FF00', // 停跳文字颜色
fontWeight: 'bold', // 文字居中
fontSize: 18 // 文字大小
fontSize: 14 // 文字大小
},
// 列车停站
trainStop: { // 停车标志
@ -355,8 +357,8 @@ class SkinCode extends defaultStyle {
// 站台 扣车/取消扣车，越站/取消越站 设置按钮
stationPlatform:{
z:1,
insideOffset: { x: 50, y: -20 }, // 内站台按钮偏移量
outsideOffset: { x: 50, y: 20}, // 外站台按钮偏移量
insideOffset: { y: -20 }, // 内站台按钮偏移量
outsideOffset: { y: 20}, // 外站台按钮偏移量
detainColor:'#FFFF00', // 扣车颜色
defaultColor:'#BFBFBF', // 默认颜色
jumpColor:'#00FF00' // 跳停颜色

2
src/jmapNew/shape/Section/index.js
View File

@ -259,7 +259,7 @@ export default class Section extends Group {
setSpeedUpperLimit(speedUpLimit) {
if (this.style.Section.line.speedLimitColor) { // 宁波三号线 独有
this.line.setStyle({stroke: this.style.Section.line.speedLimitColor});
} else if (this.style.Section.speedLimitName.nameAlone && this.model.type == '03') { // 南京2，道岔区段只显示一个名称
} else if (this.style.Section.speedLimitName && this.style.Section.speedLimitName.nameAlone && this.model.type == '03') { // 南京2，道岔区段只显示一个名称
const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode];
if (switchModel && switchModel.sectionACode == this._code) {
this.speedLimit && this.speedLimit.show();

4
src/jmapNew/shape/StationStand/EStationPlatform.js
View File

@ -15,7 +15,8 @@ class EStationPlatform extends Group {
const buttonD = model.right ? 1 : -1;
const platFormOffset = model.inside ? style.StationStand.stationPlatform.insideOffset : style.StationStand.stationPlatform.outsideOffset;
const buttonX = model.position.x - buttonD * (platFormOffset.x - model.width / 2);
const buttonX = model.position.x - buttonD * ( model.width / 2 - 20);
// platFormOffset.x -
const buttonY = model.position.y + buttonD * (platFormOffset.y + buttonD * model.height / 2);
this.stationPlatform = new Polygon({
zlevel: this.model.zlevel,
@ -49,6 +50,7 @@ class EStationPlatform extends Group {
this.stationPlatform && this.stationPlatform.setStyle({fill:color});
}
recover() {
// console.log(this.model.modelData, 22222222222);
// console.log(this.model.modelData.code, 111111111);
const style = this.model.style;
this.setColor(style.StationStand.stationPlatform.defaultColor);

4
src/jmapNew/shape/StationStand/detain/EDetain.js
View File

@ -39,6 +39,10 @@ class EDetain extends Group {
}
});
this.add(this.detain);
if (deviceParam.special) {
this.detain.setStyle({x:model.position.x - detainD * (model.width / 2 + detainOffset.x), 'textPadding':[1, 3], 'textBorderColor':'#fff', 'textBorderWidth':1});
}
}
}

53
src/jmapNew/shape/StationStand/jump/EJump.js
View File

@ -14,24 +14,47 @@ class EJump extends Group {
this.isNew = true;
const jumpDirct = model.right ? -1 : 1;
const jumpOffsetY = model.inside ? -1 : 1;
const jumpX = model.position.x - jumpDirct * (deviceParam.offset.x - model.width / 2);
const jumpY = model.position.y + jumpDirct * deviceParam.offset.y;
this.jump = new Text({
zlevel: this.model.zlevel,
z: this.model.z,
style: {
x: jumpX,
y: jumpY,
fontWeight: deviceParam.fontWeight,
fontSize: deviceParam.fontSize,
fontFamily: style.fontFamily,
text: deviceParam.text,
textFill: deviceParam.textColor,
textAlign: style.textStyle.textAlign,
textVerticalAlign: style.textStyle.textVerticalAlign
}
});
if (deviceParam.special) {
this.jump = new Text({
zlevel: this.model.zlevel,
z: this.model.z,
style: {
x: jumpX,
y: model.position.y + jumpDirct * jumpOffsetY * deviceParam.offset.y,
fontWeight: deviceParam.fontWeight,
fontSize: deviceParam.fontSize,
fontFamily: style.fontFamily,
text: deviceParam.text,
textFill: deviceParam.textColor,
textAlign: style.textStyle.textAlign,
textVerticalAlign: style.textStyle.textVerticalAlign,
textPadding:[1, 3],
textBorderColor:'#fff',
textBorderWidth:1
}
});
} else {
this.jump = new Text({
zlevel: this.model.zlevel,
z: this.model.z,
style: {
x: jumpX,
y: jumpY,
fontWeight: deviceParam.fontWeight,
fontSize: deviceParam.fontSize,
fontFamily: style.fontFamily,
text: deviceParam.text,
textFill: deviceParam.textColor,
textAlign: style.textStyle.textAlign,
textVerticalAlign: style.textStyle.textVerticalAlign
}
});
}
this.add(this.jump);
}
}

7
src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
View File

@ -185,7 +185,8 @@
<el-input-number
:id="domIdStopTime"
v-model="trainStopTime"
:min="0"
:min="15"
:max="300"
:step="1"
size="mini"
:controls="false"
@ -275,7 +276,7 @@ export default {
tripNumber: '',
effective: '01',
trainRunlevel: 2,
trainStopTime: 0,
trainStopTime: 30,
disabledTime: true
};
},
@ -429,7 +430,7 @@ export default {
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.operation = '';
this.trainStopTime = 0;
this.trainStopTime = 30;
},
choose(upDown) { // 取消扣车 请求code码
const operate = {

2
src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
View File

@ -156,7 +156,7 @@ export default {
// }
// }
this.modelData = {
stopTime: selected.parkingTime == 0 ? '自动' : `${selected.parkingTime} 秒`,
stopTime: selected.parkingTime < 0 ? '自动' : `${selected.parkingTime} 秒`,
runLevel: this.runLevelList[selected.runLevelTime],
detainCar: selected.stationHoldTrain || selected.centerHoldTrain ? '已设置' : '无扣车',
jumpStop: selected.allSkip || selected.assignSkip ? '已设置' : '无跳停'

2
src/jmapNew/theme/chengdu_03/menus/menuButton.vue
View File

@ -690,7 +690,7 @@ export default {
}
} else {
this.clearOperate();
this.$messageBox('请先切换到站控或紧急站控');
// this.$messageBox('请先切换到站控或紧急站控');
}
}
}

5
src/jmapNew/theme/chengdu_03/menus/menuSection.vue
View File

@ -49,11 +49,6 @@ export default {
menu: [],
menuNormal: {
Local: [
{
label: '区故解',
handler: this.fault,
cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
}
],
Center: [
{

3
src/jmapNew/theme/components/menus/dialog/standStopTime.vue
View File

@ -38,7 +38,8 @@
v-model="time"
:disabled="disabledInput"
controls-position="right"
:min="0"
:min="15"
:max="300"
size="mini"
style="width: 130px; padding-left:30px;display: block; float: left; margin-top: 15px;"
@change="changeInputTime"

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

@ -272,6 +272,8 @@ export default {
.foshan-01__systerm .el-dialog .el-table .el-table__empty-text {
top: 15px !important;
line-height: normal;
max-width:60%;
}
.foshan-01__systerm .el-dialog .current-row>td {

5
src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
View File

@ -34,7 +34,8 @@
v-model="time"
:disabled="disabledInput"
controls-position="right"
:min="0"
:min="15"
:max="300"
size="mini"
style="width: 125px; padding-left:25px"
@change="inputTime"
@ -87,7 +88,7 @@ export default {
return {
dialogShow: false,
loading: false,
time: 0,
time: 15,
control: '01',
direction: '01',
effective: false,

278
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -185,13 +185,14 @@
>
<div class="station_buttonGroup">
<div class="station_buttonGroupL">
<!-- cancelTrain -->
<!-- menuButton -->
<div :id="setDetainTrainId" class="stationButton station_detainTrain" @click="stationDetainTrain">此站扣车</div>
<div v-if="allowDetain" :id="setDetainTrainId" class="stationButton" @click="stationDetainTrain">此站扣车</div>
<div v-else class="stationButton disabled">此站扣车</div>
</div>
<div class="station_buttonGroupR">
<div :id="cancelTrainId" class="stationButton station_cnacleSetting" @click="stationCancleTrain">取消设置</div>
<div :id="setJumpStopId" class="stationButton station_jumpTrain" @click="stationJumpTrain">此站不停</div>
<div v-if="allowCancle" :id="cancelTrainId" class="stationButton" @click="stationCancleTrain">取消设置</div>
<div v-else class="stationButton disabled">取消设置</div>
<div v-if="allowJump" :id="setJumpStopId" class="stationButton station_jumpTrain" @click="stationJumpTrain">此站不停</div>
<div v-else class="stationButton station_jumpTrain disabled">此站不停</div>
</div>
</div>
<div class="station_line" />
@ -202,6 +203,18 @@
</div>
</el-dialog>
</div>
<div v-if="rightClickDialogVisible" style="position: fixed;z-index: 2;background-color: rgba(44,170,170,0.5);" :style="{top: menuPosition.y + 'px', left:menuPosition.x + 'px'}">
<el-row style="text-align: center; width: 500px;">
<template v-for="(item, index) in centralizedStationList">
<div :key="index" class="nav-border-row row-width-box flex-row">
<div v-if="item.name && (item.disabled || !item.cmdType)" :id="item.operate.domId" class="fake-button-disabled">{{ item.name }}</div>
<div v-else-if="item.name && item.securityCommand" :id="item.operate.domId" :class="[stationContorl.controlMode != item.mode || item.mode == 'None'? 'fake-button-active': 'fake-button-disabled']" @click="clickCommand(item, index)">{{ item.name }}</div>
<div v-else-if="item.name && !item.securityCommand" :id="item.operate.domId" :class="[stationContorl.controlMode != item.mode || item.mode == 'None'? 'fake-button': 'fake-button-disabled', (stationContorl.controlMode != item.mode || item.mode == 'None') && item.next && paramIndex == index ? 'active': '']" @click="clickCommand(item, index)">{{ item.name }}</div>
<div v-else class="fake-button-grayk" />
</div>
</template>
</el-row>
</div>
<notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
</div>
</template>
@ -269,7 +282,15 @@ export default {
tipList: [],
modeMatch: false,
stationDialogVisible:false,
isAllowCommand:true
rightClickDialogVisible: false,
isAllowCommand:true,
allowDetain:true,
allowCancle:true,
allowJump:true,
State2SimulationMap: {
'01': 'Local', // 现地工作站
'02': 'Center' // 中心调度工作站
}
};
},
computed: {
@ -278,12 +299,6 @@ export default {
'stationList',
'routeData'
]),
State2SimulationMap() {
return {
'01': 'Local', // 现地工作站
'02': 'Center' // 中心调度工作站
};
},
commandId() {
return OperationEvent.Command.commandHaerbin.confirm.domId;
},
@ -307,90 +322,14 @@ export default {
},
stationContorl() {
return this.getStationControl(this.selected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {};
},
menuPosition() {
return this.$store.state.menuOperation.menuPosition;
}
},
watch: {
'$store.state.menuOperation.setMenuChangeCount': function (val) {
if (this.selected._type) {
const type = this.State2SimulationMap[this.$store.state.training.prdType];
this.modeMatch = true;
if (this.stationContorl.controlMode != type) {
this.modeMatch = false;
if (this.$store.state.training.prdType == '02' && this.selected._type == 'Station') {
this.selectedObj = this.selected;
if (this.selectedObj._type) {
this.canCommand = true;
const step = {
operation: 'click',
code: this.selectedObj.code,
subType:this.$store.state.menuOperation.subType
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.centralizedStationList = new Array(15).fill({});
this.centralizedStationList[0] = { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledName: 'controlMode', mode: 'Center' };
this.pushTempData([this.selectedObj]);
this.param = { stationCode: this.selectedObj.code };
}
});
}
}
} else {
this.centralizedStationList = new Array(15).fill({});
}
}
this.pushTempData([]); // 清空执行栏
this.selectedObj = this.selected;
if (this.selectedObj._type) {
if (this.selectedObj._type == 'Section' && (this.selectedObj.type == '03' || this.selectedObj.type == '04')) { // 道岔区段 道岔计轴区段 都是道岔操作
this.selectedObj = this.selectedObj.switch;
}
this.canCommand = true;
const step = {
operation: 'click',
code: this.selectedObj.code,
subType:this.$store.state.menuOperation.subType
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
switch (this.selectedObj._type) {
case 'Switch':
this.handleSwicthMenu();
break;
case 'Signal':
if (this.oldClickObj && this.oldClickObj.code != this.selectedObj.code) {
this.checkSignal();
} else {
this.handleSingalMenu();
}
break;
case 'Section':
if (this.trainOperationShow) {
this.handleTrainParam();
} else {
this.handleSectionMenu();
}
break;
case 'Station':
this.handleStationMenu();
this.deviceHighLight(this.oldDevice, false);
this.deviceHighLight(this.selectedObj, true);
this.oldDevice = this.selectedObj;
break;
// case 'StationStand':
// if (this.$store.state.menuOperation.subType == 'trainSetButton') {
// this.handleStandMenu();
// }
// break;
}
}
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
}
},
'$store.state.training.prdType': function (val) {
this.trainOperationShow = false;
@ -403,19 +342,36 @@ export default {
}
},
'selected': function (val) {
this.initMenus();
if (val.code && val._event == MouseEvent.Left) {
this.initMenus();// 初始化菜单数据
this.pushTempData([]); // 清空执行栏
this.selectedObj = this.selected;
this.rightClickDialogVisible = false;
if (this.selectedObj._type && (val._event == MouseEvent.Left || (val._event == MouseEvent.Right || this.$store.state.training.prdType === '01'))) {
const type = this.State2SimulationMap[this.$store.state.training.prdType];
this.modeMatch = this.stationContorl.controlMode == type;
// 道岔区段 道岔计轴区段 都是道岔操作
if (this.selectedObj._type == 'Section' && (this.selectedObj.type == '03' || this.selectedObj.type == '04')) {
this.selectedObj = this.selectedObj.switch;
}
this.canCommand = true;
const step = {
operation: 'click',
code: this.selectedObj.code,
subType:this.$store.state.menuOperation.subType
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { this.handleDeviceMenu(); }
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
if (val._type != 'Psd' && val._type != 'StationStand') {
this.dialogVisible = !this.isLocal;
}
if (val._type == 'StationStand' && this.$store.state.menuOperation.subType == 'trainSetButton') {
this.stationDialogVisible = true;
}
} else if (!val.code) {
this.handleIbpShow();
} else {
this.dialogVisible = false;
if (this.$store.state.training.mode != TrainingMode.TEACH) {
this.handleBasicMenu();
}
this.handleBasicMenu();
}
},
'$store.state.map.showCentralizedStationCode': function(val) {
@ -457,6 +413,53 @@ export default {
}
}
},
handleDeviceMenu() {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
switch (this.selectedObj._type) {
case 'Switch':
this.handleSwicthMenu();
break;
case 'Signal':
if (this.oldClickObj && this.oldClickObj.code != this.selectedObj.code) {
this.checkSignal();
} else {
this.handleSingalMenu();
}
break;
case 'Section':
if (this.trainOperationShow) {
this.handleTrainParam();
} else {
this.handleSectionMenu();
}
break;
case 'Station':
this.handleStationMenu();
this.deviceHighLight(this.oldDevice, false);
this.deviceHighLight(this.selectedObj, true);
this.oldDevice = this.selectedObj;
break;
}
},
handleIbpShow() {
if (this.selectedObj._type == 'StationStand' && this.$store.state.menuOperation.subType == 'trainSetButton') {
if (!(this.selectedObj.assignSkip || this.selectedObj.allSkip || this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain)) {
this.allowCancle = false;
} else {
if (this.selectedObj.assignSkip || this.selectedObj.allSkip) {
this.allowJump = false;
this.allowCancle = true;
this.allowDetain = false;
}
if (this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain) {
this.allowDetain = false;
this.allowCancle = true;
this.allowJump = false;
}
}
this.stationDialogVisible = true;
}
},
getStationControl(selected) {
let control;
if (selected._type == 'StationStand') {
@ -613,8 +616,13 @@ export default {
this.centralizedStationList = new Array(15).fill({});
this.routeParamList.forEach((swicth, index) => {
this.centralizedStationList[index] = swicth;
if (swicth.disabledCb && this.selectedObj) {
swicth.disabled = swicth.disabledCb(this.selectedObj);
}
});
if (this.selectedObj._event === MouseEvent.Right) {
this.rightClickDialogVisible = true;
}
this.pushTempData(this.selectRouteList);
this.param = {
routeCode: this.route.code
@ -628,7 +636,9 @@ export default {
this.guide = false;
this.selectRouteList = [];
this.routeList.forEach(item => {
if (item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.code) {
if (this.selectedObj.type !== 'TRANSMISSION' && item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.code) {
this.selectRouteList.push(item);
} else if (this.selectedObj.type === 'TRANSMISSION' && item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.linkSignalCode) {
this.selectRouteList.push(item);
}
});
@ -681,7 +691,6 @@ export default {
this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) {
this.canCommand = true;
}
// this.param.speedLimitValue = this.speedLimitValue;
this.centralizedStationList = new Array(15).fill({ name: '' });
[65, 55, 45, 35, 25, 0].forEach((el, i) => {
this.centralizedStationList[i] = {
@ -696,6 +705,7 @@ export default {
}
},
clickCommand(row, index) {
this.rightClickDialogVisible = false;
this.paramIndex = row.next ? index : -1;
if (row.next) {
this.pushTempData([row]);
@ -796,6 +806,9 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
handleRightClickClose() {
this.rightClickDialogVisible = false;
},
cancle() {
if (this.$store.state.training.mode != TrainingMode.TEACH) {
clearTimeout(this.timer);
@ -830,6 +843,9 @@ export default {
this.operate = ''; // 清空指令
this.isAllowCommand = true;
this.stationDialogVisible = false;
this.allowJump = true;
this.allowCancle = true;
this.allowDetain = true;
},
handleTrainParam() {
if (this.selectedObj.type === '01') {
@ -843,14 +859,7 @@ export default {
}
});
}
// this.trainModel = this.selectedObj; physicalCode
// this.formModelTripNum = this.trainModel.destinationCode + this.trainModel.serviceNumber + this.trainModel.tripNumber;
// this.formModelSectionName = this.trainModel.sectionModel.name;
// this.formModelNewTrip = '';
},
// setSpeedLimitValue(val) {
// this.speedLimitValue = val;
// },
pushTempData(list) {
this.tempData = [];
list.forEach(el => {
@ -962,14 +971,6 @@ export default {
{ name: '' },
{ name: '' },
{ name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (selectedObj) => ['None'].includes(selectedObj.controlMode) }
// { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu },
// { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu },
// { name: '释放指令', cmdType: '', operate: OperationEvent.Station.humanControlALL.menu },
// { name: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate:OperationEvent.Station.stationRestart.menuButton, securityCommand: true},
// { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu },
// { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu },
// { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu },
] : [
{ name: '' },
{ name: '' },
@ -987,7 +988,6 @@ export default {
{ name: '' },
{ name: '' }
];
this.sectionParamList = this.selected && this.selected.type == '05' ? [
{ name: '岔芯设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '岔芯消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
@ -1018,9 +1018,6 @@ export default {
{ name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '强行消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }
// { name: '转换定位', cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION, operate: OperationEvent.Switch.locate.menuButton, disabledName: 'normalPosition', disabledCb: (selectedObj) => !this.modeMatch },
// { name: '转换反位', cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION, operate: OperationEvent.Switch.reverse.menuButton, disabledName: 'reversePosition', disabledCb: (selectedObj) => !this.modeMatch },
];
this.signalParamList = this.$store.state.training.prdType === '01' ? [
{ name: '关闭信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
@ -1054,8 +1051,6 @@ export default {
{ name: '车队单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }
// { name: '重复开放', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
];
this.stationParamList = this.$store.state.training.prdType === '01' ? [
{ name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, disabledCb: (selectedObj) => !['Local'].includes(selectedObj.controlMode) || !this.modeMatch }
@ -1064,33 +1059,6 @@ export default {
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledCb: (selectedObj) => ['Center'].includes(selectedObj.controlMode) },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (selectedObj) => ['Local', 'None'].includes(selectedObj.controlMode) }
];
// [
// { name: '' },
// { name: '' },
// { name: '' },
// { name: '' },
// { name: '' },
// { name: '' },
// { name: '' },
// { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, securityCommand: true },
// { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu },
// { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu },
// { name: '' },
// { name: '' },
// { name: '' },
// { name: '' },
// { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu },
// { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton },
// { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton },
// { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton },
// { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton }
// ];
// this.standParamList = this.$store.state.training.prdType === '01' ? [] : [
// { name: '扣车', cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, operate: OperationEvent.StationStand.setDetainTrain.menuButton, show: false },
// { name: '取消扣车', cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, operate: OperationEvent.StationStand.cancelDetainTrain.menuButton, show: false },
// { name: '越站', cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, operate: OperationEvent.StationStand.setJumpStop.menuButton, show: false },
// { name: '取消越站', cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, operate: OperationEvent.StationStand.cancelJumpStop.menuButton, show: false }
// ];
this.routeParamList = [
{ name: '排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '取消进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (selectedObj) => !this.modeMatch }
@ -1348,12 +1316,10 @@ export default {
margin-left: 10px;
float: left;
}
.station_detainTrain{}
.station_buttonGroupR{
float: right;
margin-right: 10px;
}
.station_cnacleSetting{}
.station_jumpTrain{
margin-top: 15px;
}
@ -1395,5 +1361,11 @@ export default {
&:hover, &.active{
background: #CFE8FC;
}
&.disabled{
background: #f0f0f0;
color:#a0a0a0;
border: 1px solid #D0CEC5;
cursor: not-allowed;
}
}
</style>

8
src/views/newMap/displayNew/demon/planSchedule.vue
View File

@ -35,6 +35,7 @@ import { EventBus } from '@/scripts/event-bus';
import { getByGroupStationList, getPassengerHistoryList } from '@/api/jmap/map';
import { loadRunPlanData } from '@/utils/loaddata';
import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
import { getSimulationInfoNew } from '@/api/simulation';
import { getToken } from '@/utils/auth';
export default {
name: 'PlanSchedule',
@ -188,8 +189,11 @@ export default {
if (this.$route.query.group) {
// 获取排序的车站列表
getByGroupStationList(this.$route.query.group).then(response => {
this.$store.dispatch('runPlan/setStations', response.data).then(async() => {
loadRunPlanData(this.$route.query.group, this.dataError);
getSimulationInfoNew(this.$route.query.group).then(res => {
this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan);
this.$store.dispatch('runPlan/setStations', response.data).then(async() => {
loadRunPlanData(this.$route.query.group, this.dataError);
});
});
}).catch(() => {
this.$messageBox(this.$t('display.schema.getStationListFail'));

7
src/views/newMap/mapsystemNew/common/index.vue
View File

@ -80,9 +80,8 @@ export default {
if (section) {
device = this.$store.getters['map/getDeviceByCode'](section.relSwitchCode);
}
}
// 过滤道岔相关区段变成道岔model
}
// 过滤道岔相关区段变成道岔model
if (device._type == 'Section' && device.type == '03') {
device = this.$store.getters['map/getDeviceByCode'](device.switch.code);
}
@ -105,7 +104,7 @@ export default {
this.selected = { ...device, _event: MouseEvent.Left };
this.$store.dispatch('menuOperation/setSelected', {device: device, subType: em.subType});
this.$store.dispatch('menuOperation/setLeftClickCount');
if (this.$route.query.lineCode == '07' || this.$route.query.lineCode == '14') {
if (this.$route.query.lineCode == '07') {
this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType});
}
this.$store.dispatch('training/emitTipFresh');

11
vue.config.js
View File

@ -19,6 +19,7 @@ let outputDir = '';
outputDir = process.env.VUE_APP_PRO == 'local' || process.env.VUE_APP_PRO == 'ntyl' ? 'dist' : 'dist/cbtc';
})();
// All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = {
/**
@ -32,7 +33,7 @@ module.exports = {
outputDir: outputDir,
assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录
lintOnSave: false,
productionSourceMap: process.env.VUE_APP_SOURCE_MAP,
productionSourceMap: false,
devServer: {
port: port,
host: '0.0.0.0',
@ -72,7 +73,7 @@ module.exports = {
// })
// );
if (process.env.NODE_ENV != 'development') {
config.mode = 'production';
config.mode = 'production';
Object.assign(config, {
output:{
@ -83,8 +84,8 @@ module.exports = {
});
} else {
// 为开发环境修改配置...
config.mode = 'development';
config.name = name;
config.mode = 'development';
config.name = name;
}
config.resolve = {
@ -142,7 +143,7 @@ module.exports = {
config
// https://webpack.js.org/configuration/devtool/#development
.when(process.env.NODE_ENV === 'development',
config => config.devtool('cheap-source-map')
config => config.devtool('eval-source-map')
);
config