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

Merge remote-tracking branch 'origin/test'

Browse Source
This commit is contained in:
thesai 2021-08-19 21:00:29 +08:00
commit 1731c9b20b
14 changed files with 124 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,12 +127,12 @@ class SkinCode extends defaultStyle {
rightName: false, // 右侧限速值是否展示 rightName: false, // 右侧限速值是否展示
nameBackgroundIsRect: true, // 限速值背景是否为矩形 nameBackgroundIsRect: true, // 限速值背景是否为矩形
nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度 nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度
nameBackgroundBorderColor: '#C00808', // 限速值背景边框颜色 nameBackgroundBorderColor: '#f00', // 限速值背景边框颜色
limitValueDistance: 18, limitValueDistance: 18,
kilometerFontSize: 0, // 公里标大小 kilometerFontSize: 0, // 公里标大小
switchSectionNoShow: true, // 道岔区段不展示限速 switchSectionNoShow: true, // 道岔区段不展示限速
nameNumberFontSize: 11, // 限速值大小 nameNumberFontSize: 15, // 限速值大小
nameNumberColor: '#C00808', // 限速值颜色 nameNumberColor: '#f00', // 限速值颜色
nameBackground: 'rgba(0,0,0,0)', // 限速名称背景颜色 nameBackground: 'rgba(0,0,0,0)', // 限速名称背景颜色
drogueWidth: 15, // 浮标宽度 drogueWidth: 15, // 浮标宽度
drogueHeight: 12 // 浮标高度 drogueHeight: 12 // 浮标高度

4
src/jmapNew/shape/graph/Section/ELimitName.js
View File

@ -49,7 +49,7 @@ export default class ELimitName extends Group {
style: { style: {
x: x1 + 2, x: x1 + 2,
y: y1, y: y1,
fontWeight: 'normal', fontWeight: 'bolder',
fontSize: style.Section.speedLimitName.nameNumberFontSize, fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily, fontFamily: style.fontFamily,
text: '', text: '',
@ -107,7 +107,7 @@ export default class ELimitName extends Group {
style: { style: {
x: x2 - 2, x: x2 - 2,
y: y2, y: y2,
fontWeight: 'normal', fontWeight: 'bolder',
fontSize: style.Section.speedLimitName.nameNumberFontSize, fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily, fontFamily: style.fontFamily,
text: '', text: '',

4
src/jmapNew/shape/graph/Section/index.js
View File

@ -387,6 +387,7 @@ export default class Section extends Group {
const switchModel = this.mapDevice[model.relSwitchCode]; const switchModel = this.mapDevice[model.relSwitchCode];
const sectionB = this.mapDevice[switchModel.sectionBCode]; const sectionB = this.mapDevice[switchModel.sectionBCode];
const sectionC = this.mapDevice[switchModel.sectionCCode]; const sectionC = this.mapDevice[switchModel.sectionCCode];
const sectionA = this.mapDevice[switchModel.sectionACode];
if (switchModel && switchModel.normalPosition === 1) { if (switchModel && switchModel.normalPosition === 1) {
this.setSwitchSectionColor(sectionC, sectionB);// 定位 this.setSwitchSectionColor(sectionC, sectionB);// 定位
} else if (switchModel && switchModel.normalPosition === 0 && switchModel.reversePosition === 0 && switchModel.instance && switchModel.instance.switchPosition === 'reverse' && switchModel.fault !== 'SPLIT') { } else if (switchModel && switchModel.normalPosition === 0 && switchModel.reversePosition === 0 && switchModel.instance && switchModel.instance.switchPosition === 'reverse' && switchModel.fault !== 'SPLIT') {
@ -419,7 +420,8 @@ export default class Section extends Group {
} }
} else { } else {
if (sectionB && sectionB.instance) { sectionB.instance.line.stopAnimation(true); sectionB.delayUnlock && sectionB.instance.delayUnlock(); } if (sectionB && sectionB.instance) { sectionB.instance.line.stopAnimation(true); sectionB.delayUnlock && sectionB.instance.delayUnlock(); }
if (sectionC && sectionC.instance) { sectionC.instance.line.stopAnimation(true); sectionC.delayUnlock && sectionB.instance.delayUnlock(); } if (sectionC && sectionC.instance) { sectionC.instance.line.stopAnimation(true); sectionC.delayUnlock && sectionC.instance.delayUnlock(); }
if (sectionA && sectionA.instance) { sectionA.instance.line.stopAnimation(true); sectionA.delayUnlock && sectionA.instance.delayUnlock(); }
} }
} }
} }

4
src/jmapNew/shape/graph/Switch/index.js
View File

@ -726,9 +726,9 @@ export default class Switch extends Group {
if (this.style.Switch.sectionAction.flag && this.model.showMode !== '05') { // 哈尔滨线路处理道岔相关区段颜色 if (this.style.Switch.sectionAction.flag && this.model.showMode !== '05') { // 哈尔滨线路处理道岔相关区段颜色
const switchModel = this.mapDevice[model.code]; const switchModel = this.mapDevice[model.code];
const sectionB = this.mapDevice[switchModel.sectionBCode]; const sectionB = this.mapDevice[switchModel.sectionBCode];
sectionB && sectionB.instance && sectionB.instance.setState(sectionB); sectionB && sectionB.instance && sectionB.instance.handleSwitchSection(sectionB);
const sectionC = this.mapDevice[switchModel.sectionCCode]; const sectionC = this.mapDevice[switchModel.sectionCCode];
sectionC && sectionC.instance && sectionC.instance.setState(sectionC); sectionC && sectionC.instance && sectionC.instance.handleSwitchSection(sectionC);
} }
model.noStatus && this.setAshShow(); model.noStatus && this.setAshShow();
!model.auto && this.artificialArc && this.artificialArc.show(); !model.auto && this.artificialArc && this.artificialArc.show();

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

@ -882,6 +882,16 @@ export default {
this.param.speedLimitValue = -1; this.param.speedLimitValue = -1;
} }
if (this.cmdType === CMD.Stand.CMD_STAND_EARLY_DEPART) {
const stand = this.stationStandList.find(item => item.standTrackCode === this.selectedObj.code);
this.param.standCode = stand.code;
}
if (this.cmdType === CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY) {
const stand = this.stationStandList.find(item => item.standTrackCode === this.selectedObj.code);
this.param.standCode = stand.code;
this.param.standReentryStrategy = row.params.val;
}
if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) { if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
if (this.operate == OperationEvent.Section.setSpeed.menuButton.operation || if (this.operate == OperationEvent.Section.setSpeed.menuButton.operation ||
this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) { this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) {
@ -1301,23 +1311,23 @@ export default {
{ name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
{ name: '上行不折返', commandTip: '上行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '上行不折返', commandTip: '上行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '下行不折返', commandTip: '下行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '下行不折返', commandTip: '下行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '上行缺省折返', commandTip: '上行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '上行缺省折返', commandTip: '上行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '下行缺省折返', commandTip: '下行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '下行缺省折返', commandTip: '下行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '上行换端', commandTip: '上行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '上行换端', commandTip: '上行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '下行换端', commandTip: '下行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '下行换端', commandTip: '下行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '上行自动折返', commandTip: '上行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '上行自动折返', commandTip: '上行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '车站发车', commandTip: '车站发车', cmdType: CMD.Section.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '02' }, { name: '车站发车', commandTip: '车站发车', cmdType: CMD.Section.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Section.CMD_SECTION_1, operate: OperationEvent.Section.turnBackDTO.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.turnBackDTO.menuButton, params: {val: 'UNMANNED'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '取消折返', commandTip: '取消折返', cmdType: CMD.Section.CMD_SECTION_2, operate: OperationEvent.Section.CancelTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.CancelTurnBack.menuButton, params: {val: 'NONE'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '自动折返', commandTip: '自动折返', cmdType: CMD.Section.CMD_SECTION_3, operate: OperationEvent.Section.AutoTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.AutoTurnBack.menuButton, params: {val: 'DEFAULT'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '换上至下', commandTip: '换上至下', cmdType: CMD.Section.CMD_SECTION_4, operate: OperationEvent.Section.PutUpTheDown.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && this.$store.state.training.prdType == '01' }, { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutUpTheDown.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '换下至上', commandTip: '换下至上', cmdType: CMD.Section.CMD_SECTION_5, operate: OperationEvent.Section.PutDownTheUp.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && this.$store.state.training.prdType == '01' }, { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutDownTheUp.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Section.CMD_SECTION_6, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && this.$store.state.training.prdType == '01' }, { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Section.CMD_SECTION_7, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && this.$store.state.training.prdType == '01' } { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }
]; ];
this.switchParamList = [ this.switchParamList = [
{ name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch}, { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},

3
src/jmapNew/theme/xian_01/planConfig.js
View File

@ -21,6 +21,7 @@ export default {
sepField: '车次号', sepField: '车次号',
columns: { columns: {
'停车站名称': { key: 'stationName', formatter: (val) => { return val; } }, '停车站名称': { key: 'stationName', formatter: (val) => { return val; } },
'停车轨名称':{key: 'trackName', formatter: (val) => { return val; }},
'到达时间': { key: 'arriveTime', formatter: (val) => { return val; } }, '到达时间': { key: 'arriveTime', formatter: (val) => { return val; } },
'出发时间': { key: 'departureTime', formatter: (val) => { return val; } } '出发时间': { key: 'departureTime', formatter: (val) => { return val; } }
} }
@ -82,7 +83,7 @@ export default {
// 添加字段值 // 添加字段值
if (Object.keys(stationObj).length) { if (Object.keys(stationObj).length) {
if (stationObj.arriveTime) { if (stationObj.trackName || stationObj.arriveTime) {
tripObj.arrivalList.push(stationObj); tripObj.arrivalList.push(stationObj);
} }
} }

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

@ -166,22 +166,7 @@ export default {
/** 设置折返策略 */ /** 设置折返策略 */
CMD_STAND_SET_REENTRY_STRATEGY: {value:'Stand_Set_Reentry_Strategy', label: '设置折返策略'}, CMD_STAND_SET_REENTRY_STRATEGY: {value:'Stand_Set_Reentry_Strategy', label: '设置折返策略'},
/** 提前发车 */ /** 提前发车 */
CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'}, CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'}
/** 折返 DTO */
CMD_SECTION_1: {value: 'Section_1', label: '折返 DTO'},
/** 取消折返 */
CMD_SECTION_2: {value: 'Section_2', label: '取消折返'},
/** 自动折返 */
CMD_SECTION_3: {value: 'Section_3', label: '自动折返'},
/** 换上至下 */
CMD_SECTION_4: {value: 'Section_4', label: '换上至下'},
/** 换下至上 */
CMD_SECTION_5: {value: 'Section_5', label: '换下至上'},
/** 上行终止站停 */
CMD_SECTION_6: {value: 'Section_6', label: '上行终止站停'},
/** 下行终止站停 */
CMD_SECTION_7: {value: 'Section_7', label: '下行终止站停'}
}, },
// 站台 // 站台

4
src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
View File

@ -52,7 +52,7 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js'; import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import CentercPane from '@/views/jlmap3d/drive/drivecontrol/centerpane'; import CentercPane from '@/views/jlmap3d/drive/drivecontrol/centerpane';
import LeftPane from '@/views/jlmap3d/drive/drivecontrol/leftpane'; // import LeftPane from '@/views/jlmap3d/drive/drivecontrol/leftpane';
import RightPane from '@/views/jlmap3d/drive/drivecontrol/rightpane'; import RightPane from '@/views/jlmap3d/drive/drivecontrol/rightpane';
import TopRightPane from '@/views/jlmap3d/drive/drivecontrol/toprightpane'; import TopRightPane from '@/views/jlmap3d/drive/drivecontrol/toprightpane';
@ -71,7 +71,7 @@ import axios from 'axios';
name: 'DriveControl', name: 'DriveControl',
components: { components: {
CentercPane, CentercPane,
LeftPane, // LeftPane,
RightPane, RightPane,
TopRightPane, TopRightPane,
}, },

21
src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
View File

@ -486,21 +486,24 @@
}); });
}, },
updatabuttonlight: function (data){ updatabuttonlight: function (data){
// console.log(data); console.log(data);
if(data.runLevel){ // if(data.runLevel){
// this.runLevel = data.runLevel; // // this.runLevel = data.runLevel;
if(data.runLevel == "CBTC"){ // if(data.runLevel == "CBTC"){
this.cbtcbuttonimg = this.greenlimg; // this.cbtcbuttonimg = this.greenlimg;
}else{ // }else{
this.cbtcbuttonimg = this.greenimg; // this.cbtcbuttonimg = this.greenimg;
} // }
} // }
if(data.driveMode){ if(data.driveMode){
// this.driveMode = data.driveMode; // this.driveMode = data.driveMode;
if(data.driveMode == "RM"){ if(data.driveMode == "RM"){
this.rmbuttonimg = this.greenlimg; this.rmbuttonimg = this.greenlimg;
this.cbtcbuttonimg = this.greenimg;
}else{ }else{
this.rmbuttonimg = this.greenimg; this.rmbuttonimg = this.greenimg;
this.cbtcbuttonimg = this.greenlimg;
} }
} }
if(typeof(data.atoOn) != "undefined"){ if(typeof(data.atoOn) != "undefined"){

8
src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue
View File

@ -28,6 +28,13 @@
</draggable> </draggable>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="图片资源列表" name="picasset"> <el-tab-pane label="图片资源列表" name="picasset">
<el-tabs v-model="activeName" class="activediv" type="card" @tab-click="handleClick" >
<el-tab-pane label="图片资源列表" name="picasset">
</el-tab-pane>
</el-tabs>
<draggable v-model="picAssetList" group="picasset" @start="drag=true" @end="drag=false"> <draggable v-model="picAssetList" group="picasset" @start="drag=true" @end="drag=false">
<div class="progressdiv" <div class="progressdiv"
v-for="item in picAssetList" @click="changePicUrl($event,item)"> v-for="item in picAssetList" @click="changePicUrl($event,item)">
@ -40,6 +47,7 @@
</draggable> </draggable>
<!-- <Assets-Model></Assets-Model> --> <!-- <Assets-Model></Assets-Model> -->
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>

5
src/views/jlmap3d/lesson3dedit/lesson3dedit.vue
View File

@ -175,22 +175,27 @@
lessonTools:[ lessonTools:[
{ {
name:"步骤组件", name:"步骤组件",
type:"",
isShow:false, isShow:false,
}, },
{ {
name:"步骤进程日志", name:"步骤进程日志",
type:"",
isShow:false, isShow:false,
}, },
{ {
name:"步骤提示组件", name:"步骤提示组件",
type:"",
isShow:false, isShow:false,
}, },
{ {
name:"岗位联络操作", name:"岗位联络操作",
type:"",
isShow:false, isShow:false,
}, },
{ {
name:"导航工具栏", name:"导航工具栏",
type:"",
isShow:false, isShow:false,
}, },
], ],

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

@ -31,6 +31,8 @@
</template> </template>
<template v-else-if="!projectDevice"> <template v-else-if="!projectDevice">
<el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button> <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
<!-- isDisable&& -->
<el-button v-if="isAdmin" v-loading="pauseLoading" :type="simulationPaused?'warning':'primary'" size="small" @click="startOrPause">{{ simulationPaused?'开始':'暂停' }}</el-button>
<el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button> <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
</template> </template>
</template> </template>
@ -67,6 +69,7 @@ import { getCountTime } from '@/utils/index';
import { TrainingMode } from '@/scripts/ConstDic'; import { TrainingMode } from '@/scripts/ConstDic';
import { quitScriptNew } from '@/api/simulation'; import { quitScriptNew } from '@/api/simulation';
import { setGoodsTryUse } from '@/api/management/goods'; import { setGoodsTryUse } from '@/api/management/goods';
import { simulationPause, simulationStart } from '@/api/rtSimulation';
import {loadScriptNew } from '@/api/simulation'; import {loadScriptNew } from '@/api/simulation';
import StatusIcon from '@/views/components/StatusIcon/statusIcon'; import StatusIcon from '@/views/components/StatusIcon/statusIcon';
import Vue from 'vue'; import Vue from 'vue';
@ -112,6 +115,7 @@ export default {
countTime: 0, // 显示 倒计时 countTime: 0, // 显示 倒计时
remainingTime: 0, remainingTime: 0,
userRole:'AUDIENCE', userRole:'AUDIENCE',
pauseLoading: false,
goodsId: this.$route.query.goodsId, goodsId: this.$route.query.goodsId,
try: this.$route.query.try, // 是否是试用权限 try: this.$route.query.try, // 是否是试用权限
training: { training: {
@ -153,6 +157,12 @@ export default {
}, },
project() { project() {
return getSessionStorage('project'); return getSessionStorage('project');
},
isAdmin() {
return this.$store.state.user.roles.includes('04') || this.$store.state.user.roles.includes('05');
},
simulationPaused() {
return this.$store.state.socket.simulationPause;
} }
}, },
watch: { watch: {
@ -210,6 +220,24 @@ export default {
}); });
}, },
methods: { methods: {
startOrPause() {
this.pauseLoading = true;
if (this.simulationPaused) {
simulationStart(this.group).then(resp => {
this.pauseLoading = false;
}).catch(() => {
this.pauseLoading = false;
this.$messageBox('开始失败，请稍后再试');
});
} else {
simulationPause(this.group).then(resp => {
this.pauseLoading = false;
}).catch(() => {
this.pauseLoading = false;
this.$messageBox('暂停失败，请稍后再试');
});
}
},
async initLoadPage() { async initLoadPage() {
try { try {
if (this.try != '0') { if (this.try != '0') {

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

@ -34,6 +34,7 @@
<template v-if="isAdmin && project != 'refereeJsxt' && $route.query.type !== 'ILW'"> <template v-if="isAdmin && project != 'refereeJsxt' && $route.query.type !== 'ILW'">
<!-- 按计划行车 --> <!-- 按计划行车 -->
<el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button> <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
<el-button v-if="isAdministrator" 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> <el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
</template> </template>
</template> </template>
@ -62,6 +63,7 @@ import { getPublishLessonListByMapId } from '@/api/jmap/lesson';
import { getPostByProjectCode } from '@/api/learn'; import { getPostByProjectCode } from '@/api/learn';
import { ProjectCode } from '@/scripts/ProjectConfig'; import { ProjectCode } from '@/scripts/ProjectConfig';
import ContectUs from '@/views/newMap/displayNew/dispatherContest/contectUs'; import ContectUs from '@/views/newMap/displayNew/dispatherContest/contectUs';
import { simulationPause, simulationStart } from '@/api/rtSimulation';
export default { export default {
name: 'MenuDemonJoint', name: 'MenuDemonJoint',
@ -113,6 +115,7 @@ export default {
return { return {
backLoading: false, backLoading: false,
chatShow: true, chatShow: true,
pauseLoading: false,
isGoback: false, isGoback: false,
noSimulationQrCodeList: NoSimulationQrCodeList, noSimulationQrCodeList: NoSimulationQrCodeList,
isShow3dmodel :false, isShow3dmodel :false,
@ -134,10 +137,10 @@ export default {
return (this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice); return (this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice);
}, },
isDISPATCHER() { isDISPATCHER() {
console.log("================================"); console.log('================================');
console.log(this.$store.state.training.prdType); console.log(this.$store.state.training.prdType);
return (this.$store.state.training.prdType == '01'||this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy'); return (this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy');
}, },
isStationSupervisor() { isStationSupervisor() {
return this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy'); return this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy');
@ -191,6 +194,12 @@ export default {
}, },
statusIconShow() { statusIconShow() {
return (this.$route.query.lineCode == '11' || this.$route.query.lineCode == '10') && this.$store.state.training.prdType == '02'; return (this.$route.query.lineCode == '11' || this.$route.query.lineCode == '10') && this.$store.state.training.prdType == '02';
},
isAdministrator() {
return this.$store.state.user.roles.includes('04') || this.$store.state.user.roles.includes('05');
},
simulationPaused() {
return this.$store.state.socket.simulationPause;
} }
}, },
watch: { watch: {
@ -255,6 +264,24 @@ export default {
}); });
}, },
methods: { methods: {
startOrPause() {
this.pauseLoading = true;
if (this.simulationPaused) {
simulationStart(this.group).then(resp => {
this.pauseLoading = false;
}).catch(() => {
this.pauseLoading = false;
this.$messageBox('开始失败，请稍后再试');
});
} else {
simulationPause(this.group).then(resp => {
this.pauseLoading = false;
}).catch(() => {
this.pauseLoading = false;
this.$messageBox('暂停失败，请稍后再试');
});
}
},
// 设置用户角色 Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 MAINTAINER 通号 // 设置用户角色 Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 MAINTAINER 通号
addrolesList(list) { addrolesList(list) {
list.forEach(item => { list.forEach(item => {

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

@ -106,7 +106,7 @@ export default {
async simulationError() { async simulationError() {
await this.$store.dispatch('map/clearJlmapTrainView'); await this.$store.dispatch('map/clearJlmapTrainView');
await this.$store.dispatch('map/setTrainWindowShow', false); await this.$store.dispatch('map/setTrainWindowShow', false);
await this.$store.dispatch('training/setMapDefaultState'); // await this.$store.dispatch('training/setMapDefaultState');
this.$confirm(this.$t('tip.getMapStateDataException'), this.$t('tip.hint'), { this.$confirm(this.$t('tip.getMapStateDataException'), this.$t('tip.hint'), {
confirmButtonText: this.$t('global.confirm'), confirmButtonText: this.$t('global.confirm'),
showCancelButton: false, showCancelButton: false,