diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standBulkBuckleTrain.vue
deleted file mode 100644
index 48be045ef..000000000
--- a/src/jmapNew/theme/foshan_01/menus/dialog/standBulkBuckleTrain.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-
-
-
-
- 上行线路设置{{ title }}
-
-
-
- {{ scope.row.name }}
-
-
- 正向{{ title }}
-
-
- 下行线路设置{{ title }}
-
-
-
- {{ scope.row.name }}
-
-
- 正向{{ title }}
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue
index c190c9c29..a2414dc5e 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue
@@ -177,10 +177,6 @@ export default {
return '取消扣车';
} else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
return '提前发车';
- } else if (this.operation == OperationEvent.StationStand.setDetainTrainAuto.menu.operation) {
- return '区间自动扣车';
- } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
- return '区间自动扣车';
}
return '';
}
@@ -236,20 +232,6 @@ export default {
} else {
this.radio2 = '1';
}
- } else if (this.operation == OperationEvent.StationStand.setDetainTrainAuto.menu.operation) {
- this.AutomaticBuckle = true;
- this.autoRadio1 = '1';
- this.autoRadio = '1';
- if (!this.selected.right) {
- this.autoRadio = '2';
- }
- } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
- this.AutomaticBuckle = true;
- this.autoRadio1 = '2';
- this.autoRadio = '1';
- if (!this.selected.right) {
- this.autoRadio = '2';
- }
}
},
doClose() {
@@ -288,62 +270,8 @@ export default {
} else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
/** 提前发车*/
this.earlyDeparture();
- } else if (this.operation == OperationEvent.StationStand.setDetainTrainAuto.menu.operation) {
- /** 区间自动扣车*/
- this.setDetainTrainAuto();
- } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
- /** 取消区间自动扣车*/
- this.cancelDetainTrainAuto();
}
},
- setDetainTrainAuto() { // 区间自动扣车
- const operate = {
- over: true,
- operation: OperationEvent.StationStand.setDetainTrainAuto.menu.operation,
- cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO,
- param: {
- leftDirection: this.autoRadio == '2', // 1 上行 2 下行
- rightDirection: this.autoRadio == '1'
- }
- };
-
- this.loading = true;
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- this.loading = false;
- this.doClose();
- if (!valid) {
- this.$refs.noticeInfo.doShow(operate);
- }
- }).catch((error) => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(operate, [error.message]);
- });
- },
- cancelDetainTrainAuto() { // 取消区间自动扣车
- const operate = {
- over: true,
- operation: OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation,
- cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO,
- param: {
- leftDirection: this.autoRadio == '2', // 1 上行 2 下行
- rightDirection: this.autoRadio == '1'
- }
- };
-
- this.loading = true;
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- this.loading = false;
- this.doClose();
- if (!valid) {
- this.$refs.noticeInfo.doShow(operate);
- }
- }).catch((error) => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(operate, [error.message]);
- });
- },
// 设置扣车
setDetainTrain() {
const operate = {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
index 23a018b2d..cc548ffd6 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
@@ -72,7 +72,7 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
},
{
- label: '信号机引导办理',
+ label: '进路引导',
handler: this.guide,
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
},
@@ -92,12 +92,12 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
},
{
- label: 'Fleet进路办理',
+ label: '设置自动进路',
handler: this.singalPassModel,
cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
},
{
- label: 'Fleet进路取消',
+ label: '取消自动进路',
handler: this.singalCancelPassModel,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
},
@@ -143,16 +143,6 @@ export default {
handler: this.atsAutoControl,
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
},
- {
- label: '设置通过模式',
- handler: this.singalPassModel,
- cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
- },
- {
- label: '取消通过模式',
- handler: this.singalCancelPassModel,
- cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
- },
{
label: '查询进路控制状态',
handler: this.detail,
diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
index a104fb3b6..301782c75 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
@@ -7,7 +7,6 @@
-
@@ -20,7 +19,6 @@ import StandBackStrategy from './dialog/standBackStrategy';
import StandDetail from './dialog/standDetail';
import StandRunLevel from './dialog/standRunLevel';
import StandStopTime from './dialog/standStopTime';
-import StandBulkBuckleTrain from './dialog/standBulkBuckleTrain';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
// import Handler from '@/scripts/cmdPlugin/Handler';
@@ -36,7 +34,6 @@ export default {
PopMenu,
StandControl,
StandJumpStopControl,
- StandBulkBuckleTrain,
StandDetail,
StandRunLevel,
NoticeInfo,
@@ -57,7 +54,7 @@ export default {
menuNormal: {
Local: [
{
- label: '扣车',
+ label: '设置扣车',
handler: this.setDetainTrain,
cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
},
@@ -67,19 +64,20 @@ export default {
cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
},
{
- label: '提前发车',
+ label: '设置提前发车',
handler: this.earlyDeparture,
cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
},
{
- label: '站台详细信息',
+ label: '查询站台状态',
handler: this.detail,
cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
}
+ // 全线取消扣车
],
Center: [
{
- label: '扣车',
+ label: '设置扣车',
handler: this.setDetainTrain,
cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
},
@@ -89,17 +87,7 @@ export default {
cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
},
{
- label: '批量扣车',
- handler: this.setBulkBuckleTrain,
- cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL
- },
- {
- label: '批量取消扣车',
- handler: this.cancelBulkBuckleTrain,
- cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL
- },
- {
- label: '提前发车',
+ label: '设置提前发车',
handler: this.earlyDeparture,
cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
},
@@ -124,20 +112,12 @@ export default {
cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
},
{
- label: '区间列车数量限制',
- handler: this.setDetainTrainAll,
- cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO
- },
- {
- label: '取消区间列车数量限制',
- handler: this.cancelDetainTrainAll,
- cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO
- },
- {
- label: '查看站台信息',
+ label: '查询站台状态',
handler: this.detail,
cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
}
+ // 全线取消跳停
+ // 全线取消扣车
]
},
menuForce: [
@@ -277,69 +257,6 @@ export default {
}
});
},
- // 区间列车数量限制
- setDetainTrainAll() {
- const step = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.setDetainTrainAuto.menu.operation,
- param: {
- standCode: `${this.selected.code}`
- }
- };
-
- this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standControl.doShow(step, this.selected);
- }
- });
- },
- // 取消区间列车数量限制
- cancelDetainTrainAll() {
- const step = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation,
- param: {
- standCode: `${this.selected.code}`
- }
- };
- this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standControl.doShow(step, this.selected);
- }
- });
- },
- // 批量扣车
- setBulkBuckleTrain() {
- const step = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.setBulkBuckleTrain.menu.operation
- };
- this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standBulkBuckleTrain.doShow(step, this.selected);
- }
- });
- },
- // 批量取消扣车
- cancelBulkBuckleTrain() {
- const step = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation
- };
- this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standBulkBuckleTrain.doShow(step, this.selected);
- }
- });
- },
// 设置跳停
setJumpStop() {
const step = {