From bb3b202eb18317caa5738d8038f4b82462d39e3e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 7 Sep 2020 11:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89=E4=BA=8C?=
=?UTF-8?q?=E5=8F=B7=E7=BA=BF=E5=88=97=E8=BD=A6=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jmap/mapdraft.js | 18 ++-
src/jmapNew/shape/Switch/index.js | 2 -
.../theme/components/utils/menuOperate.js | 10 ++
.../theme/xian_02/menus/dialog/changeTID.vue | 2 +-
.../menus/dialog/trainDelDestination.vue | 24 +--
.../xian_02/menus/dialog/trainDestination.vue | 145 +++++++-----------
src/jmapNew/theme/xian_02/menus/menuTrain.vue | 22 +--
src/scripts/cmdPlugin/CommandEnum.js | 4 +-
.../destinationOperate/detail.vue | 35 ++---
9 files changed, 108 insertions(+), 154 deletions(-)
diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index 2ae968b8f..97d180405 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -646,7 +646,7 @@ export function generateCI (mapId) {
/** 创建目的码 */
export function createStationDestination(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/operationDefinition`,
+ url: `/api/mapBuild/${data.mapId}/destinationCodeDefinition`,
method: 'post',
data
});
@@ -655,7 +655,7 @@ export function createStationDestination(data) {
/** 更新目的码 */
export function updateStationDestination(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/operationDefinition`,
+ url: `/api/mapBuild/${data.mapId}/destinationCodeDefinition`,
method: 'put',
data
});
@@ -664,7 +664,7 @@ export function updateStationDestination(data) {
/** 目的码列表分页查询 */
export function getStationDestinationList(mapId, params) {
return request({
- url: `/api/mapBuild/${mapId}/operationDefinition`,
+ url: `/api/mapBuild/${mapId}/destinationCodeDefinition`,
method: 'get',
params
});
@@ -673,7 +673,7 @@ export function getStationDestinationList(mapId, params) {
/** 目的码查询 */
export function getStationDestinationDetail(mapId, code) {
return request({
- url: `/api/mapBuild/${mapId}/${code}/operationDefinition`,
+ url: `/api/mapBuild/${mapId}/${code}/destinationCodeDefinition`,
method: 'get'
});
}
@@ -681,7 +681,15 @@ export function getStationDestinationDetail(mapId, code) {
/** 目的码查询 */
export function deleteStationDestination(mapId, code) {
return request({
- url: `/api/mapBuild/${mapId}/${code}/operationDefinition`,
+ url: `/api/mapBuild/${mapId}/${code}/destinationCodeDefinition`,
method: 'delete'
});
}
+
+/** 根据group查询目的码 */
+export function getSimulationDestinationList(group) {
+ return request({
+ url: `/simulation/${group}/destinationCode/list`,
+ method: 'get'
+ });
+}
diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js
index bc5f04ae1..fe4bae813 100644
--- a/src/jmapNew/shape/Switch/index.js
+++ b/src/jmapNew/shape/Switch/index.js
@@ -499,7 +499,6 @@ export default class Switch extends Group {
setSectionState(section, style, state) {
// && !section.animators.length
if (section && section.ignore) {
- console.log(22222222222);
const sectionA = store.getters['map/getDeviceByCode'](state.sectionACode);
/** 空闲 */
// section.setStyle(style, this.style.Section.line.spareColor);
@@ -552,7 +551,6 @@ export default class Switch extends Group {
this.setInversionAction(model); /** 反位*/
} else {
this.setLossAction(); // 失去
- console.log(333333333333333);
}
model.isCiConfirm && this.setCiConfirm(); // 道岔使能显示
this.setSwitchFault(model.split);
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 54c14ee8f..d814f7c9b 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -416,6 +416,16 @@ export const menuOperate = {
routeBlockRun:{
operation: OperationEvent.Train.routeBlockRun.menu.operation,
cmdType: CMD.Driver.CMD_DRIVER_BLOCK_ROUTE
+ },
+ // 更改目的地码
+ destinationTrain: {
+ operation: OperationEvent.Train.destinationTrainId.menu.operation,
+ cmdType: CMD.Train.CMD_TRAIN_CHANGE_DESTINATION_CODE
+ },
+ // 删除目的地码
+ deletDestionation: {
+ operation: OperationEvent.Train.deleteDestinationTrainId.menu.operation,
+ cmdType: CMD.Train.CMD_TRAIN_DELETE_SERVICE_NUMBER
}
}
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/changeTID.vue b/src/jmapNew/theme/xian_02/menus/dialog/changeTID.vue
index 607d9c79b..5e32f5fe7 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/changeTID.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/changeTID.vue
@@ -116,7 +116,7 @@ export default {
doShow(step, selected ) {
this.dialogShow = true;
this.selected = selected;
- this.groupNumber = selected.code;
+ this.groupNumber = selected.groupNumber;
this.tid = selected.serviceNumber;
this.operate = step;
},
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue
index ccaaf1fc7..33ab21d39 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue
@@ -19,7 +19,7 @@
-
+
@@ -31,13 +31,14 @@
取 消
-
+