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-06-24 17:37:09 +08:00
parent 3bd16e211f
commit c570e418e1
8 changed files with 106 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
View File

@ -276,7 +276,7 @@ export default {
checkChange(check) {
const operate = {
operation: OperationEvent.StationStand.setRunLevel.check.operation,
val: `${check}`
val: `${!!check}`
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {

10
src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue
View File

@ -44,7 +44,6 @@ export default {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
title() {
if (this.dialogShow) {
if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
return '区段设置限速';
} else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
@ -54,13 +53,12 @@ export default {
} else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
return '道岔取消限速';
}
}
return '';
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
if (this.dialogShow) {
if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
/** 区段设置限速*/
return OperationEvent.Section.setSpeed.confirm.domId;
@ -74,7 +72,7 @@ export default {
/** 道岔取消限速*/
return OperationEvent.Switch.cancelSpeed.confirm.domId;
}
}
return '';
}
},
mounted() {
@ -103,7 +101,7 @@ export default {
},
commit() {
const operate = {
type: this.type
operation: ''
};
if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
@ -121,7 +119,7 @@ export default {
}
this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (valid) {

6
src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue
View File

@ -238,7 +238,7 @@ export default {
return '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
},
isCancelSpeed() {
return this.operation == OperationEvent.Section.cancelSpeed.menu.operation || this.operation == OperationEvent.Switch.cancelSpeed.menu.operation;
@ -350,7 +350,8 @@ export default {
},
speedSelectChange(val) {
const operate = {
operation: ''
operation: '',
val: `${val}`
};
if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
@ -523,7 +524,6 @@ export default {
},
close() {
const operate = {
type: this.type,
operation: OperationEvent.Command.close.menu.operation
};
this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' });

2
src/jmapNew/theme/foshan_01/menus/menuButton.vue
View File

@ -1,5 +1,5 @@
<template>
<div v-if="isShowBtn" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
<div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
<button
:id="MixinCommand.totalCancel.button.domId"
:style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"

80
src/jmapNew/theme/foshan_01/operationConfig.js
View File

@ -1,3 +1,35 @@
// 操作规则定义
// {id: "1", trainingType: "ControlConvertMenu", name: "车站名称"}
// {id: "2", trainingType: "ControlConvertMenu", name: "车站控制模式编号"}
// {id: "3", trainingType: "Signal", name: "进路名称"}
// {id: "4", trainingType: "Signal", name: "进路编号"}
// {id: "5", trainingType: "Signal", name: "信号机名称"}
// {id: "6", trainingType: "Signal", name: "信号机编号"}
// {id: "7", trainingType: "Switch", name: "道岔名称"}
// {id: "8", trainingType: "Section", name: "物理区段名称"}
// {id: "9", trainingType: "Section", name: "逻辑区段名称"}
// {id: "10", trainingType: "Stand", name: "车站名称"}
// {id: "11", trainingType: "Stand", name: "站台行驶方向编号"}
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}
// {id: "17", trainingType: "Switch", name: "道岔编码"}
// {id: "18", trainingType: "Section", name: "逻辑区段编码"}
// {id: "19", trainingType: "Section", name: "区段编号"}
// {id: "20", trainingType: "Section", name: "车站名称"}
// {id: "21", trainingType: "Switch", name: "车站名称"}
// {id: "22", trainingType: "Section", name: "车站编号"}
// {id: "23", trainingType: "Switch", name: "车站编号"}
// {id: "24", trainingType: "Switch", name: "道岔计轴区段编号"}
// {id: "25", trainingType: "Switch", name: "道岔计轴区段名称"}
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
list: [
@ -97,7 +129,7 @@ export default {
trainingType:'Stand',
productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【站台信息】' },
{ deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查询站台状态】' },
{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
]
},
@ -137,13 +169,13 @@ export default {
operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
skinCode: '08',
trainingName: '设置停站时间({10}-{12} 站台)',
trainingRemark: '停站时间控制(人工, 20秒, 一次有效)',
trainingRemark: '停站时间控制(人工, 40秒, 一次有效)',
trainingType:'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【40】', val: '20' },
{ deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
{ deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
]
@ -181,7 +213,7 @@ export default {
{ deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
]
},
{
{ // 无法生成实训
maxDuration: 15,
minDuration: 8,
operateType:CMD.Stand.CMD_STAND_EARLY_DEPART.value,
@ -244,7 +276,7 @@ export default {
]
},
{
{ // 无法生成实训
maxDuration: 15,
minDuration: 8,
operateType:CMD.Switch.CMD_SWITCH_CUT_OFF.value,
@ -258,7 +290,7 @@ export default {
{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
]
},
{
{ // 无法生成实训
maxDuration: 15,
minDuration: 8,
operateType:CMD.Switch.CMD_SWITCH_ACTIVE.value,
@ -272,7 +304,7 @@ export default {
{ deviceType: '02', orderNum: 2, operateCode: '106', tip: '鼠标左键点击【确定】按钮' }
]
},
{
{ // 无法生成实训
maxDuration: 15,
minDuration: 8,
operateType:CMD.Switch.CMD_SWITCH_CUT_OFF.value,
@ -286,7 +318,7 @@ export default {
{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
]
},
{
{ // 无法生成实训
maxDuration: 15,
minDuration: 8,
operateType:CMD.Switch.CMD_SWITCH_ACTIVE.value,
@ -375,13 +407,16 @@ export default {
minDuration: 8,
operateType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
skinCode: '08',
trainingName: '道岔解锁({7} 道岔)',
trainingName: '道岔单解({7} 道岔)',
trainingRemark: '道岔单解功能',
trainingType:'Switch',
productTypes: ['02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔解锁】' },
{ deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【确定】'}
{ deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
{ deviceType: '02', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】'},
{ deviceType: '02', orderNum: 3, operateCode: '1046', tip: '鼠标左键点击【{7}】', val: '{17}'},
{ deviceType: '02', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】'},
{ deviceType: '02', orderNum: 5, operateCode: '1042', tip: '鼠标左键点击【关闭】'}
]
},
{
@ -392,7 +427,7 @@ export default {
trainingName: '道岔单锁({7} 道岔)',
trainingRemark: '道岔单锁功能',
trainingType:'Switch',
productTypes: ['02'],
productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' },
{ deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
@ -406,11 +441,10 @@ export default {
trainingName: '道岔解锁({7} 道岔)',
trainingRemark: '道岔单解功能',
trainingType:'Switch',
productTypes: ['02'],
productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' },
{ deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' },
{ deviceType: '02', orderNum: 3, operateCode: '104', tip: '鼠标左键点击【确定】'}
{ deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
]
},
@ -443,6 +477,20 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
]
},
{ // 生成实训步骤有问题
maxDuration: 8,
minDuration: 5,
operateType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value,
skinCode: '08',
trainingName: '总取消({3} 进路)',
trainingRemark: '总取消(取消进路)',
trainingType:'Signal',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
{ deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'}
]
},
{
maxDuration: 8,
minDuration: 5,
@ -501,7 +549,7 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
]
},
{
{ // 无法生成实训
maxDuration: 8,
minDuration: 5,
operateType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,

40
src/layout/components/userInfo.vue
View File

@ -236,25 +236,7 @@
</div>
</div>
</div>
<div v-if="project.endsWith('gzb')" class="form_box">
<div class="title">{{ wxUnionId||wxOpenId? '更改绑定微信:': '绑定微信:' }}</div>
<div class="content">
<el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateQrCode">生成微信二维码</el-button>
<div v-if="binding && !bindSuccess" class="login-code-box" @click="generateQrCode">
<qrcode-vue
v-loading="loadingCode"
:value="loginUrl"
:class-name="qrcodeClassName"
:size="150"
:element-loading-text="this.$t('login.clickRefresh')"
element-loading-spinner="el-icon-refresh"
element-loading-background="rgba(255, 255, 255, 0.9)"
/>
</div>
<div v-if="bindSuccess"><span>绑定微信成功</span></div>
</div>
</div>
<div v-if="project.endsWith('design') && !wmOpenId" class="form_box">
<div v-if="!wmOpenId" class="form_box">
<div class="title">绑定微信:</div>
<div class="content">
<el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateBindQrCode">生成微信二维码</el-button>
@ -290,11 +272,9 @@ import {
getUserinfoEmailCode,
getUserinfoEmail,
getUserinfoPassword,
getWxQrCode,
getBindWxQrCodeUrl
} from '@/api/management/user';
import QrcodeVue from 'qrcode.vue';
import { LoginParams } from '@/utils/login';
import { setInterval, clearInterval } from 'timers';
import { checkLoginStatus } from '@/api/login';
import { getSessionStorage } from '@/utils/auth';
@ -360,8 +340,6 @@ export default {
nationCodeInit: '86', // 默认国际地区
loginClient: 'LianKeTang',
project:'',
wxUnionId: '',
wxOpenId: '',
wmOpenId: ''
};
},
@ -396,8 +374,6 @@ export default {
email: user.email,
passWord: ''
};
this.wxUnionId = user.wxUnionId;
this.wxOpenId = user.wxOpenId;
this.wmOpenId = user.wmOpenId || '';
this.oldPassWord = user.password;
this.nationCode = user.nationCode ? user.nationCode : '86';
@ -566,20 +542,6 @@ export default {
this.$message.info(this.$t('global.passWordSome'));
}
},
generateQrCode() {
getWxQrCode(LoginParams[this.loginClient]).then(response => {
this.loadingCode = false;
this.sessionId = response.data.sessionId;
this.loginUrl = response.data.url;
this.binding = true;
this.clearTimer(this.checkTimeout);
this.checkTimeout = setTimeout(() => {
this.loadingCode = true;
this.loginUrl = '';
}, 3 * 60 * 1000);
this.checkLoginStatus();
});
},
generateBindQrCode() { // 获取微信小程序绑定二维码
getBindWxQrCodeUrl().then(response => {
this.loadingCode = false;

6
src/views/newMap/displayNew/index.vue
View File

@ -25,6 +25,7 @@
:offset="offset"
:data-error="dataError"
:offset-bottom="offsetBottom"
:tip-bottom="tipBottom"
:group="group"
:training-obj="trainingObj"
:show-station="showStation"
@ -169,6 +170,7 @@ export default {
checkLine: null,
offset: 15,
offsetBottom: 15,
tipBottom: 0,
mouseNum: 1,
ierval: null,
mouseNumTime: 0,
@ -406,6 +408,7 @@ export default {
const menuBar = document.getElementById('menuBar');
const menuTool = document.getElementById('menuTool');
const menuBottom = document.getElementById('menuButton');
const menuButtonsBox = document.getElementById('menuButtons_box');
if (menuBar) {
offset += (menuBar.offsetHeight || 0);
}
@ -415,6 +418,9 @@ export default {
if (menuBottom) {
offsetBottom += (menuBottom.offsetHeight || 0);
}
if (menuButtonsBox) {
this.tipBottom = menuButtonsBox.offsetHeight + 15 || 0;
}
if (this.offset != offset) {
this.offset = offset;
}

6
src/views/newMap/displayNew/menuLesson.vue
View File

@ -21,7 +21,7 @@
<el-button type="primary" :disabled="backDisable" class="back" @click="back">{{ $t('display.backBtn') }}</el-button>
</el-button-group>
</div>
<tip-training-detail :training-obj="trainingObj" :offset-bottom="offsetBottom" />
<tip-training-detail :training-obj="trainingObj" :offset-bottom="offsetBottom + tipBottom" />
</div>
</template>
@ -58,6 +58,10 @@ export default {
type: Number,
required: true
},
tipBottom: {
type: Number,
default: 0
},
showSelectStation: {
type: Boolean,
default() {