diff --git a/src/api/runplan.js b/src/api/runplan.js index 78c765766..1e0d5198d 100644 --- a/src/api/runplan.js +++ b/src/api/runplan.js @@ -122,7 +122,13 @@ export function getStationRunning(mapId) { method: 'get' }); } - +/** 获取地图原始站间运行等级 */ +export function getMapStationRun(mapId) { + return request({ + url: `/api/runPlan/draft/${mapId}/stationRunLevel`, + method: 'get' + }); +} /** 设置站间运行时间*/ export function setStationRunning(mapId, data) { return request({ diff --git a/src/store/modules/runplan.js b/src/store/modules/runplan.js index 683e2a197..d32a0f323 100644 --- a/src/store/modules/runplan.js +++ b/src/store/modules/runplan.js @@ -12,8 +12,9 @@ const runPlan = { width: 800, // 运行图canvas 容器 宽度 height: 600, // 运行图canvas 容器 高度 refreshCount: 0, // 刷新页面重新加载 - initialPlanData: {} // 运行图原始数据 - + initialPlanData: {}, // 运行图原始数据 + draftSelected: {}, // 草稿运行图选中对象 + draftStations: [] // 草稿运行图车站列表 }, getters: { stations: (state) => { @@ -62,6 +63,9 @@ const runPlan = { setStations: (state, stations) => { state.stations = stations; }, + setDraftStations: (state, stations) => { + state.draftStations = stations; + }, setInitialPlanData: (state, data) => { state.initialPlanData = {}; if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) { @@ -90,9 +94,26 @@ const runPlan = { } state.planLoadedCount++; }, + setDraftPlanData: (state, data) => { + state.draftPlanData = data; + state.draftEditData = {}; + if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) { + const serviceList = data.serviceNumberDataList; + serviceList.forEach((service, i) => { + const trainList = service.tripNumberDataList; + state.draftEditData[service.serviceNumber] = { oldIndex: i, serviceNumber: service.serviceNumber, backup: service.backup, trainMap: {} }; + trainList.forEach((train, j) => { + state.draftEditData[service.serviceNumber].trainMap[`${train.directionCode}${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList }; + }); + }); + } + }, setSelected: (state, selected) => { state.selected = selected; }, + setDraftSelected: (state, draftSelected) => { + state.draftSelected = draftSelected; + }, addserviceNumber: (state, serviceNumber) => { const serviceObj = state.planData[serviceNumber]; if (serviceObj) { @@ -107,6 +128,11 @@ const runPlan = { state.editData = {}; state.selected = {}; }, + draftClear: (state) => { + state.draftPlanData = {}; + state.draftEditData = {}; + state.draftSelecte = {}; + }, refresh: (state) => { state.refreshCount++; } @@ -128,6 +154,13 @@ const runPlan = { resolve(mapModel); }); }, + /** 设置草稿stations数据 */ + setDraftStations: ({ commit }, mapModel) => { + return new Promise((resolve) =>{ + commit('setDraftStations', mapModel); + resolve(mapModel); + }); + }, /** 重置运行图数据更新池 */ resetRunPlanData:({ commit }) => { commit('resetRunPlanData'); @@ -140,6 +173,9 @@ const runPlan = { setPlanData: ({ commit }, data) => { commit('setPlanData', data); }, + setDraftPlanData: ({ commit }, data) => { + commit('setDraftPlanData', data); + }, /** 设置初始运行图数据 */ setInitialPlanData: ({ commit }, data) => { commit('setInitialPlanData', data); @@ -152,6 +188,9 @@ const runPlan = { setSelected: ({ commit }, selected) => { commit('setSelected', selected); }, + setDraftSelected: ({ commit }, draftSelected) => { + commit('setDraftSelected', draftSelected); + }, /** 更新数据*/ updateRunPlanData: ({ commit }, data) => { commit('updateRunPlanData', data); @@ -163,6 +202,12 @@ const runPlan = { resolve(); }); }, + draftClear: ({ commit }) => { + return new Promise(resolve => { + commit('draftClear'); + resolve(); + }); + }, /** 刷新页面*/ refresh: ({commit}) => { commit('refresh'); diff --git a/src/views/newMap/displayNew/demon/runPlanEdit.vue b/src/views/newMap/displayNew/demon/runPlanEdit.vue index b89d6b9cd..b6c87658d 100644 --- a/src/views/newMap/displayNew/demon/runPlanEdit.vue +++ b/src/views/newMap/displayNew/demon/runPlanEdit.vue @@ -5,7 +5,7 @@ diff --git a/src/views/planMonitor/newEditTool/menuBar.vue b/src/views/planMonitor/newEditTool/menuBar.vue new file mode 100644 index 000000000..1ea1f356f --- /dev/null +++ b/src/views/planMonitor/newEditTool/menuBar.vue @@ -0,0 +1,711 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menuTool.vue b/src/views/planMonitor/newEditTool/menuTool.vue new file mode 100644 index 000000000..9cbe4e450 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menuTool.vue @@ -0,0 +1,170 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue b/src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue new file mode 100644 index 000000000..3becb4983 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue @@ -0,0 +1,111 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/addSmoothRunTime.vue b/src/views/planMonitor/newEditTool/menus/addSmoothRunTime.vue new file mode 100644 index 000000000..defda51df --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/addSmoothRunTime.vue @@ -0,0 +1,141 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/addTask.vue b/src/views/planMonitor/newEditTool/menus/addTask.vue new file mode 100644 index 000000000..02e6f11f1 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/addTask.vue @@ -0,0 +1,342 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/components/dataTable.vue b/src/views/planMonitor/newEditTool/menus/components/dataTable.vue new file mode 100644 index 000000000..4adf68074 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/components/dataTable.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue new file mode 100644 index 000000000..3700316eb --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue @@ -0,0 +1,291 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/deleteTask.vue b/src/views/planMonitor/newEditTool/menus/deleteTask.vue new file mode 100644 index 000000000..572c0209e --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/deleteTask.vue @@ -0,0 +1,120 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/duplicateTrain.vue b/src/views/planMonitor/newEditTool/menus/duplicateTrain.vue new file mode 100644 index 000000000..0030d67a9 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/duplicateTrain.vue @@ -0,0 +1,114 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/editPlanName.vue b/src/views/planMonitor/newEditTool/menus/editPlanName.vue new file mode 100644 index 000000000..7d32a543c --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/editPlanName.vue @@ -0,0 +1,116 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue b/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue new file mode 100644 index 000000000..f6e660881 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue @@ -0,0 +1,244 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/editSmoothRunTime.vue b/src/views/planMonitor/newEditTool/menus/editSmoothRunTime.vue new file mode 100644 index 000000000..ba235e3a6 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/editSmoothRunTime.vue @@ -0,0 +1,121 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/editStationBetweenTime.vue b/src/views/planMonitor/newEditTool/menus/editStationBetweenTime.vue new file mode 100644 index 000000000..0b0d81fec --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/editStationBetweenTime.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/lookup.vue b/src/views/planMonitor/newEditTool/menus/lookup.vue new file mode 100644 index 000000000..6558b29b1 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/lookup.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/modifyingBeginTime.vue b/src/views/planMonitor/newEditTool/menus/modifyingBeginTime.vue new file mode 100644 index 000000000..863ba2db8 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/modifyingBeginTime.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/views/planMonitor/newEditTool/menus/modifyingRouting.vue b/src/views/planMonitor/newEditTool/menus/modifyingRouting.vue new file mode 100644 index 000000000..58f1380d4 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/modifyingRouting.vue @@ -0,0 +1,89 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue b/src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue new file mode 100644 index 000000000..d45489013 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue @@ -0,0 +1,164 @@ + + + diff --git a/src/views/planMonitor/newEditTool/menus/modifyingTask.vue b/src/views/planMonitor/newEditTool/menus/modifyingTask.vue new file mode 100644 index 000000000..6356e027f --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/modifyingTask.vue @@ -0,0 +1,463 @@ + + + diff --git a/src/views/planMonitor/newEditTool/menus/offLine.vue b/src/views/planMonitor/newEditTool/menus/offLine.vue new file mode 100644 index 000000000..e7f24afb7 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/offLine.vue @@ -0,0 +1,89 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/baseLoop.vue b/src/views/planMonitor/newEditTool/menus/parameter/baseLoop.vue new file mode 100644 index 000000000..8e00a11e1 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/baseLoop.vue @@ -0,0 +1,62 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/baseParameter.vue b/src/views/planMonitor/newEditTool/menus/parameter/baseParameter.vue new file mode 100644 index 000000000..d8e2aec7d --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/baseParameter.vue @@ -0,0 +1,78 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/baseParkingDepot.vue b/src/views/planMonitor/newEditTool/menus/parameter/baseParkingDepot.vue new file mode 100644 index 000000000..c513fe058 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/baseParkingDepot.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/baseRouting.vue b/src/views/planMonitor/newEditTool/menus/parameter/baseRouting.vue new file mode 100644 index 000000000..0d2ed520f --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/baseRouting.vue @@ -0,0 +1,49 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/baseStation.vue b/src/views/planMonitor/newEditTool/menus/parameter/baseStation.vue new file mode 100644 index 000000000..67974391d --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/baseStation.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/index.vue b/src/views/planMonitor/newEditTool/menus/parameter/index.vue new file mode 100644 index 000000000..8c17d1f80 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/index.vue @@ -0,0 +1,102 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/modifyingDepotProperty.vue b/src/views/planMonitor/newEditTool/menus/parameter/modifyingDepotProperty.vue new file mode 100644 index 000000000..b4a0b2723 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/modifyingDepotProperty.vue @@ -0,0 +1,82 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/modifyingStationProperty.vue b/src/views/planMonitor/newEditTool/menus/parameter/modifyingStationProperty.vue new file mode 100644 index 000000000..2f9d6974f --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/modifyingStationProperty.vue @@ -0,0 +1,127 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/modifyingStationStandProperty.vue b/src/views/planMonitor/newEditTool/menus/parameter/modifyingStationStandProperty.vue new file mode 100644 index 000000000..9b0a29a76 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/parameter/modifyingStationStandProperty.vue @@ -0,0 +1,88 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/populatingGenericData.vue b/src/views/planMonitor/newEditTool/menus/populatingGenericData.vue new file mode 100644 index 000000000..8c832b617 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/populatingGenericData.vue @@ -0,0 +1,160 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/quickLoopsIncrease.vue b/src/views/planMonitor/newEditTool/menus/quickLoopsIncrease.vue new file mode 100644 index 000000000..c6aa68460 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/quickLoopsIncrease.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/quickTaskIncrease.vue b/src/views/planMonitor/newEditTool/menus/quickTaskIncrease.vue new file mode 100644 index 000000000..900be6f22 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/quickTaskIncrease.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/routingSelection.vue b/src/views/planMonitor/newEditTool/menus/routingSelection.vue new file mode 100644 index 000000000..cc130af96 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/routingSelection.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/selectDeleteRoute.vue b/src/views/planMonitor/newEditTool/menus/selectDeleteRoute.vue new file mode 100644 index 000000000..7bcfa7a75 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/selectDeleteRoute.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/selectPrintArea.vue b/src/views/planMonitor/newEditTool/menus/selectPrintArea.vue new file mode 100644 index 000000000..054d90be6 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/selectPrintArea.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/menus/systermOut.vue b/src/views/planMonitor/newEditTool/menus/systermOut.vue new file mode 100644 index 000000000..bd6db6522 --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/systermOut.vue @@ -0,0 +1,82 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/schedule.vue b/src/views/planMonitor/newEditTool/schedule.vue new file mode 100644 index 000000000..8d902295c --- /dev/null +++ b/src/views/planMonitor/newEditTool/schedule.vue @@ -0,0 +1,643 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/statusBar.vue b/src/views/planMonitor/newEditTool/statusBar.vue new file mode 100644 index 000000000..df17cf153 --- /dev/null +++ b/src/views/planMonitor/newEditTool/statusBar.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/src/views/planMonitor/newEditTool/titleBar.vue b/src/views/planMonitor/newEditTool/titleBar.vue new file mode 100644 index 000000000..75b93f266 --- /dev/null +++ b/src/views/planMonitor/newEditTool/titleBar.vue @@ -0,0 +1,74 @@ + + + + diff --git a/src/views/planMonitor/newEditTool/userindex.vue b/src/views/planMonitor/newEditTool/userindex.vue new file mode 100644 index 000000000..42779cecb --- /dev/null +++ b/src/views/planMonitor/newEditTool/userindex.vue @@ -0,0 +1,485 @@ + + + + +