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-03-19 16:17:53 +08:00
commit 7de2c38af4
14 changed files with 79 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -87,6 +87,7 @@ class SkinCode extends defaultStyle {
textVerticalAlign: 'middle' // 文字垂直对齐方式
},
line: {
isActiveShow: true, // 哈尔滨点击元素显示
width: 5, // 区段宽度
beyondWidth: 1, // 区段宽超出宽度
invadeColor: '#EF0C08', // 区段侵入颜色

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

@ -30,7 +30,7 @@ export default class ELines extends Group {
isLine: true,
zlevel: this.zlevel,
progressive: model.progressive,
z: this.z + 1,
z: this.z + 2,
culling: true,
shape: shape,
style: {

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

@ -54,7 +54,7 @@ export default class Section extends Group {
createMouseEvent() {
// 鼠标事件
if (this.style.Section.mouseOverStyle) {
if (this.style.Section.mouseOverStyle) { // 只有北京线路才会有鼠标事件
this.mouseEvent = new EMouse(this, this.model.relSwitchCode);
this.add(this.mouseEvent);
this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
@ -69,7 +69,8 @@ export default class Section extends Group {
// 创建区段
this.section = new ELines({
zlevel: this.zlevel,
z: model.type == '02' ? this.z + 1 : this.z, // 逻辑区段层级降低一层
// z: model.type == '02' ? this.z + 1 : this.z, // 逻辑区段层级降低一层
z: this.z, // 逻辑区段层级降低一层
isSwitchSection: model.switchSection,
isCurve: model.curve,
points: model.type == '04' ? [model.namePosition, model.namePosition] : model.points,
@ -571,18 +572,9 @@ export default class Section extends Group {
});
}
setModelTypeLevel() { // 给含有逻辑区段的 section 层级加一
if (this.model.type == '01' && this.model.logicSectionCodeList && this.model.logicSectionCodeList.length > 0) {
this.section.setZleve(this.z + 2);
}
}
/** 设置区段恢复默认状态*/
recover() {
if (this.section) {
if (this.model.type == '01') {
this.section.setZleve(this.z);
}
this.section.stopAnimation(true);
this.sectionBlock && this.sectionBlock.hide(); // 因此特殊区段
this.section.setStyle({
@ -629,7 +621,6 @@ export default class Section extends Group {
stroke: this.style.Section.line.communicationOccupiedColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
this.setModelTypeLevel();
}
}
@ -640,7 +631,6 @@ export default class Section extends Group {
stroke: this.style.Section.line.unCommunicationOccupiedColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
this.setModelTypeLevel();
}
}
@ -651,7 +641,6 @@ export default class Section extends Group {
stroke: this.style.Section.line.routeLockColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
this.setModelTypeLevel();
}
}
@ -671,7 +660,6 @@ export default class Section extends Group {
{ time: 2000, styles: { stroke: this.style.Section.line.blockColor } }
]);
}
this.setModelTypeLevel();
}
/** 故障锁定状态 05*/
@ -813,16 +801,9 @@ export default class Section extends Group {
sectionC && sectionC.instance && sectionC.instance.setState(sectionC, true);
}
}
let numFlag = 0;
model.logicSectionNum.forEach(item => {
numFlag += item;
});
if (numFlag) {
return;
}
// 顺序代表优先级
/** 道岔保护区段锁闭 */
{ model.overlapLock && this.protectiveLock(); }
model.overlapLock && this.protectiveLock();
/** 空闲锁闭或者叫进路锁闭 */
model.routeLock && this.routeLock();
/** 轨道封锁 */
@ -873,7 +854,11 @@ export default class Section extends Group {
drawSelected(selected) {
this.selected = selected;
if (selected) {
!this.selectedType && this.section && this.section.setStyle({ stroke: '#fbfbfb' });
if (this.style.Section.line.isActiveShow) {
console.log(111);
} else {
!this.selectedType && this.section && this.section.setStyle({ stroke: '#fbfbfb' });
}
} else {
!this.selectedType && this.section && this.section.setStyle({ stroke: this.style.Section.line.spareColor });
}

47
src/jmapNew/shape/Signal/index.js
View File

@ -275,7 +275,7 @@ class Signal extends Group {
}
/* count 1单灯 2双灯 lightType 01物理点灯 02逻辑点灯*/
openPositive() {
openPositive() { // 正向开放
if (this.count == 2 && !this.model.lightType) {
if (this.lamps[0]) {
this.lamps[0].setStop(false);
@ -307,7 +307,7 @@ class Signal extends Group {
}
}
/* count 1单灯 2双灯 lightType 逻辑点灯 true，物理点灯 false */
openLateral() {
openLateral() { // 侧向开放
if (this.count == 2 && !this.model.lightType) {
if (this.lamps[0]) {
this.lamps[0].setStop(false);
@ -499,45 +499,28 @@ class Signal extends Group {
} else if (!model.isRouteActive && isShowThePrdType(model.prdType, '03') && this.style.Signal.lowButton.display) {
this.setLowButtonRecover();
}
/** 设置灯的颜色 */
if (model.greenOpen) {
if (this.lamps[0]) {
this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
}
if (this.lamps[1]) {
this.lamps[1].setColor(this.style.Signal.lamp.greenColor);
}
} else if (model.redOpen) {
if (this.lamps[0]) {
this.lamps[0].setColor(this.style.Signal.lamp.redColor);
}
if (this.lamps[1]) {
this.lamps[1].setColor(this.style.Signal.lamp.redColor);
}
} else if (model.yellowOpen) {
if (this.lamps[0]) {
this.lamps[0].setColor(this.style.Signal.lamp.yellowColor);
}
if (this.lamps[1]) {
this.lamps[1].setColor(this.style.Signal.lamp.yellowColor);
}
}
/** 信号机进路按钮显示 */
model.isRouteSignal && this.setLowButtonShow();
/** 信号机封锁 */
model.blockade && this.block();
// model.linkageAutoRouteShow = 1;
/** 设置点灯类型*/
/** 设置灯的颜色 */
model.redOpen && model.yellowOpen && !model.greenOpen && this.guid(); // 引导信号显示
model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(); // 信号关闭
model.greenOpen && !model.redOpen && !model.yellowOpen && this.openPositive(); // 信号正向开放
model.yellowOpen && !model.redOpen && !model.greenOpen && this.openLateral(); // 信号侧向开放
/** 进路交人工控或自动控 */
!model.atsControl && this.setArtificialRouteClose();
// 联锁自动进路通过
model.fleetMode && this.setAutoRouteOpen();
// 设置点灯类型 必须在最后设置不能放前面
if (model.lightType) {
this.logicalLight(); // 设置逻辑点灯
} else {
this.physicsLight(); // 设置物理点灯
}
model.guid && this.guid(); // 引导信号显示
/** 进路交人工控或自动控 */
!model.atsControl && this.setArtificialRouteClose();
// 联锁自动进路通过
model.fleetMode && this.setAutoRouteOpen();
}
getBoundingRect() {

118
src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmSignalUnlock.vue
View File

@ -1,118 +0,0 @@
<template>
<el-dialog class="beijing-01__systerm route-unlock-confirm" :title="title" :visible.sync="show" width="500px"
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
<div style="height: 60px; padding-left: 20px">
<span>在{{stationName}}【{{signalName}}】信号机，信号解锁，确认下达吗？</span>
</div>
<el-row justify="center" class="button-group">
<el-col :span="6" :offset="6">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="10" :offset="2">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
export default {
name: 'RouteUnlockConfirm',
data() {
return {
dialogShow: false,
loading: false,
signalName: '',
stationName: ''
}
},
computed: {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
title() {
return '信号解封'
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
})
},
methods: {
doShow(operate, selected) {
this.stationName = ''
this.signalName = '';
if (selected) {
this.signalName = selected.name;
let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
if (station) {
this.stationName = station.name;
}
}
this.loading = false;
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
},
commit() {
let operate = {
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.unlock.confirm.operation
}
this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.loading = false;
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (valid) {
this.$emit('setOperate', { step: 1, success: true });
this.doClose();
}
}).catch((error) => {
this.loading = false;
this.$emit('setOperate', { step: 0, success: false });
this.doClose();
})
},
cancel() {
let operate = {
type: MapDeviceType.Signal.type,
operation: OperationEvent.Command.cancel.menu.operation,
}
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (valid) {
this.$emit('setOperate', { step: 0, success: false });
this.doClose();
}
}).catch(error => {
this.doClose();
});
}
}
}
</script>
<style>
.route-unlock-confirm .context {
padding-bottom: 40px !important;
border: 1px solid lightgray;
}
</style>

12
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -153,12 +153,12 @@ export default {
this.deviceHighLight(this.selected, true);
this.oldDevice = this.selected;
break;
case 'Station':
this.handleStationMenu();
this.deviceHighLight(this.oldDevice, false);
this.deviceHighLight(this.selected, true);
this.oldDevice = this.selected;
break;
// case 'Station':
// this.handleStationMenu();
// this.deviceHighLight(this.oldDevice, false);
// this.deviceHighLight(this.selected, true);
// this.oldDevice = this.selected;
// break;
}
}
}

14
src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
View File

@ -12,7 +12,7 @@
:close-on-click-modal="false"
>
<el-row class="header" style="line-height: 44px;">
{{message}}
{{ message }}
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
@ -58,10 +58,10 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ?OperationEvent.Signal.humanTrainRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Signal.cancelGuide.menu.domId : '';
},
title() {
if (this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation) {
if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {
return '人解进路';
} else if (this.operate == OperationEvent.Signal.guide.menu.operation) {
return '办理引导进路';
@ -91,18 +91,18 @@ export default {
this.mouseCancelState(this.selected);
},
commit() {
if (this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation) {
this.humanTrainRoute();
if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {
this.cancelGuide();
} else if (this.operate == OperationEvent.Signal.guide.menu.operation) {
this.guide();
}
},
// 人解进路 / 取消进路引导
humanTrainRoute() {
cancelGuide() {
const operate = {
over: true,
operation: this.operate,
cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
};
this.sendCommand(operate);

8
src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
View File

@ -77,9 +77,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
},
{
label: '人工解锁进路',
label: '人工解锁进路', // 信号机引导取消
handler: this.humanTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
},
{
label: '信号封锁',
@ -492,12 +492,12 @@ export default {
}
});
},
// 人工解锁进路
// 人工解锁进路（信号机取消引导）
humanTrainRoute() {
const step = {
start: true,
code: `${this.selected.code}`,
operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
operation: OperationEvent.Signal.cancelGuide.menu.operation,
param: {
signalCode: `${this.selected.code}`
}

14
src/layout/components/Entry.vue
View File

@ -16,6 +16,9 @@
<el-dropdown-item>
<span style="display:block;" @click="goToCaseShow">西安铁路职业技术学院</span>
</el-dropdown-item>
<el-dropdown-item>
<span style="display:block;" @click="goToCase">贵州装备制造职业学院</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span v-else style="color: white;">{{ $t(item.name) }}</span>
@ -54,9 +57,10 @@ export default {
},
{
name: 'global.caseShow',
handle: this.goToCaseShow,
// handle: this.goToCaseShow,
isHelp:true,
style:'padding-right:0px;'
style:'padding-right:0px;',
hidden:getSessionStorage('project').endsWith('hyd')
},
{
name: 'global.scan',
@ -102,7 +106,7 @@ export default {
return getSessionStorage('project');
},
isShown() {
return getSessionStorage('project') == 'login' || getSessionStorage('project') == 'design';
return getSessionStorage('project') == 'login' || getSessionStorage('project') == 'design' || getSessionStorage('project').endsWith('gzb') || getSessionStorage('project').endsWith('xty');
}
},
watch: {
@ -134,6 +138,10 @@ export default {
const href = 'https://joylink.club/helps/西安铁路职业技术学院.pdf';
window.open(href, '_blank');
},
goToCase() {
const href = 'https://joylink.club/helps/贵州装备制造职业学院机电技术专业实训室建设.pdf';
window.open(href, '_blank');
},
goToTraining() {
const routeData = this.$router.resolve({
path: this.getPath()

3
src/router/index.js
View File

@ -966,7 +966,8 @@ export const asyncRouter = [
path: '/iscs',
component: Layout,
meta: {
i18n: 'router.iscsSystem'
i18n: 'router.iscsSystem',
roles: [admin]
},
children: [
{

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

@ -76,8 +76,10 @@ export default {
CMD_SIGNAL_CLOSE_SIGNAL: {value:'Signal_Close_Signal', label: '信号关灯'},
/** 信号重开 */
CMD_SIGNAL_REOPEN_SIGNAL: {value:'Signal_Reopen_Signal', label: '信号重开'},
/** 引导进路 */
CMD_SIGNAL_ROUTE_GUIDE: {value:'Signal_Route_Guide', label: '引导进路'},
/** 办理引导 */
CMD_SIGNAL_ROUTE_GUIDE: {value:'Signal_Set_Guide', label: '办理引导'},
/** 取消引导 */
CMD_SIGNAL_CANCEL_GUIDE: {value:'Signal_Cancel_Guide', label: '取消引导'},
/** 进路自排开 */
CMD_SIGNAL_OPEN_AUTO_SETTING: {value:'Signal_Open_Auto_Setting', label: '进路自排开'},
/** 进路自排关 */

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

@ -892,7 +892,22 @@ export const OperationEvent = {
operation: '317',
domId: '_Tips-Signal-SingalPassModel-Menu'
}
}
},
// 取消信号机引导
cancelGuide: {
button: {
operation: '3180',
domId: '_Tips-Signal-cancelGuide-Mbm{TOP}'
},
menu: {
operation: '318',
domId: '_Tips-Signal-cancelGuide-Menu'
},
confirm: {
operation: '3181',
domId: '_Tips-Signal-cancelGuide-Confirm'
}
},
},
// 物理区段操作

4
src/utils/baseUrl.js
View File

@ -3,10 +3,10 @@ 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.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

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

@ -5,7 +5,7 @@
<span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
</el-row>
</div>
<div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07'}">
<div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07'&& $route.query.prdType=='01'}">
<el-button-group>
<el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
<el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>