@@ -41,6 +44,24 @@ export default {
offsetBottom: {
type: Number,
required: true
+ },
+ showSelectStation: {
+ type: Boolean,
+ default() {
+ return false;
+ }
+ },
+ stationList: {
+ type: Array,
+ default() {
+ return [];
+ }
+ },
+ showStation: {
+ type: String,
+ default() {
+ return '';
+ }
}
},
data() {
@@ -152,6 +173,9 @@ export default {
refresh() {
this.isDisable = false;
this.$store.dispatch('training/end', null);
+ },
+ switchStationMode(val) {
+ this.$emit('switchStationMode', val);
}
}
};
diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue
index a0d1977f9..df4991610 100644
--- a/src/views/newMap/displayNew/menuLesson.vue
+++ b/src/views/newMap/displayNew/menuLesson.vue
@@ -9,6 +9,9 @@
{{ formatUsedTime }}
{{ $t('display.lesson.score') }}{{ formatScore }}
+
+
+
@@ -55,6 +58,24 @@ export default {
offsetBottom: {
type: Number,
required: true
+ },
+ showSelectStation: {
+ type: Boolean,
+ default() {
+ return false;
+ }
+ },
+ stationList: {
+ type: Array,
+ default() {
+ return [];
+ }
+ },
+ showStation: {
+ type: String,
+ default() {
+ return '';
+ }
}
},
data() {
@@ -201,6 +222,9 @@ export default {
} else {
buttons.setAttribute('style', '');
}
+ },
+ switchStationMode(val) {
+ this.$emit('switchStationMode', val);
}
}
};
From dd26f5fd96ad0c28665042ac98b2014e5955d9cc Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 2 Apr 2020 15:00:28 +0800
Subject: [PATCH 03/27] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=81=E6=B3=A2?=
=?UTF-8?q?=E4=B8=80=E5=8F=B7=E7=BA=BF=E5=AE=9E=E8=AE=AD=E6=AD=A5=E9=AA=A4?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../childDialog/confirmControlSpeed.vue | 272 +++++++++---------
.../ningbo_01/menus/dialog/routeDetail.vue | 4 +-
.../ningbo_01/menus/dialog/sectionUnLock.vue | 30 +-
.../menus/dialog/speedLimitControl.vue | 6 +-
.../menus/dialog/standBulkBuckleTrain.vue | 7 +-
.../ningbo_01/menus/dialog/switchUnLock.vue | 28 +-
src/scripts/OperationConfig.js | 251 ++++++++--------
src/scripts/cmdPlugin/OperationHandler.js | 4 +
src/scripts/cmdPlugin/ValidateHandler.js | 2 +-
.../mapsystemNew/plugin/trainingtip.vue | 2 +-
10 files changed, 336 insertions(+), 270 deletions(-)
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue
index a73f00076..d1962a1d9 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -1,148 +1,156 @@
-
-
- {{message}}
-
-
-
- 确定
-
-
- 取 消
-
-
-
+
+
+ {{ message }}
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ No newline at end of file
+
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
index fa74d117a..237066fbb 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
@@ -41,8 +41,6 @@
-
{{ scope.row.atsControl == '0' ? '人工' : '自动' }}
@@ -134,7 +132,7 @@ export default {
commit() {
const operate = {
over: true,
- operation: OperationEvent.Signal.detail.menu.operation,
+ operation: OperationEvent.Signal.detail.menu.operation
};
this.loading = true;
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue
index bc4a172ed..fc8144152 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue
@@ -93,16 +93,36 @@ export default {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdChoose() {
- return this.dialogShow ? OperationEvent.Section.unlock.choose.domId : '';
+ if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+ return OperationEvent.Section.unlock.choose.domId;
+ } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+ return OperationEvent.Section.fault.choose.domId;
+ }
+ return '';
},
confirmId1() {
- return this.dialogShow ? OperationEvent.Section.unlock.confirm1.domId : '';
+ if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+ return OperationEvent.Section.unlock.confirm1.domId;
+ } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+ return OperationEvent.Section.fault.confirm1.domId;
+ }
+ return '';
},
confirmId2() {
- return this.dialogShow ? OperationEvent.Section.unlock.confirm2.domId : '';
+ if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+ return OperationEvent.Section.unlock.confirm2.domId;
+ } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+ return OperationEvent.Section.fault.confirm2.domId;
+ }
+ return '';
},
domIdConfirm() {
- return this.dialogShow ? OperationEvent.Section.unlock.confirm.domId : '';
+ if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+ return OperationEvent.Section.unlock.confirm.domId;
+ } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+ return OperationEvent.Section.fault.confirm.domId;
+ }
+ return '';
},
title() {
if (this.operation == OperationEvent.Section.unlock.menu.operation) {
@@ -218,6 +238,7 @@ export default {
confirm2() {
if (this.messageText2 == this.sectionCode) {
const operate = {
+ over: true,
operation: '',
cmdType: ''
};
@@ -246,7 +267,6 @@ export default {
},
commit() {
const operate = {
- over: true,
operation: ''
};
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue
index 40fb9821d..b3d52ff6f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue
@@ -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) {
@@ -529,7 +530,6 @@ export default {
},
close() {
const operate = {
- type: this.type,
operation: OperationEvent.Command.close.menu.operation
};
this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' });
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
index bd11783bd..803660914 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
@@ -76,7 +76,12 @@ export default {
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
},
chooseId() {
- return this.dialogShow ? OperationEvent.StationStand.setBulkBuckleTrain.choose.domId : '';
+ if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) {
+ return OperationEvent.StationStand.setBulkBuckleTrain.choose.domId;
+ } else if (this.operation == OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation) {
+ return OperationEvent.StationStand.cancelBulkBuckleTrain.choose.domId;
+ }
+ return '';
},
title() {
if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue
index 4694819d4..1058ad313 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue
@@ -93,16 +93,36 @@ export default {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdChoose() {
- return this.dialogShow ? OperationEvent.Switch.unlock.choose.domId : '';
+ if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+ return OperationEvent.Switch.unlock.choose.domId;
+ } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+ return OperationEvent.Switch.unblock.choose.domId;
+ }
+ return '';
},
confirmId1() {
- return this.dialogShow ? OperationEvent.Switch.unlock.confirm1.domId : '';
+ if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+ return OperationEvent.Switch.unlock.confirm1.domId;
+ } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+ return OperationEvent.Switch.unblock.confirm1.domId;
+ }
+ return '';
},
confirmId2() {
- return this.dialogShow ? OperationEvent.Switch.unlock.confirm2.domId : '';
+ if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+ return OperationEvent.Switch.unlock.confirm2.domId;
+ } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+ return OperationEvent.Switch.unblock.confirm2.domId;
+ }
+ return '';
},
domIdConfirm() {
- return this.dialogShow ? OperationEvent.Switch.unlock.confirm.domId : '';
+ if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+ return OperationEvent.Switch.unlock.confirm.domId;
+ } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+ return OperationEvent.Switch.unblock.confirm.domId;
+ }
+ return '';
},
title() {
if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js
index 32edd18d5..8576c3568 100644
--- a/src/scripts/OperationConfig.js
+++ b/src/scripts/OperationConfig.js
@@ -5,18 +5,29 @@
// {id: "4", trainingType: "02", name: "进路编号"}
// {id: "5", trainingType: "02", name: "信号机名称"}
// {id: "6", trainingType: "02", name: "信号机编号"}
+
// {id: "7", trainingType: "03", name: "道岔名称"}
// {id: "17", trainingType: "03", name: "道岔编码"}
+// {id: "15", trainingType: "03", name: "道岔位置"}
+// {id: "16", trainingType: "03", name: "道岔位置(反)"}
+// {id: "21", trainingType: "03", name: "车站名称"}
+// {id: "23", trainingType: "03", name: "车站编号"}
+// {id: "24", trainingType: "03", name: "道岔计轴区段编号"}
+// {id: "25", trainingType: "03", name: "道岔计轴区段名称"}
+
// {id: "8", trainingType: "04", name: "物理区段名称"}
// {id: "9", trainingType: "04", name: "逻辑区段名称"}
// {id: "18", trainingType: "04", name: "逻辑区段编码"}
+// {id: "19", trainingType: "04", name: "区段编号"}
+// {id: "20", trainingType: "04", name: "车站名称"}
+// {id: "22", trainingType: "04", name: "车站编号"}
+
// {id: "10", trainingType: "05", name: "车站名称"}
// {id: "11", trainingType: "05", name: "站台行驶方向编号"}
// {id: "12", trainingType: "05", name: "站台行驶方向"}
// {id: "13", trainingType: "05", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "05", name: "站台行驶方向(反)"}
-// {id: "15", trainingType: "03", name: "道岔位置"}
-// {id: "16", trainingType: "03", name: "道岔位置(反)"}
+
export const OperationList = {
'01': {
list: []
@@ -3684,13 +3695,13 @@ export const OperationList = {
trainingName: '区段故障解锁({8}{9})',
trainingRemark: '区段故障解锁',
trainingType: '04',
- productTypes: ['02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' },
{ deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '' },
{ deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' },
- { deviceType: '03', orderNum: 5, operateCode: '402', tip: '鼠标左键点击【关闭】按钮' }
+ { deviceType: '03', orderNum: 5, operateCode: '4023', tip: '鼠标左键点击【关闭】按钮' }
]
},
{
@@ -3731,7 +3742,7 @@ export const OperationList = {
trainingType: '04',
productTypes: ['02'],
stepVOList: [
- { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' },
+ { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
{ deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值5】', val: '5' },
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
@@ -3750,7 +3761,7 @@ export const OperationList = {
trainingType: '04',
productTypes: ['02'],
stepVOList: [
- { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' },
+ { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
{ deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值自动】', val: '0' },
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
@@ -3773,54 +3784,54 @@ export const OperationList = {
{ deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' }
]
},
- // {
- // maxDuration: 15,
- // minDuration: 8,
- // operateType: '0406',
- // skinCode: '06',
- // trainingName: '区段解封({8}{9})',
- // trainingRemark: '区段解封功能',
- // trainingType: '04',
- // productTypes: ['01'],
- // stepVOList: [
- // { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
- // { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '' },
- // { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 5, operateCode: '404', tip: '鼠标左键点击【关闭】按钮' }
- // ]
- // },
- // {
- // maxDuration: 15,
- // minDuration: 8,
- // operateType: '0409',
- // skinCode: '02',
- // trainingName: '确认计轴有效({8}{9})',
- // trainingRemark: '确认计轴有效功能',
- // trainingType: '04',
- // productTypes: ['02'],
- // stepVOList: [
- // { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
- // { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
- // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
- // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
- // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
- // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
- // ]
- // }
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: '0406',
+ skinCode: '06',
+ trainingName: '区段解封({8}{9})',
+ trainingRemark: '区段解封功能',
+ trainingType: '04',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
+ { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' },
+ { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 5, operateCode: '4042', tip: '鼠标左键点击【关闭】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: '0409',
+ skinCode: '06',
+ trainingName: '确认计轴有效({8}{9})',
+ trainingRemark: '确认计轴有效功能',
+ trainingType: '04',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
+ { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
+ { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{20}', val: '{22}' },
+ { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '{19}' },
+ { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
+ { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
+ ]
+ },
{
maxDuration: 15,
minDuration: 8,
- operateType: '0313',
+ operateType: '0312',
skinCode: '06',
trainingName: '定操({7})',
trainingRemark: '定操({7})',
trainingType: '03',
productTypes: ['01', '02'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【定操】' },
- { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮' }
+ { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' },
+ { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【{7}】按钮' }
]
},
{
@@ -3865,24 +3876,24 @@ export const OperationList = {
{ deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
]
},
- // {
- // maxDuration: 15,
- // minDuration: 8,
- // operateType: '0314',
- // skinCode: '02',
- // trainingName: '确认计轴有效({8}{9})',
- // trainingRemark: '确认计轴有效功能',
- // trainingType: '04',
- // productTypes: ['02'],
- // stepVOList: [
- // { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
- // { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
- // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
- // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
- // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
- // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
- // ]
- // }
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: '0314',
+ skinCode: '06',
+ trainingName: '确认计轴有效({8}{9})',
+ trainingRemark: '确认计轴有效功能',
+ trainingType: '03',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
+ { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
+ { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{21}', val: '{23}' },
+ { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({25})', val: '{24}' },
+ { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
+ { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
+ ]
+ },
{
maxDuration: 15,
minDuration: 8,
@@ -3897,23 +3908,23 @@ export const OperationList = {
{ deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
]
},
- // {
- // maxDuration: 15,
- // minDuration: 8,
- // operateType: '0302',
- // skinCode: '06',
- // trainingName: '道岔单解({7})',
- // trainingRemark: '道岔单解功能',
- // trainingType: '03',
- // productTypes: ['01'],
- // stepVOList: [
- // { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' },
- // { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({8}{9})区段', val: '' },
- // { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【关闭】按钮' }
- // ]
- // },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: '0302',
+ skinCode: '06',
+ trainingName: '道岔单解({7})',
+ trainingRemark: '道岔单解功能',
+ trainingType: '03',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' },
+ { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({7})区段', val: '{17}' },
+ { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 5, operateCode: '1042', tip: '鼠标左键点击【关闭】按钮' }
+ ]
+ },
{
maxDuration: 15,
minDuration: 8,
@@ -3928,34 +3939,34 @@ export const OperationList = {
{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
]
},
- // {
- // maxDuration: 15,
- // minDuration: 8,
- // operateType: '0304',
- // skinCode: '06',
- // trainingName: '道岔解封({7})',
- // trainingRemark: '道岔解封功能',
- // trainingType: '03',
- // productTypes: ['01'],
- // stepVOList: [
- // { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' },
- // { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({8}{9})区段', val: '' },
- // { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 5, operateCode: '106', tip: '鼠标左键点击【关闭】按钮' }
- // ]
- // },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: '0304',
+ skinCode: '06',
+ trainingName: '道岔解封({7})',
+ trainingRemark: '道岔解封功能',
+ trainingType: '03',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' },
+ { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({7})区段', val: '{17}' },
+ { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 5, operateCode: '1062', tip: '鼠标左键点击【关闭】按钮' }
+ ]
+ },
{
maxDuration: 15,
minDuration: 8,
operateType: '0310',
skinCode: '06',
- trainingName: '道岔区段设置限速({7})',
- trainingRemark: '道岔区段设置限速功能（限速值：10）',
+ trainingName: '设置临时限速({7})',
+ trainingRemark: '设置临时限速功能（限速值：10）',
trainingType: '03',
productTypes: ['01', '02'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
+ { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
{ deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '10' },
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
@@ -3969,12 +3980,12 @@ export const OperationList = {
minDuration: 8,
operateType: '0310',
skinCode: '06',
- trainingName: '道岔区段设置限速({7})',
- trainingRemark: '道岔区段设置限速功能（限速值：不限）',
+ trainingName: '设置临时限速({7})',
+ trainingRemark: '设置临时限速功能（限速值：不限）',
trainingType: '03',
productTypes: ['01', '02'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
+ { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
{ deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限】', val: '0' },
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
@@ -4149,29 +4160,29 @@ export const OperationList = {
trainingName: '信号封锁({5})',
trainingRemark: '信号封闭',
trainingType: '02',
- productTypes: ['02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' },
{ deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
]
},
- // {
- // maxDuration: 15,
- // minDuration: 8,
- // operateType: '0204',
- // skinCode: '06',
- // trainingName: '信号解封({5})',
- // trainingRemark: '信号解封功能',
- // trainingType: '02',
- // productTypes: ['01'],
- // stepVOList: [
- // { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
- // { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({8}{9})区段', val: '' },
- // { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' },
- // { deviceType: '03', orderNum: 5, operateCode: '307', tip: '鼠标左键点击【关闭】按钮' }
- // ]
- // },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: '0204',
+ skinCode: '06',
+ trainingName: '信号解封({5})',
+ trainingRemark: '信号解封功能',
+ trainingType: '02',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
+ { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({5})区段', val: '{6}' },
+ { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 5, operateCode: '3072', tip: '鼠标左键点击【关闭】按钮' }
+ ]
+ },
{
maxDuration: 15,
minDuration: 8,
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 914dc1650..35fd8bfec 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1540,6 +1540,10 @@ export const OperationEvent = {
menu: {
operation: '516',
domId: '_Tips-Stand-cancelBulkBuckleTrain-Menu'
+ },
+ choose: {
+ operation: '5161',
+ domId: '_Tips-Stand-cancelBulkBuckleTrain-Choose'
}
},
// 区间列车数量限制
diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js
index 744c36766..299a518db 100644
--- a/src/scripts/cmdPlugin/ValidateHandler.js
+++ b/src/scripts/cmdPlugin/ValidateHandler.js
@@ -52,7 +52,7 @@ class ValidateHandler {
const order = Handler.getOrder();
let valid = false;
- debugger;
+ // debugger;
if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
if (operate && steps[0] &&
operate.code == steps[0].code &&
diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
index 8262336b7..9ad892bbe 100644
--- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
@@ -133,7 +133,7 @@ export default {
const domId = OperationHandler.getDomIdByOperation(step.operation);
const btnDom = document.getElementById(domId);
if (btnDom) {
- const offset = getDomOffset(btnDom, true);
+ const offset = getDomOffset(btnDom);
if (offset.x == 0 && offset.y == 0) {
return null;
}
From 5874d8f665a0b03199a8a103fe8726fa7413bb00 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 2 Apr 2020 16:16:45 +0800
Subject: [PATCH 04/27] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?=
=?UTF-8?q?=E7=BA=BF=E6=93=8D=E4=BD=9C=E6=AD=A5=E9=AA=A4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../menus/dialog/standJumpStopControl.vue | 3 +-
.../beijing_01/menus/dialog/standStopTime.vue | 4 +-
src/scripts/OperationConfig.js | 39 ++++++++++++-------
src/scripts/cmdPlugin/ValidateHandler.js | 1 +
4 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
index c10462fd9..1a03fedbe 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
@@ -318,7 +318,8 @@ export default {
? OperationEvent.StationStand.setJumpStop.select.operation : OperationEvent.StationStand.cancelJumpStop.select.operation;
this.model.val1 = '';
const operate = {
- operation: operation
+ operation: operation,
+ val:val
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
index c18a9c3f7..44ae28254 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
@@ -39,7 +39,7 @@
:min="0"
size="mini"
style="width: 130px; padding-left:30px;display: block; float: left; margin-top: 15px;"
- @change="inputTime"
+ @change="changeInputTime"
/>
秒