From 546957e9262008d081a85b67a78eaa4f42e28765 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Fri, 30 Aug 2019 15:46:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E7=89=88=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/scheduling.js | 22 + .../theme/beijing_01/menusPlan/addTask.vue | 288 ++++----- .../beijing_01/menusPlan/createWeekPlan.vue | 1 - .../theme/beijing_01/menusPlan/deleteTask.vue | 109 ++-- .../beijing_01/menusPlan/deleteTodayPlan.vue | 87 +-- .../beijing_01/menusPlan/managePlanList.vue | 39 +- .../theme/chengdu_03/menusPlan/addTask.vue | 288 ++++----- .../menusPlan/chooseTemplatePlan.vue | 4 +- .../chengdu_03/menusPlan/createWeekPlan.vue | 1 - .../theme/chengdu_03/menusPlan/deleteTask.vue | 109 ++-- .../chengdu_03/menusPlan/deleteTodayPlan.vue | 87 +-- .../chengdu_03/menusPlan/managePlanList.vue | 39 +- .../chengdu_03/menusPlan/modifyingPlan.vue | 286 +++++---- .../chengdu_03/menusPlan/modifyingTask.vue | 567 +++++++++--------- .../theme/chengdu_04/menusPlan/addTask.vue | 288 ++++----- .../menusPlan/chooseTemplatePlan.vue | 6 +- .../chengdu_04/menusPlan/createWeekPlan.vue | 1 - .../theme/chengdu_04/menusPlan/deleteTask.vue | 109 ++-- .../chengdu_04/menusPlan/deleteTodayPlan.vue | 87 +-- .../chengdu_04/menusPlan/managePlanList.vue | 243 ++++---- .../chengdu_04/menusPlan/modifyingPlan.vue | 286 +++++---- .../chengdu_04/menusPlan/modifyingTask.vue | 567 +++++++++--------- .../theme/fuzhou_01/menusPlan/addTask.vue | 288 ++++----- .../menusPlan/chooseTemplatePlan.vue | 4 +- .../fuzhou_01/menusPlan/createWeekPlan.vue | 1 - .../theme/fuzhou_01/menusPlan/deleteTask.vue | 109 ++-- .../fuzhou_01/menusPlan/deleteTodayPlan.vue | 87 +-- .../fuzhou_01/menusPlan/managePlanList.vue | 39 +- .../fuzhou_01/menusPlan/modifyingPlan.vue | 286 +++++---- .../fuzhou_01/menusPlan/modifyingTask.vue | 567 +++++++++--------- src/views/display/demon/scheduling.vue | 252 +++++--- src/views/display/demon/setTime.vue | 211 +++---- src/views/display/index.vue | 9 +- src/views/display/menuDemon.vue | 7 + src/views/display/menuSchema.vue | 19 +- src/views/publish/runPlanCommon/index.vue | 7 - 36 files changed, 2861 insertions(+), 2539 deletions(-) diff --git a/src/api/scheduling.js b/src/api/scheduling.js index 79d4312e1..6f546bcbd 100644 --- a/src/api/scheduling.js +++ b/src/api/scheduling.js @@ -15,3 +15,25 @@ export function generateScheduling(group, params) { params }); } + +export function getSchedulingAllTrains(group) { + return request({ + url: `/api/scheduling/${group}/train/all`, + method: 'get' + }); +} + +export function checkScheduling(group) { + return request({ + url: `/api/scheduling/${group}/check`, + method: 'post' + }); +} + +export function saveScheduling(group, data) { + return request({ + url: `/api/scheduling/${group}/save`, + method: 'post', + data + }); +} diff --git a/src/jmap/theme/beijing_01/menusPlan/addTask.vue b/src/jmap/theme/beijing_01/menusPlan/addTask.vue index 10a8fd228..009c19f02 100644 --- a/src/jmap/theme/beijing_01/menusPlan/addTask.vue +++ b/src/jmap/theme/beijing_01/menusPlan/addTask.vue @@ -1,150 +1,162 @@ \ No newline at end of file + diff --git a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue index b96af17c9..2eabc8044 100644 --- a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue +++ b/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue @@ -111,7 +111,6 @@ export default { if (valid) { createRunPlanLoad(this.buildModel()).then(response => { this.$message.success('创建运行图计划成功'); - this.$emit('reloadTable', { name: 'managePlanList' }); this.doClose(); }).catch(() => { this.doClose(); diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue index b661ed20e..cd79c305f 100644 --- a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue +++ b/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue @@ -1,57 +1,66 @@ \ No newline at end of file + diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue index 284028f97..2e22a7c64 100644 --- a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue +++ b/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue @@ -1,46 +1,55 @@ \ No newline at end of file + diff --git a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue b/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue index fbf13a94c..288ad3381 100644 --- a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue +++ b/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue @@ -15,7 +15,8 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue index 747a38d6b..591ed34cc 100644 --- a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue +++ b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue @@ -1,10 +1,10 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue index 5f197a1ff..4679c003e 100644 --- a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue +++ b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue @@ -1,298 +1,309 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue index 10a8fd228..009c19f02 100644 --- a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue +++ b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue @@ -1,150 +1,162 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue index 5f95a8e18..591ed34cc 100644 --- a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue +++ b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue @@ -1,13 +1,13 @@ \ No newline at end of file + diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue index 2b153891a..691db5458 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue @@ -1,298 +1,309 @@ \ No newline at end of file + diff --git a/src/views/display/demon/scheduling.vue b/src/views/display/demon/scheduling.vue index 17793bf69..52281ebaf 100644 --- a/src/views/display/demon/scheduling.vue +++ b/src/views/display/demon/scheduling.vue @@ -16,7 +16,8 @@ - + {{ formModel.mode }} + + + + 检查 + 保存 + + +
-
{{ title }}
- - - - - - - - +
@@ -66,11 +63,14 @@ \ No newline at end of file + this.$emit('ConfirmSelectBeginTime', model); + this.doClose(); + } + }); + } + } +}; + diff --git a/src/views/display/index.vue b/src/views/display/index.vue index 8fb2a2173..c6a066d24 100644 --- a/src/views/display/index.vue +++ b/src/views/display/index.vue @@ -18,6 +18,8 @@ @tryTime="tryTime" @hidepanel="hidepanel" @quitQuest="quitQuest" + @showIbp="showIbp" + @showScheduling="showScheduling" /> @@ -38,7 +40,6 @@ @faultChooseShow="faultChooseShow" @runQuestLoadShow="runQuestLoadShow" @switchMode="switchMode" - @schedulingShow="schedulingShow" /> @@ -565,6 +566,9 @@ export default { this.ibpShow = true; this.$refs.ibpPlate.show(); }, + showScheduling() { + this.$refs.scheduling.doShow(); + }, showpanel() { this.panelShow = true; this.simulationShow = false; @@ -585,9 +589,6 @@ export default { }, faultChooseShow() { this.$refs.faultChoose.doShow(); - }, - schedulingShow() { - this.$refs.scheduling.doShow(); } } }; diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue index 2d414d4e1..c29cf3c54 100644 --- a/src/views/display/menuDemon.vue +++ b/src/views/display/menuDemon.vue @@ -8,6 +8,7 @@
IBP盘 + 排班计划 {{ jl3dname }}