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

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

Browse Source
This commit is contained in:
fan 2020-01-07 10:59:38 +08:00
commit 2d8d16c0e7
6 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
View File

@ -518,7 +518,7 @@ export function menuFiltration(menuObj) {
} else {
control = store.getters['map/getStationControlByStationCode'](selected.stationCode);
}
console.log('============', control);
if (control) {
if (store.state.training.prdType != '') {
const type = SystemType[store.state.training.prdType];
@ -537,7 +537,6 @@ export function menuFiltration(menuObj) {
if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示
elem.show = false;
}
console.log('222222222', elem);
elem.defaultDisabled = !elem.auth[status];
}
});

23
src/jmapNew/constant/deviceState.js
View File

@ -159,8 +159,14 @@ deviceState[deviceType.Station] = {
fault: {
Default: false /** 非故障*/
},
status: {
Default: '01', /** 中控（缺省值）*/
State01: '01', /** 中控 */
State02: '02', /** 站控 */
State03: '03' /** 紧急站控 */
},
controlMode: {
Default: 'Center' /** 中控（默认值）*/
Default: 'Center'
// Center 中控
// Local 站控
// Emergency 紧急站控
@ -210,6 +216,21 @@ deviceState[deviceType.StationStand] = {
State01: '01', /** 关门 */
State02: '02' /** 开门 */
},
/** 扣车状态*/
holdStatus: {
Default: '01', /** 未设置扣车（缺省值）*/
State01: '01', /** 未设置扣车*/
State02: '02', /** 车站扣车*/
State03: '03', /** 中心扣车*/
State04: '04' /** 中心+车站扣车*/
},
/** 跳停*/
jumpStopStatus: {
Default: '01', /** 未设置跳停（缺省值）*/
State01: '01', /** 未设置跳停 */
State02: '02', /** 指定列车跳停 */
State03: '03' /** 全部跳停 */
},
stationHoldTrain: false, // 车站是否扣车
centerHoldTrain: false, // 中心是否扣车
allSkip: false, // 是否全部跳停

6
src/jmapNew/utils/parser.js
View File

@ -59,9 +59,9 @@ export function parser(data, skinCode) {
mapDevice[elem.code] = createDevice(deviceType.StationStand, elem, propConvert);
}, this);
// zrUtil.each(data.stationControlList || [], elem => {
// mapDevice[elem.code] = createDevice(deviceType.StationControl, elem, propConvert);
// }, this);
zrUtil.each(data.stationControlList || [], elem => {
mapDevice[elem.code] = createDevice(deviceType.StationControl, elem, propConvert);
}, this);
zrUtil.each(data.counterList || [], elem => {
mapDevice[elem.code] = createDevice(deviceType.StationCounter, elem, propConvert);

4
src/utils/baseUrl.js
View File

@ -3,11 +3,11 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.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.41:9000'; // 张赛
BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
} else {
BASE_API = process.env.VUE_APP_BASE_API;
}

14
src/views/jlmap/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="jlmap-canvas" :style="{ width: width+'px', height: height+'px' }">
<div v-show="maskOpen" class="mask" />
<div :id="canvasId" style="background: #000;" />
<progress-bar ref="progressBar" />
<zoom-box v-if="!isScreen" :scale-rate="dataZoom.scaleRate" @setShrink="setShrink" @setMagnify="setMagnify" />
@ -72,6 +73,9 @@ export default {
},
isScreen() {
return this.$route.params.mode == 'dp' || this.$store.state.training.roles == 'BigScreen';
},
maskOpen() {
return this.$store.state.config.maskOpen;
}
},
watch: {
@ -292,6 +296,16 @@ export default {
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.mask{
opacity: 0;
background: #000;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 9;
}
.jlmap-canvas {
position: relative;
-moz-user-select: none;

14
src/views/newMap/jlmapNew/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="jlmap-canvas" :style="{ width: width+'px', height: height+'px' }" @mousemove.stop="mousemove">
<div v-show="maskOpen" class="mask" />
<div :id="canvasId" style="background: #000;" class="display_canvas" />
<progress-bar ref="progressBar" />
<zoom-box v-if="!isScreen" :scale-rate="dataZoom.scaleRate" @setShrink="setShrink" @setMagnify="setMagnify" />
@ -85,6 +86,9 @@ export default {
},
isScreen() {
return this.$route.params.mode == 'dp' || this.$store.state.training.roles == 'BigScreen';
},
maskOpen() {
return this.$store.state.config.maskOpen;
}
},
watch: {
@ -313,6 +317,16 @@ export default {
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.mask{
opacity: 0;
background: #000;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 9;
}
.jlmap-canvas {
position: relative;
-moz-user-select: none;