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

调整哈尔滨现地操作步骤流程完善

Browse Source
This commit is contained in:
zyy 2020-03-30 17:53:44 +08:00
parent 0d5645a027
commit 919639ad03
5 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/theme/haerbin_01/menus/menuBar.vue
View File

@ -138,6 +138,15 @@ export default {
} else {
this.switchShowStation('');
}
},
'$store.state.training.offsetStationCode': function(code) {
if (code) {
const sectionModel = this.$store.getters['map/getDeviceByCode'](code);
if (sectionModel._type == 'Section' || sectionModel._type == 'Switch' || sectionModel._type == 'Signal') {
const stationModel = this.$store.getters['map/getDeviceByCode'](sectionModel.stationCode);
this.switchShowStation(stationModel.code);
}
}
}
},
mounted() {
@ -146,6 +155,7 @@ export default {
},
methods: {
initMenu() {
// 设置中心点 设置对应的集中站显示
const centralizedStationList = [];
this.centralizedStationList1 = [];
this.centralizedStationList2 = [];

19
src/scripts/cmdPlugin/Config.js
View File

@ -9,3 +9,22 @@ export const State2ControlMap = {
'Local': 'LocalStationControl', // 站控
'Emergency': 'station'
};
/**
* 地图设备类型
*/
export const MapDeviceType = {
Link: { type: '01', label: 'Link' },
Switch: { type: '02', label: '道岔' },
Section: { type: '03', label: '区段' },
Signal: { type: '04', label: '信号机' },
StationControl: { type: '05', label: '控制模式' },
StationStand: { type: '06', label: '站台' },
Train: { type: '07', label: '列车' },
Station: { type: '08', label: '车站' },
TrainWindow: { type: '09', label: '车次窗' },
LimitControl: { type: '10', label: '限速' },
MixinCommand: { type: '11', label: '混合命令' }
};

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

@ -1012,7 +1012,7 @@ export const OperationEvent = {
lock: {
menu: {
operation: '403',
domId: '_Tips-Section-Lock-Menu'
domId: '_Tips-Section-Lock-Menu{TOP}'
}
},
// 解锁
@ -2046,6 +2046,8 @@ export const OperationEvent = {
};
import { MapDeviceType } from './Config.js';
class OperationHandler {
constructor() {
this.domIdOperationRel = {};
@ -2081,6 +2083,19 @@ class OperationHandler {
}
}
}
/**
* 根据类型编码获取类型名称
* @param {*} code
*/
getDeviceTypeByDic(code) {
for (var field in MapDeviceType) {
if (code === MapDeviceType[field].type) {
return field;
}
}
return null;
}
}
export default new OperationHandler();

4
src/utils/baseUrl.js
View File

@ -5,9 +5,9 @@ export function getBaseUrl() {
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

6
src/views/newMap/mapsystemNew/plugin/trainingtip.vue
View File

@ -7,7 +7,7 @@
<script>
import { mapGetters } from 'vuex';
import PopTip from './src/poptip';
import { getDeviceTypeByDic, getDomIdByOperation } from '@/scripts/ConstDic';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import { getDomOffset } from '@/utils/index';
export default {
@ -104,7 +104,7 @@ export default {
// 获取地图设备提示位置
getShapeTipPoint(step) {
var position = null;
const type = getDeviceTypeByDic(step.type);
const type = OperationHandler.getDeviceTypeByDic(step.type);
if (type) {
position = this.$jlmap.getShapeTipPoint({
code: step.code,
@ -130,7 +130,7 @@ export default {
},
// 获取地图菜单按钮和对话框按钮提示显示位置
getOtherTipPoint(step) {
const domId = getDomIdByOperation(step.operation);
const domId = OperationHandler.getDomIdByOperation(step.operation);
const btnDom = document.getElementById(domId);
if (btnDom) {
const offset = getDomOffset(btnDom, true);