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 
# Conflicts:
#	src/store/modules/runplan.js
This commit is contained in:
joylink_cuiweidong 2021-07-01 10:09:23 +08:00
commit 87095b4f4e
19 changed files with 92 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ibp/shape/key.js
View File

@ -147,20 +147,20 @@ export default class key extends Group {
}
}
onclick() {
if (!this.keyImage.draggable) {
switch (this.model.status) {
case 'off': {
this.keyImage.setStyle({image: keyPicOn});
this.model.status = 'on';
break;
}
case 'on': {
this.keyImage.setStyle({image: keyPic});
this.model.status = 'off';
break;
}
}
}
// if (!this.keyImage.draggable) {
// switch (this.model.status) {
// case 'off': {
// this.keyImage.setStyle({image: keyPicOn});
// this.model.status = 'on';
// break;
// }
// case 'on': {
// this.keyImage.setStyle({image: keyPic});
// this.model.status = 'off';
// break;
// }
// }
// }
}
setStatus(model) {
if (model.on) {

17
src/jmapNew/shape/graph/Train/EMouse.js
View File

@ -58,14 +58,28 @@ class EMouse extends Group {
if (!store.state.map.mapConfig.upRight) {
direction = this.device.model.right != 1;
}
const turnBackStrategyMap = new Map([
['NONE', '无折返'],
['DEFAULT', '默认'],
['AUTO', '自动换端'],
['UNMANNED', '无人折返']
]);
const turnBackStatusMap = new Map([
['NON', '无折返'],
['INIT', '初始化'],
['TO', '开往折返轨'],
['STOP', '到达折返轨停稳'],
['EXIT', '开出折返轨']
]);
// \nNumber of people: ${this.device.model.num ? this.device.model.num : 0}
const path = window.location.href;
const stationNames = new Map(store.state.map.map.stationList.map(s=>[s.code, s.name]));
if (!path.includes('/practiceDisplay')) {
if (LangStorage.getLang() == 'en') {
text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
} else {
if (this.device.style.Train.moreTrainDetail) {
text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}${this.parseDt(this.device.model.dt)}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折返策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}${this.parseDt(this.device.model.dt)}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: ${stationNames.get(this.device.model.startStation)}\n终点站名: ${stationNames.get(this.device.model.endStation)}\n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: ${stationNames.get(this.device.model.stationCode) || ''}\n车次通信: 通信车\n运行时间: ${this.device.model.runningTime}s\n停站时间: ${this.device.model.parkingRemainTime < 0 ? '无效' : `${this.device.model.parkingRemainTime}s`}\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折返策略: ${turnBackStrategyMap.get(this.device.model.turnBackStrategy)}\n折返状态: ${turnBackStatusMap.get(this.device.model.turnBackStatus)}\n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
} else {
text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
}
@ -139,7 +153,6 @@ class EMouse extends Group {
}
}
mouseover() {
console.log(this.device.model)
if (this.device.model.style.Train.common.trainTip) {
this.device.deviceModel.__down = true;
this.arrowText.show();

7
src/jmapNew/shape/graph/Train/index.js
View File

@ -86,6 +86,13 @@ export default class Train extends Group {
num:model.num,
dt: model.dt,
driveMode: model.driveMode,
startStation: model.startStation,
endStation: model.endStation,
runningTime: model.runningTime,
parkingRemainTime: model.parkingRemainTime,
turnBackStrategy: model.turnBackStrategy,
turnBackStatus: model.turnBackStatus,
stationCode: model.stationCode,
model: model
});
const rect = this.trainB.getBoundingRectOfFont().clone();

27
src/jmapNew/theme/components/menus/dialog/trainControl.vue
View File

@ -109,6 +109,14 @@ export default {
}
},
data() {
var validateTripNum = (rule, value, callback) => {
const trip = Number.parseInt(value.substring(1));
if (this.formModel.type === 'HEAD' && this.popClass === 'xian-01__systerm' && (trip < 701 || trip > 749)) {
callback(new Error('头码车车次编号为701至749'));
} else {
callback();
}
};
return {
trainList: [],
serviceNumber:'',
@ -131,7 +139,8 @@ export default {
{ required: true, message: '请选择列车类型', trigger: 'change' }
],
tripNumber: [
{ required: true, message: '请输入车次号', trigger: 'blur' }
{ required: true, message: '请输入车次号', trigger: 'blur' },
{ validator: validateTripNum, trigger: 'blur' }
],
destinationCode: [
{ required: true, message: '请输入目的地号', trigger: 'blur' }
@ -141,7 +150,7 @@ export default {
dialogShow: false,
loading: false,
direction: 0,
selected: null
selected: null
};
},
computed: {
@ -250,9 +259,9 @@ export default {
},
watch: {
'formModel.tripNumber': function(val) {
if (this.popClass !== 'foshan-01__systerm' && val.length === 4) {
if (this.popClass !== 'foshan-01__systerm' && val.length === 4 && this.formModel.type !== 'HEAD') {
this.trainNoChange(val);
} else if (this.popClass !== 'foshan-01__systerm') {
} else if (this.popClass !== 'foshan-01__systerm' && this.formModel.type !== 'HEAD') {
this.formModel = {
groupNumber: this.formModel.groupNumber,
tripNumber: val,
@ -261,9 +270,9 @@ export default {
targetCode: '',
category: 'MM'
};
} else if (this.popClass === 'foshan-01__systerm' && val.length === 2 && this.formModel.serviceNumber.length === 3) {
} else if (this.popClass === 'foshan-01__systerm' && val.length === 2 && this.formModel.serviceNumber.length === 3 && this.formModel.type !== 'HEAD') {
this.trainNoChange(val, this.formModel.serviceNumber);
} else if (this.popClass === 'foshan-01__systerm') {
} else if (this.popClass === 'foshan-01__systerm' && this.formModel.type !== 'HEAD') {
const serviceNumber = this.formModel.serviceNumber;
const destinationCode = this.formModel.destinationCode;
this.formModel = {
@ -298,8 +307,8 @@ export default {
methods: {
loadInitData(map) {},
doShow(operate, selected) {
this.$root.$emit('dialogOpen', selected);
this.selected = selected;
this.$root.$emit('dialogOpen', selected);
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.operation = operate.operation;
@ -324,7 +333,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.$root.$emit('dialogClose', this.selected);
this.$root.$emit('dialogClose', this.selected);
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
},

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

@ -130,8 +130,9 @@ export default {
methods: {
loadInitData(selected) {
this.tempData = [];
const station = this.stationList.find(n => n.code == selected.stationCode);
this.tempData.push({ name: station.name, station: selected.name, strategy: selected.reentryStrategy || 'DEFAULT' });
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
const stand = this.$store.getters['map/getDeviceByCode'](selected.code);
this.tempData.push({ name: station.name, station: station.name, strategy: stand.typeStrategy || 'DEFAULT' });
},
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
View File

@ -117,8 +117,9 @@ export default {
methods: {
loadInitData(selected) {
this.tempData = [];
const station = this.stationList.find(n => n.code == selected.stationCode);
this.tempData.push({ name: station.name, station: selected.name, strategy: selected.reentryStrategy || 'DEFAULT' });
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
const stand = this.$store.getters['map/getDeviceByCode'](selected.code);
this.tempData.push({ name: station.name, station: station.name, strategy: stand.typeStrategy || 'DEFAULT' });
},
strategySelectChange(strategy) {
const operate = {

3
src/scripts/ConstDic.js
View File

@ -140,7 +140,8 @@ export const IbpOperation = {
SXYS: {operate: '11', event: 'SXYS', name: '上行钥匙'},
AXLE_RESET: {operate: '12', event: 'AXLE_RESET', name: '计轴复位'},
AXLE_PRE_RESET: {operate: '13', event: 'AXLE_PRE_RESET', name: '计轴预复位'},
PRERESET_Z: {operate: '14', event: 'PRERESET_Z', name: '计轴预复零'}
PRERESET_Z: {operate: '14', event: 'PRERESET_Z', name: '计轴预复零'},
SD: {operate: '15', event: 'SD', name: '试灯'},
};
/**

16
src/scripts/ProjectConfig.js
View File

@ -280,9 +280,9 @@ export const loginInfo = {
xadt: {
title: '城市轨道交通实训平台',
logoWidth: '60px',
loginTitle: '调度一部',
homeTitle: '调度一部',
browserTitle: '西安地铁调度一部城市轨道交通实训平台',
loginTitle: '运营一中心',
homeTitle: '运营一中心',
browserTitle: '西安地铁运营一中心城市轨道交通实训平台',
loginPath:'/login?project=xadt',
loginParam: 'XADT',
navigationLogoWidth: '40px',
@ -292,9 +292,9 @@ export const loginInfo = {
designxadt: {
title: '城市轨道交通设计平台',
logoWidth: '60px',
loginTitle: '调度一部',
homeTitle: '调度一部',
browserTitle: '西安地铁调度一部城市轨道交通设计平台',
loginTitle: '运营一中心',
homeTitle: '运营一中心',
browserTitle: '西安地铁运营一中心城市轨道交通设计平台',
loginPath:'/design/login?project=xadt',
loginParam: 'XADT',
navigationLogoWidth: '40px',
@ -513,8 +513,8 @@ export const ProjectCode = {
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor']; // 底部栏仅展示公司信息不展示备案号
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'richor']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角版本开发基于不展示
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角主体不展示
export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角版本开发基于不展示
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角主体不展示
export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc',
'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww']; // 登录页样式
export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];

53
src/store/modules/runplan.js
View File

@ -12,9 +12,7 @@ const runPlan = {
width: 800, // 运行图canvas 容器 宽度
height: 600, // 运行图canvas 容器 高度
refreshCount: 0, // 刷新页面重新加载
initialPlanData: {}, // 运行图原始数据
draftSelected: {}, // 草稿运行图选中对象
draftStations: [], // 草稿运行图车站列表
runPlanMap: {}, // 运行图数据map（以id和version 为标识）
runPlanInfo: {}, // 运行图信息
loadRunPlanCount: 0, // 运行图加载数据完成
@ -24,9 +22,6 @@ const runPlan = {
stations: (state) => {
return state.stations || [];
},
draftStations: (state) => {
return state.draftStations || [];
},
getRunPlanData: (state) => {
if (!state.runPlanInfo || !state.runPlanInfo.templateId) {
return '';
@ -47,24 +42,6 @@ const runPlan = {
setStations: (state, stations) => {
state.stations = stations;
},
setDraftStations: (state, stations) => {
state.draftStations = stations;
},
setInitialPlanData: (state, data) => {
state.initialPlanData = {};
if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
const serviceList = data.serviceNumberDataList;
serviceList.forEach((service, i) => {
const trainList = service.tripNumberDataList;
state.initialPlanData[service.serviceNumber] = { oldIndex: i, serviceNumber: service.serviceNumber, backup: service.backup, trainMap: {} };
trainList.forEach((train, j) => {
state.initialPlanData[service.serviceNumber].trainMap[`${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, right:train.right,
directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList, endSecondTime:train.endSecondTime,
startSecondTime: train.startSecondTime, startSectionCode:train.startSectionCode, endSectionCode:train.endSectionCode };
});
});
}
},
setPlanData: (state, data) => {
state.planData = data;
state.editData = {};
@ -84,22 +61,6 @@ const runPlan = {
}
state.planLoadedCount++;
},
setDraftPlanData: (state, data) => {
state.draftPlanData = data;
state.draftEditData = {};
if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
const serviceList = data.serviceNumberDataList;
serviceList.forEach((service, i) => {
const trainList = service.tripNumberDataList;
state.draftEditData[service.serviceNumber] = { oldIndex: i, serviceNumber: service.serviceNumber, backup: service.backup, trainMap: {} };
trainList.forEach((train, j) => {
state.draftEditData[service.serviceNumber].trainMap[`${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, right:train.right,
directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList, endSecondTime:train.endSecondTime,
startSecondTime: train.startSecondTime, startSectionCode:train.startSectionCode, endSectionCode:train.endSectionCode };
});
});
}
},
setSelected: (state, selected) => {
state.selected = selected;
},
@ -237,13 +198,6 @@ const runPlan = {
resolve(mapModel);
});
},
/** 设置草稿stations数据 */
setDraftStations: ({ commit }, mapModel) => {
return new Promise((resolve) =>{
commit('setDraftStations', mapModel);
resolve(mapModel);
});
},
/** 重置运行图数据更新池 */
resetRunPlanData:({ commit }) => {
commit('resetRunPlanData');
@ -256,13 +210,6 @@ const runPlan = {
setPlanData: ({ commit }, data) => {
commit('setPlanData', data);
},
setDraftPlanData: ({ commit }, data) => {
commit('setDraftPlanData', data);
},
/** 设置初始运行图数据 */
setInitialPlanData: ({ commit }, data) => {
commit('setInitialPlanData', data);
},
/** 增加服务号*/
addServiceNumber: ({ commit }, serviceNumber) => {
commit('addServiceNumber', serviceNumber);

3
src/utils/loaddata.js
View File

@ -69,12 +69,10 @@ export function loadRunPlanData(group, dataError) {
dbReadData('runPlan', store.state.runPlan.runPlanInfo.templateId, store.state.runPlan.runPlanInfo.version, async (runPlanData, version) =>{
if (runPlanData && runPlanData.version == version) {
await store.dispatch('runPlan/setPlanData', runPlanData);
await store.dispatch('runPlan/setInitialPlanData', runPlanData);
await store.dispatch('runPlan/loadRunPlanCountIncrease');
} else if (runPlanData) {
getEveryDayRunPlanNew(group).then(async (resp) => {
await store.dispatch('runPlan/setPlanData', resp.data);
await store.dispatch('runPlan/setInitialPlanData', resp.data);
await store.dispatch('runPlan/loadRunPlanCountIncrease');
resp.data.templateId = store.state.runPlan.runPlanInfo.templateId;
resp.data.version = store.state.runPlan.runPlanInfo.version;
@ -85,7 +83,6 @@ export function loadRunPlanData(group, dataError) {
} else {
getEveryDayRunPlanNew(group).then(async (resp) => {
await store.dispatch('runPlan/setPlanData', resp.data);
await store.dispatch('runPlan/setInitialPlanData', resp.data);
await store.dispatch('runPlan/loadRunPlanCountIncrease');
resp.data.templateId = store.state.runPlan.runPlanInfo.templateId;
resp.data.version = store.state.runPlan.runPlanInfo.version;

3
src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue
View File

@ -84,8 +84,9 @@ export default {
{ label: '计轴复位', value: 'AXLE_RESET' },
{ label: '计轴预复位', value: 'AXLE_PRE_RESET' },
{ label: '计轴预复零', value: 'PRERESET_Z' },
{ label: '试灯', value: 'SD' },
],
operateWithoutDirections: ['AXLE_RESET', 'AXLE_PRE_RESET', 'PRERESET_Z'],
operateWithoutDirections: ['AXLE_RESET', 'AXLE_PRE_RESET', 'PRERESET_Z', 'SD'],
form: {
code: '',
buttonColor: 'red',

12
src/views/iscs/iscsSystem/stationConfig/schedule.vue
View File

@ -199,16 +199,8 @@ export default {
},
updateRunPlanData(data) {
const stations = this.$store.state.runPlan.stations;
const initialPlanData = this.$store.state.runPlan.initialPlanData;
data.forEach(item => {
if (item && initialPlanData[item.serviceNumber]) {
Object.keys(initialPlanData[item.serviceNumber].trainMap).forEach(ele => {
if (initialPlanData[item.serviceNumber].trainMap[ele + ''].tripNumber == item.tripNumber) {
item.directionCode = initialPlanData[item.serviceNumber].trainMap[ele + ''].directionCode;
}
});
item.secondTime = item.second;
}
item.secondTime = item.second;
});
this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
this.runSeries = this.PlanParser.updateDataToModels(data, stations, this.kmRangeMap,
@ -234,7 +226,7 @@ export default {
await this.loadInitData();
this.inter && clearInterval(this.inter);
} catch (error) {
console.log(error);
console.log(error);
this.$messageBox(`加载运行图数据失败`);
}
},

3
src/views/login/index.vue
View File

@ -105,6 +105,9 @@
<div v-if="!mainBodyNoShow.includes(project)" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;">
<span>{{ '主体：北京玖琏科技有限公司 备案号：京ICP备18028522号' }}</span>
</div>
<div v-if="project.endsWith('xadt')" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;">
<span>本产品由西安地铁（李乐工作室）与北京玖琏科技有限公司联合开发</span>
</div>
<div v-if="project === 'drts'" style="position: absolute; bottom: 50px; font-size: 20px;right: 20px;color:#3D3D3D;width: 370px;">
<el-row>
<el-col :span="6">

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

@ -271,16 +271,8 @@ export default {
},
updateRunPlanData(data) {
const stations = this.$store.state.runPlan.stations;
const initialPlanData = this.$store.state.runPlan.initialPlanData;
data.forEach(item => {
if (item && initialPlanData[item.serviceNumber]) {
Object.keys(initialPlanData[item.serviceNumber].trainMap).forEach(ele => {
if (initialPlanData[item.serviceNumber].trainMap[ele + ''].tripNumber == item.tripNumber) {
item.directionCode = initialPlanData[item.serviceNumber].trainMap[ele + ''].directionCode;
}
});
item.secondTime = item.second;
}
item.secondTime = item.second;
});
this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
this.runSeries = this.PlanConvert.updateDataToModels(data, stations, this.kmRangeCoordMap,

1
src/views/newMap/displayNew/demon/runPlanLoad.vue
View File

@ -48,7 +48,6 @@ export default {
},
beforeDestroy() {
this.$store.dispatch('runPlan/setPlanData', []);
this.$store.dispatch('runPlan/setInitialPlanData', []);
},
mounted() {
// this.menus = this.$theme.loadPlanComponent(this.$route.query.lineCode);

10
src/views/newMap/displayNew/demon/runPlanView.vue
View File

@ -230,16 +230,8 @@ export default {
},
updateRunPlanData(data) {
const stations = this.$store.state.runPlan.stations;
const initialPlanData = this.$store.state.runPlan.initialPlanData;
data.forEach(item => {
if (item && initialPlanData[item.serviceNumber]) {
Object.keys(initialPlanData[item.serviceNumber].trainMap).forEach(ele => {
if (initialPlanData[item.serviceNumber].trainMap[ele + ''].tripNumber == item.tripNumber) {
item.directionCode = initialPlanData[item.serviceNumber].trainMap[ele + ''].directionCode;
}
});
item.secondTime = item.second;
}
item.secondTime = item.second;
});
this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
this.runSeries = this.PlanParser.updateDataToModels(data, stations, this.kmRangeMap,

20
src/views/newMap/displayNew/demon/runPlanViewWindow.vue
View File

@ -232,16 +232,8 @@ export default {
},
updateRunPlanData(data) {
const stations = this.$store.state.runPlan.stations;
const initialPlanData = this.$store.state.runPlan.initialPlanData;
data.forEach(item => {
if (item && initialPlanData[item.serviceNumber]) {
Object.keys(initialPlanData[item.serviceNumber].trainMap).forEach(ele => {
if (initialPlanData[item.serviceNumber].trainMap[ele + ''].tripNumber == item.tripNumber) {
item.directionCode = initialPlanData[item.serviceNumber].trainMap[ele + ''].directionCode;
}
});
item.secondTime = item.second;
}
item.secondTime = item.second;
});
this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
this.runSeries = this.PlanParser.updateDataToModels(data, stations, this.kmRangeMap,
@ -257,11 +249,11 @@ export default {
const stations = this.$store.state.runPlan.stations;
const planData = this.$store.state.runPlan.planData;
this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
if (this.$route.query.lineCode === '07') {
this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisX(stations)]);
} else {
this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisY(stations)]);
}
if (this.$route.query.lineCode === '07') {
this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisX(stations)]);
} else {
this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisY(stations)]);
}
this.staticSeries = this.pushModels(this.staticSeries, this.PlanParser.convertDataToModels(planData, stations, this.kmRangeMap, { color: '#000', width: 0.5 }));
this.staticSeries.forEach(item => {
this.seriesMap[item.name] = item;

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

@ -95,6 +95,7 @@ export default {
return device;
},
clickEvent(em) {
this.$store.dispatch('map/setTrainWindowShow', false);
var device = { _type: em.deviceType, _code: em.deviceCode, _event: MouseEvent.Left };
const lineCode = this.$store.getters['map/lineCode'];

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

@ -109,7 +109,8 @@ export default {
'switchTurnOperationCanRecoverSplitFault',
'holdCommandIgnoreControlMode',
'delayWhenCancelRouteWithAbnormalInterlock',
'noARB'
'noARB',
'checkDirectionWhenSetHead'
],
selectList: ['runMode'],
generalConfig: [
@ -151,7 +152,8 @@ export default {
'delayWhenCancelRouteWithAbnormalInterlock',
'figuresOfTripNumber',
'figuresOfServiceNumber',
'noARB'
'noARB',
'checkDirectionWhenSetHead'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -198,7 +200,8 @@ export default {
delayWhenCancelRouteWithAbnormalInterlock: '取消联锁条件不满足的进路时需要延时解锁',
figuresOfTripNumber: '车次号的位数',
figuresOfServiceNumber: '服务号的位数',
noARB: '没有ARB判定'
noARB: '没有ARB判定',
checkDirectionWhenSetHead: '设置头码车时检查方向'
}
};
},