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

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

Browse Source
This commit is contained in:
lVAL 2021-01-29 16:21:35 +08:00
commit 8c25f274f5
16 changed files with 256 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/config/skinCode/ningbo_01.js
View File

@ -84,14 +84,14 @@ class SkinCode extends defaultStyle {
invadeColor: '#FFFFFF', // 区段侵入颜色
spareColor: '#5578B6', // 区段空闲颜色
communicationOccupiedColor: 'red', // 区段通信车占用颜色 // 调整 未确定
unCommunicationOccupiedColor: '#EF72A7', // 区段非通讯车占用颜色
unCommunicationOccupiedColor: '#EF72A7', // 区段非通讯车占用颜色
routeLockColor: '#00ff00', // 区段进路锁定颜色
faultLockColor: 'white', // 区段故障锁定颜色
undefinedColor: '#0071C1', // 区段未定义颜色
blockColor: '#d659d6', // 区段封锁颜色(淡紫色)
atcExcisionColor: '#A0522D', // 区段atc切除颜色
atsExcisionColor: '#A0522D', // 区段ats切除颜色
invalidColor: '#AC8F40', // 计轴故障颜色
invalidColor: '#AC8F40', // 计轴故障颜色
timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
protectiveLockColor: '#03C85C', // 区段保护锁闭 延续保护
protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁

2
src/jmapNew/map.js
View File

@ -543,10 +543,12 @@ class Jlmap {
status.atsControl = status.atsControl && elem.atsControl;
status.fleetMode = status.fleetMode || elem.fleetMode;
status.ciControl = status.ciControl || elem.ciControl;
status.lock = status.lock || elem.lock;
} else {
status.atsControl = elem.atsControl;
status.fleetMode = elem.fleetMode;
status.ciControl = elem.ciControl;
status.lock = elem.lock;
}
status.canSetCi = status.arc || elem.arc;
});

31
src/jmapNew/theme/chengdu_03/operationConfig.js
View File

@ -155,21 +155,6 @@ export default {
{ deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
]
},
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: CMD.Signal.CMD_STATION_SET_MASTER_GUIDE_LOCK.value,
// skinCode: '04',
// trainingName: '引导总锁({3})',
// trainingRemark: '进路办理引导总锁',
// trainingType: 'Signal',
// productTypes: ['01'],
// stepVOList: [
// { deviceType: '04', orderNum: 1, operateCode: '1190', tip: '鼠标左键点击【引导总锁】' },
// { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
// { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'GUIDELOCK' }
// ]
// },
{
maxDuration: 15,
minDuration: 8,
@ -892,6 +877,22 @@ export default {
// 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
config:{autoCycleBT:true}
}
/** 暂时不生成实训 */
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK.value,
// skinCode: '04',
// trainingName: '引导总锁({3})',
// trainingRemark: '进路办理引导总锁',
// trainingType: 'Station',
// productTypes: ['01'],
// stepVOList: [
// { deviceType: '04', orderNum: 1, operateCode: '1190', tip: '鼠标左键点击【引导总锁】' },
// { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
// { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'GUIDELOCK' }
// ]
// }
]
};

9
src/jmapNew/theme/xian_02/menus/menuSection.vue
View File

@ -83,11 +83,13 @@ export default {
Center: [
{
label: '区段封锁',
handler: this.lock
handler: this.lock,
cmdType: CMD.Section.CMD_SECTION_BLOCK
},
{
label: '区段解封',
handler: this.unlock
handler: this.unlock,
cmdType: CMD.Section.CMD_SECTION_UNBLOCK
},
{
label: '设备标签',
@ -112,7 +114,8 @@ export default {
},
{
label: '设置临时限速',
handler: this.setSpeed
handler: this.setSpeed,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
},
{
label: '帮助',

5
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -17,6 +17,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default {
name: 'SignalMenu',
@ -240,8 +241,8 @@ export default {
};
},
initMenu() {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Center;
this.menu = MenuContextHandler.covert2(this.menuNormal);
// this.menu = this.menuNormal.Center;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;

4
src/jmapNew/theme/xian_02/menus/menuSwitch.vue
View File

@ -24,6 +24,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default {
name: 'SwitchMenu',
@ -192,8 +193,7 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Center;
this.menu = MenuContextHandler.covert2(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {

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

@ -1,49 +1,49 @@
export const OperationEvent = {
// 直接指令
Command: {
// 对话框
common: {
choose: {
operation: 'com01',
domId: '_Tips-Cmd-Common-Choose'
},
select: {
operation: 'com02',
domId: '_Tips-Cmd-Common-Select'
},
confirm: {
operation: 'com03',
domId: '_Tips-Cmd-Common-Confirm'
},
apply: {
operation: 'com04',
domId: '_Tips-Cmd-Common-Apply'
},
close: {
operation: 'com05',
domId: '_Tips-Cmd-Common-Close'
},
choose1: {
operation: 'com06',
domId: '_Tips-Cmd-Common-Choose1'
},
select: {
operation: 'com07',
domId: '_Tips-Cmd-Common-Select'
},
confirm1: {
operation: 'com08',
domId: '_Tips-Cmd-Common-Confirm1'
},
apply1: {
operation: 'com09',
domId: '_Tips-Cmd-Common-Apply1'
},
close1: {
operation: 'com10',
domId: '_Tips-Cmd-Common-Close1'
},
},
// 对话框
common: {
choose: {
operation: 'com01',
domId: '_Tips-Cmd-Common-Choose'
},
select: {
operation: 'com02',
domId: '_Tips-Cmd-Common-Select'
},
confirm: {
operation: 'com03',
domId: '_Tips-Cmd-Common-Confirm'
},
apply: {
operation: 'com04',
domId: '_Tips-Cmd-Common-Apply'
},
close: {
operation: 'com05',
domId: '_Tips-Cmd-Common-Close'
},
choose1: {
operation: 'com06',
domId: '_Tips-Cmd-Common-Choose1'
},
select: {
operation: 'com07',
domId: '_Tips-Cmd-Common-Select'
},
confirm1: {
operation: 'com08',
domId: '_Tips-Cmd-Common-Confirm1'
},
apply1: {
operation: 'com09',
domId: '_Tips-Cmd-Common-Apply1'
},
close1: {
operation: 'com10',
domId: '_Tips-Cmd-Common-Close1'
}
},
// 取消操作
cancel: {
@ -625,26 +625,26 @@ export const OperationEvent = {
menu: {
operation: '107',
domId: '_Tips-Switch-Turnout-Menu'
},
menuButton: {
},
menuButton: {
operation: '1071',
domId: '_Tips-Switch-Turnout-MenuButton{BOTTOM}'
}
}
},
// 强制扳动
turnoutForce: {
menu: {
menu: {
operation: '108',
domId: '_Tips-Switch-TurnoutForce-Menu'
},
button: {
},
button: {
operation: '1080',
domId: '_Tips-Switch-TurnoutForce-Mbm{TOP}'
},
menuButton: {
menuButton: {
operation: '1081',
domId: '_Tips-Switch-TurnoutForce-MenuButton{BOTTOM}'
}
}
},
// 道岔故障解锁
fault: {
@ -671,11 +671,11 @@ export const OperationEvent = {
stop: {
operation: '1095',
domId: '_Tips-Switch-Fault-Stop'
},
menuButton: {
},
menuButton: {
operation: '1096',
domId: '_Tips-Switch-Fault-MenuButton{BOTTOM}'
}
}
},
// 计轴预复位
axlePreReset: {
@ -854,18 +854,18 @@ export const OperationEvent = {
operation: '1190',
domId: '_Tips-Switch-GuideLock-Button{TOP}'
}
},
// 挤岔恢复
squeezeRecovery: {
},
// 挤岔恢复
squeezeRecovery: {
button: {
operation: '11a0',
domId: '_Tips-Switch-Squeeze-Recovery-Button{TOP}'
},
menuButton: {
},
menuButton: {
operation: '11a1',
domId: '_Tips-Switch-Squeeze-Recovery-MenuButton{TOP}'
}
}
}
}
},
// 控制模式操作
@ -949,11 +949,11 @@ export const OperationEvent = {
passwordConfirm: {
operation: '2035',
domId: '_Tips-Control-Forced-PasswordConfirm'
},
menuButton: {
operation: '2036',
},
menuButton: {
operation: '2036',
domId: '_Tips-Control-Forced-Menu{BOTTOM}'
}
}
},
// 请求中控
requestCentralControl: {
@ -1637,11 +1637,11 @@ export const OperationEvent = {
stop: {
operation: '4095',
domId: '_Tips-Section-AxlePreReset-Stop'
},
menuButton: {
},
menuButton: {
operation: '4096',
domId: '_Tips-Section-AxlePreReset-Menu{BOTTOM}'
}
}
},
// 设备状态
detail: {
@ -2105,14 +2105,14 @@ export const OperationEvent = {
operation: '519',
domId: '_Tips-Stand-openPsdByHand-Menu'
}
},
// 取消设置
},
// 取消设置
cancelTrain:{
menuButton: {
operation: '520',
domId: '_Tips-Stand-CancelTrain-MenuButton{BOTTOM}'
}
}
}
},
Station: {

7
src/views/newMap/displayNew/demon/payPage.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog
title="购买详情"
title="订单"
:visible.sync="dialogVisible"
width="30%"
center
@ -42,7 +42,7 @@
element-loading-background="rgba(255, 255, 255, 0.9)"
/>
</div>
<div v-if="paySuccess" style="position: relative; top: -50px;color: #0B840B;z-index: 8888;font-size: 18px;text-align: center;width: 150px;">
<div v-if="paySuccess" style="position: relative; top: -50px;color: #0B840B;z-index: 8888;font-size: 18px;text-align: center;width: 150px;font-weight: bold;">
<div>订单支付成功!</div>
<div>{{ `将在${countdown}后自动关闭` }}</div>
</div>
@ -73,8 +73,9 @@ export default {
},
watch: {
'$store.state.socket.payOrder':function (val) {
if (this.payOrder === val) {
if (this.orderCode == val) {
this.paySuccess = true;
this.loading = true;
this.url = '';
this.timer = setInterval(() => {
this.countdown--;

10
src/views/newMap/displayNew/demonMenu.vue
View File

@ -26,7 +26,6 @@
<el-button v-if="messageBoard" size="small" @click="messageBoardShow">留言板</el-button>
<!-- v-if="isContest" -->
<el-button v-if="!isLocal" size="small" @click="contectUs">联系方式</el-button>
<!--<el-button size="small" @click="goToPay">购买</el-button>-->
</el-button-group>
</div>
<Jl3d-Device
@ -40,7 +39,6 @@
<scheduling v-if="scheduleLoadShow" ref="scheduling" :group="group" />
<scheduling-view v-if="schedulePreviewShow" ref="schedulingView" :group="group" />
<contect-us ref="contectUs" />
<pay-page ref="payPage" />
</div>
</template>
<script>
@ -50,7 +48,6 @@ import { getToken } from '@/utils/auth';
import { getSessionStorage } from '@/utils/auth';
import Scheduling from '@/views/newMap/displayNew/demon/scheduling';
import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView';
import PayPage from '@/views/newMap/displayNew/demon/payPage';
import { EventBus } from '@/scripts/event-bus';
import ContectUs from '@/views/newMap/displayNew/dispatherContest/contectUs';
import { getPostByProjectCode } from '@/api/learn';
@ -62,8 +59,7 @@ export default {
Jl3dDrive,
Scheduling,
SchedulingView,
ContectUs,
PayPage
ContectUs
},
props:{
isAllShow:{
@ -293,10 +289,8 @@ export default {
},
contectUs() {
this.$refs.contectUs.doShow();
},
goToPay() {
this.$refs.payPage.doShow();
}
}
};
</script>

10
src/views/newMap/displayNew/dispatherContest/index.vue
View File

@ -61,7 +61,7 @@
@switchMode="switchMode" -->
<set-time ref="setTime" @ConfirmSelectBeginTime="start" />
<scene-list ref="sceneList" @selectScript="selectScript" />
<scene-list ref="sceneList" @selectScript="selectScript" @goToPay="goToPay" />
<theory-exam-select ref="theoryExamSelect" @startTheoryExam="startTheoryExam" />
<theory-exam ref="theoryExam" />
<select-role ref="selectRole" :member-list="currentPlayList" @selectRole="selectRole" />
@ -69,6 +69,7 @@
<operational-statistic ref="operationalStatistic" @finishTraining="finishTraining" />
<test-result ref="testResult" />
<pay-page ref="payPage" />
</div>
@ -83,6 +84,7 @@ import SceneList from './sceneList';
import MenuSchema from '@/views/newMap/displayNew/menuSchema';
import TheoryExamSelect from './theoryExamSelect';
import TheoryExam from './theoryExam';
import PayPage from '@/views/newMap/displayNew/demon/payPage';
// import { getGoodsTryUse } from '@/api/management/goods';
import {clearSimulation, getSimulationInfoNew } from '@/api/simulation';
// import { PermissionType } from '@/scripts/ConstDic';
@ -111,7 +113,8 @@ export default {
TheoryExam,
OperationalStatistic,
TestResult,
SelectRole
SelectRole,
PayPage
},
props: {
offset: {
@ -492,6 +495,9 @@ export default {
getEmptyOperationalStatistics(this.group).then(res=>{
this.$refs.operationalStatistic.doShow(res.data);
});
},
goToPay() {
this.$refs.payPage.doShow();
}
}
};

16
src/views/newMap/displayNew/dispatherContest/sceneList.vue
View File

@ -3,7 +3,14 @@
<el-dialog v-dialogDrag title="场景列表" :visible.sync="dialogVisible" width="920px" center>
<el-tabs v-model="activeName" type="card" style="height:550px">
<el-tab-pane label="主场景列表" name="first">
<div v-if="!hasPermission" style="margin-bottom: 10px;color: #f00;width: 100%;text-align: center;">尊敬的用户,您好：由于您暂无场景权限，现仅提供场景1试用，如需使用其他场景请通过左上角‘菜单=》联系方式’联系我们开放权限！</div>
<div v-if="!hasPermission" style="margin-bottom: 10px;color: #f00;width: 100%;text-align: center;">
尊敬的用户，您好：由于您暂无场景权限，现仅提供场景1试用，如需使用其他场景请
<el-button type="text" style="text-decoration: underline" @click="goToPay">购买权限</el-button>
</div>
<div v-if="permisson.endTime" style="margin-bottom: 10px;color: #f00;width: 100%;text-align: center;">
{{ `您的场景权限截止时间：${permisson.endTime || '永久'}。` }}
<el-button type="text" style="text-decoration: underline" @click="goToPay">立即续费</el-button>
</div>
<el-table :data="mainSceneData" border :span-method="objectSpanMethod" height="465" stripe :cell-style="{padding: '8px 0'}">
<el-table-column type="index" width="50" label="序号" />
<el-table-column prop="type" width="200" label="类别" />
@ -37,6 +44,7 @@ export default {
dialogVisible: false,
selectMapId:'',
hasPermission: false,
permisson: {},
form: {
type: ''
},
@ -102,8 +110,10 @@ export default {
this.dialogVisible = false;
},
queryPermission() {
this.permisson = {};
queryCompetitionPracticalPermissions({mapId:this.$route.query.mapId}).then(res => {
this.hasPermission = !!res.data;
if (res.data) { this.permisson = res.data; }
}).catch(() => {
this.$message.error('获取场景权限异常！');
});
@ -203,6 +213,10 @@ export default {
this.$emit('selectScript', {playerList:playerList, mapLocation:this.mapLocation});
this.doClose();
},
goToPay() {
this.$emit('goToPay');
this.doClose();
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (rowIndex === 1 && columnIndex === 1) {
return {

49
src/views/newMap/newMapdraft/ciConfig.vue
View File

@ -70,32 +70,34 @@ export default {
falseValue: false,
id: '',
height: 800,
initData: {
upRight: false,
signalApproachOnlyOne: false,
signalApproachOnlyNpSwitch: false,
routeNameUseEndOppositeSignalName: false,
generateTbRoute: false,
tbRouteNameUseEndOppositeSignalName: false,
routeSignalAlwaysGreen: false,
routeApartByOverlap: false,
overlapOnlySwitch: false,
overlapSwitchNpOnly: false,
overlapSignalOppositeSwitchNpOnly: false,
overlapOnlyOneSwitch: false,
generateCycle: false,
routeButton: false,
likeHa1: false,
getNearlySignal: false,
overlapSettingByTrigger: false,
overlapReleaseTime: 45,
routeReleaseTime: 60
},
// initData: {
// upRight: false,
// signalApproachOnlyOne: false,
// signalApproachOnlyNpSwitch: false,
// routeNameUseEndOppositeSignalName: false,
// generateTbRoute: false,
// tbRouteNameUseEndOppositeSignalName: false,
// routeSignalAlwaysGreen: false,
// routeApartByOverlap: false,
// overlapOnlySwitch: false,
// overlapSwitchNpOnly: false,
// overlapSignalOppositeSwitchNpOnly: false,
// overlapOnlyOneSwitch: false,
// generateCycle: false,
// routeButton: false,
// likeHa1: false,
// getNearlySignal: false,
// overlapSettingByTrigger: false,
// generateFls:false,
// signalApproachNotPassPreSignal:false,
// overlapReleaseTime: 45,
// routeReleaseTime: 60
// },
roadData: [],
focus: false,
booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch',
'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen',
'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls'],
'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls', 'signalApproachNotPassPreSignal'],
selectList: [],
numberList: ['overlapReleaseTime', 'routeReleaseTime'],
optionsMap: {
@ -123,7 +125,8 @@ export default {
likeHa1: '是否类似哈尔滨一号线，联锁分为ATP信号、地面信号、引导信号',
getNearlySignal: '生成进路信号按钮，进路信号按钮是否取最近的一个信号机',
overlapSettingByTrigger: '延续保护的建立方式：是-通过触发建立，否-随进路建立',
generateFls: '是否生成侧防：是-生成侧防，不要联动道岔，否-不生成侧防，用联动道岔'
generateFls: '是否生成侧防：是-生成侧防，不要联动道岔，否-不生成侧防，用联动道岔',
signalApproachNotPassPreSignal:'信号机接近区段不跨过前方同向信号机'
}
};
},

140
src/views/planMonitor/editTool/menuBar.vue
View File

@ -154,9 +154,8 @@ export default {
title: this.$t('planMonitor.file'),
children: [
{
title: '填充通用数据',
click: this.populatingGenericData
// disabledCallback: () => { return !this.$route.query.planId },
title: '重命名',
click: this.modifyRunPlanName
}
// {
// title: '创建运行图',
@ -164,58 +163,23 @@ export default {
// }
]
},
{
title: this.$t('planMonitor.view'),
children: [
]
},
{
title: this.$t('planMonitor.tool'),
children: [
{
title: '交路设置',
click: this.handleRoutingSettings
title: '生成带出入库计划',
click: this.handleGernaratePlanningTrain
},
{
title: '参数配置',
click: this.handleRunplanParams
},
{
title: '停站时间',
click: this.handleDwellTime
},
{
title: '运行等级',
click: this.handleRoutingLevel
},
{
title: this.$t('planMonitor.validityCheck'),
click: this.handlePlanEffectiveCheck
},
{
title: this.$t('planMonitor.testRunningDiagram'),
click: this.handleTestRunPlan
title: '生成仅环路计划',
click: this.populatingGenericData
// disabledCallback: () => { return !this.$route.query.planId },
}
]
},
{
title: this.$t('planMonitor.modify'),
title: '编辑',
children: [
// {
// title: '计划参数',
// click: this.handleParameter,
// },
// {
// title: '打印参数',
// click: this.undeveloped,
// },
// {
// type: 'separator'
// },
{
title: '生成计划',
click: this.handleGernaratePlanningTrain
},
{
title: this.$t('planMonitor.addPlan'),
click: this.handleAddPlanningTrain
@ -225,7 +189,7 @@ export default {
click: this.handleDeletePlanningTrain
},
{
title: '移动计划',
title: '平移计划',
click: this.handleMovePlanningTrain
},
{
@ -247,39 +211,75 @@ export default {
title: this.$t('planMonitor.modifyTask'),
click: this.handleModifyingTask
},
{
title: '修改名称',
click: this.modifyRunPlanName
},
{
title: '清除数据',
click: this.handleClearData
}
// {
// type: 'separator'
// },
// {
// title: '修改交路',
// click: this.handleModifyingRouting,
// },
// {
// title: '修改开始时间',
// click: this.handleModifyingStartTime,
// },
// {
// title: '快速增加任务',
// click: this.undeveloped,
// }
]
},
{
title: '配置',
children: [
{
title: '交路设置',
click: this.handleRoutingSettings
},
{
title: '运行等级设置',
click: this.handleRoutingLevel
},
{
title: '停站时间设置',
click: this.handleDwellTime
},
{
title: '其他参数配置',
click: this.handleRunplanParams
}
]
},
{
title: '测试',
children: [
{
title: this.$t('planMonitor.validityCheck'),
click: this.handlePlanEffectiveCheck
},
{
title: this.$t('planMonitor.testRunningDiagram'),
click: this.handleTestRunPlan
}
]
}
// {
// title: this.$t('planMonitor.option'),
// children: [
// ]
// },
// {
// title: this.$t('planMonitor.help'),
// title: this.$t('planMonitor.modify'),
// children: [
// // {
// // title: '计划参数',
// // click: this.handleParameter,
// // },
// // {
// // title: '打印参数',
// // click: this.undeveloped,
// // },
// // {
// // type: 'separator'
// // },
// // {
// // type: 'separator'
// // },
// // {
// // title: '修改交路',
// // click: this.handleModifyingRouting,
// // },
// // {
// // title: '修改开始时间',
// // click: this.handleModifyingStartTime,
// // },
// // {
// // title: '快速增加任务',
// // click: this.undeveloped,
// // }
// ]
// }
]

63
src/views/planMonitor/newEditTool/menuBar.vue
View File

@ -181,16 +181,8 @@ export default {
{
title: this.$t('planMonitor.file'),
children: [
// {
// title: '查看站间运行等级',
// click: this.handleModifyingStationIntervalTime
// },
{
title: '填充通用数据',
click: this.populatingGenericData
},
{
title: '创建运行图',
title: '创建',
click: this.newRunPlan
},
{
@ -201,33 +193,33 @@ export default {
title: '删除',
click: this.deleteRunPlanOperate
},
{
title: '重命名',
click: this.modifyRunPlanName
},
{
title: '发布',
click: this.publishRunPlan
}
]
},
// {
// title: this.$t('planMonitor.view'),
// children: [
// ]
// },
{
title: this.$t('planMonitor.tool'),
children: [
{
title: this.$t('planMonitor.validityCheck'),
click: this.handlePlanEffectiveCheck
title: '生成带出入库计划',
click: this.handleGernaratePlanningTrain
},
{
title: '生成仅环路计划',
click: this.populatingGenericData
// disabledCallback: () => { return !this.$route.query.planId },
}
]
},
{
title: this.$t('planMonitor.modify'),
title: '编辑',
children: [
{
title: '生成计划',
click: this.handleGernaratePlanningTrain
},
{
title: this.$t('planMonitor.addPlan'),
click: this.handleAddPlanningTrain
@ -237,7 +229,7 @@ export default {
click: this.handleDeletePlanningTrain
},
{
title: '移动计划',
title: '平移计划',
click: this.handleMovePlanningTrain
},
{
@ -259,10 +251,6 @@ export default {
title: this.$t('planMonitor.modifyTask'),
click: this.handleModifyingTask
},
{
title: '修改名称',
click: this.modifyRunPlanName
},
{
title: '清除数据',
click: this.handleClearData
@ -277,16 +265,25 @@ export default {
click: this.handleRoutingSettings
},
{
title: '参数配置',
click: this.handleRunplanParams
title: '运行等级设置',
click: this.handleRoutingLevel
},
{
title: '停站时间',
title: '停站时间设置',
click: this.handleDwellTime
},
{
title: '运行等级',
click: this.handleRoutingLevel
title: '其他参数配置',
click: this.handleRunplanParams
}
]
},
{
title: '测试',
children: [
{
title: this.$t('planMonitor.validityCheck'),
click: this.handlePlanEffectiveCheck
}
]
}
@ -454,10 +451,6 @@ export default {
background: 'rgba(0, 0, 0, 0.7)'
});
},
// // 修改站间运行时间
// handleModifyingStationIntervalTime() {
// this.$emit('dispatchDialog', { name: 'modifyingStationIntervalTime', params: {} });
// },
// 填充计划运行图
populatingGenericData() {
if (this.loadRunPlanId) {

7
src/views/teach/detail/index.vue
View File

@ -178,13 +178,6 @@ export default {
return data.name.includes(value);
},
buy() {
// this.disabled = true;
// setTimeout(() => {
// this.$router.push({
// path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query:
// { permissionType: PermissionType.LESSON, lessonId: this.courseModel.id, prdType: this.$route.query.prdType, mapId: this.$route.query.mapId, subSystem: this.$route.params.subSystem }
// });
// }, 100);
this.$messageBox(this.$t('global.buyingTips'));
},
nodeExpand(obj, node, ele) {

2
src/views/trainingPlatform/demonList.vue
View File

@ -168,7 +168,7 @@ export default {
let checkId = localStore.get('trainingPlatformCheckId' + filterSelect + this.userId + this.project) || null;
checkId = checkId && checkId.includes('-') ? checkId : null;
this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
if (!this.$route.path.includes('result')) {
if (!this.$route.path.includes('result') && !this.$route.path.includes('/trainingPlatform/teach/')) {
checkId && this.findTree(this.treeList, checkId);
!checkId && this.treeList && this.treeList.length && this.clickEvent(this.treeList[0], {data: this.treeList[0]});
}