From d7e068c79d5eae03f47b0708eff739e671dd3dea Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Fri, 19 Mar 2021 11:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=85=A5=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/demon/scheduling.vue            | 2 +-
 src/views/newMap/displayNew/demon/schedulingView.vue        | 2 +-
 .../newMapdraft/dataRelation/automaticoperate/route.vue     | 2 +-
 .../dataRelation/destinationOperate/dwellTime.vue           | 2 +-
 .../newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue | 2 +-
 .../newMapdraft/dataRelation/routingoperate/route.vue       | 2 +-
 .../newMap/newMapdraft/dataRelation/signaloperate/route.vue | 2 +-
 .../newMap/newMapdraft/dataRelation/turnedoperate/route.vue | 2 +-
 src/views/planMonitor/components/menus/addTask.vue          | 2 +-
 .../planMonitor/components/menus/editPlanningTrain.vue      | 2 +-
 .../components/menus/modifyingStationIntervalTime.vue       | 2 +-
 .../components/menus/modifyingStationStopTime.vue           | 2 +-
 src/views/planMonitor/components/menus/modifyingTask.vue    | 6 +++---
 .../planMonitor/components/routingoperate/routeConfig.vue   | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/newMap/displayNew/demon/scheduling.vue b/src/views/newMap/displayNew/demon/scheduling.vue
index 146e626fd..1c7c81d2d 100644
--- a/src/views/newMap/displayNew/demon/scheduling.vue
+++ b/src/views/newMap/displayNew/demon/scheduling.vue
@@ -62,7 +62,7 @@
 
 <script>
 import { querySechedulingNew, generateSchedulingNew, saveSchedulingNew } from '@/api/scheduling';
-import { hexColor } from '@/jmapNew/theme/parser';
+import { hexColor } from '@/jmapNew/theme/parser/util';
 import EditTable from '@/views/components/editTable/index';
 
 // 排班计划弹窗列表
diff --git a/src/views/newMap/displayNew/demon/schedulingView.vue b/src/views/newMap/displayNew/demon/schedulingView.vue
index 0ceed0327..3bf481d27 100644
--- a/src/views/newMap/displayNew/demon/schedulingView.vue
+++ b/src/views/newMap/displayNew/demon/schedulingView.vue
@@ -23,7 +23,7 @@
 
 <script>
 import { queryCurrentSecheduling } from '@/api/scheduling';
-import { hexColor } from '@/jmapNew/theme/parser';
+import { hexColor } from '@/jmapNew/theme/parser/util';
 import EditTable from '@/views/components/editTable/index';
 
 // 排班计划弹窗列表
diff --git a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
index ca6dc5d14..f59275d9f 100644
--- a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
@@ -67,7 +67,7 @@ import { mapGetters } from 'vuex';
 import { setUID } from '@/jmapNew/utils/Uid';
 import { postAutoSignalNew, putAutoSignalNew } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 
 export default {
     name: 'RouteOperation',
diff --git a/src/views/newMap/newMapdraft/dataRelation/destinationOperate/dwellTime.vue b/src/views/newMap/newMapdraft/dataRelation/destinationOperate/dwellTime.vue
index e7d117cc5..100a06059 100644
--- a/src/views/newMap/newMapdraft/dataRelation/destinationOperate/dwellTime.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/destinationOperate/dwellTime.vue
@@ -123,7 +123,7 @@
 import { mapGetters } from 'vuex';
 import { createStationDestination, updateStationDestination } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 
 export default {
     name: 'RouteOperation',
diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
index 5069240c6..871d46c27 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
@@ -87,7 +87,7 @@ import { mapGetters } from 'vuex';
 import { setUID } from '@/jmapNew/utils/Uid';
 import { createStationParkTime, updateStationParkTime } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 
 export default {
     name: 'RouteOperation',
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index 5b31458be..f1214be4a 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -172,7 +172,7 @@
 import { mapGetters } from 'vuex';
 import { setUID } from '@/jmapNew/utils/Uid';
 import { addRoutingData, updateRoutingData, gernateRoutingSection } from '@/api/jmap/mapdraft';
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 import Sortable from 'sortablejs';
 
 export default {
diff --git a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
index 8a72e6942..43d02cc56 100644
--- a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
@@ -66,7 +66,7 @@ import { mapGetters } from 'vuex';
 import { setUID } from '@/jmapNew/utils/Uid';
 import { postApproachSection, putApproachSection, getApproachSectionList } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 import { deepAssign } from '@/utils/index';
 
 export default {
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
index 0bfebcaab..2a08a1fdb 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
@@ -100,7 +100,7 @@ import { mapGetters } from 'vuex';
 import { setUID } from '@/jmapNew/utils/Uid';
 import { postAutoReentry, putAutoReentry, getRouteNewList } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 import RouteDetail from '../routeoperate/detail';
 import { deepAssign } from '@/utils/index';
 
diff --git a/src/views/planMonitor/components/menus/addTask.vue b/src/views/planMonitor/components/menus/addTask.vue
index e794ea10e..c944d13b0 100644
--- a/src/views/planMonitor/components/menus/addTask.vue
+++ b/src/views/planMonitor/components/menus/addTask.vue
@@ -182,7 +182,7 @@
 <script>
 import { listUserRoutingData, addPlanTrip, getMapStationRunUser, getStationStopTime } from '@/api/runplan';
 import { getRunplanConfig } from '@/api/jmap/mapdraft';
-import { formatTime, formatName } from '@/jmapNew/theme/parser';
+import { formatTime, formatName } from '@/jmapNew/theme/parser/util';
 
 export default {
     name: 'AddTask',
diff --git a/src/views/planMonitor/components/menus/editPlanningTrain.vue b/src/views/planMonitor/components/menus/editPlanningTrain.vue
index 802d64e2e..5798d31c3 100644
--- a/src/views/planMonitor/components/menus/editPlanningTrain.vue
+++ b/src/views/planMonitor/components/menus/editPlanningTrain.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { formatName, formatTime } from '@/jmapNew/theme/parser';
+import { formatName, formatTime } from '@/jmapNew/theme/parser/util';
 import { addPlanService, updatePlanService, getRoutingBySDTNumber } from '@/api/runplan';
 
 export default {
diff --git a/src/views/planMonitor/components/menus/modifyingStationIntervalTime.vue b/src/views/planMonitor/components/menus/modifyingStationIntervalTime.vue
index 0a94831c8..d821ec940 100644
--- a/src/views/planMonitor/components/menus/modifyingStationIntervalTime.vue
+++ b/src/views/planMonitor/components/menus/modifyingStationIntervalTime.vue
@@ -112,7 +112,7 @@
   </el-dialog>
 </template>
 <script>
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 import { setStationRunning, getMapStationRunUser, updateRunlevelDistance } from '@/api/runplan';
 
 export default {
diff --git a/src/views/planMonitor/components/menus/modifyingStationStopTime.vue b/src/views/planMonitor/components/menus/modifyingStationStopTime.vue
index 6bdda1ecf..a0d96fba3 100644
--- a/src/views/planMonitor/components/menus/modifyingStationStopTime.vue
+++ b/src/views/planMonitor/components/menus/modifyingStationStopTime.vue
@@ -42,7 +42,7 @@
   </el-dialog>
 </template>
 <script>
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 import { setStationStopTime, getStationStopTime } from '@/api/runplan';
 
 export default {
diff --git a/src/views/planMonitor/components/menus/modifyingTask.vue b/src/views/planMonitor/components/menus/modifyingTask.vue
index c884d5d3a..4b3e972e4 100644
--- a/src/views/planMonitor/components/menus/modifyingTask.vue
+++ b/src/views/planMonitor/components/menus/modifyingTask.vue
@@ -166,7 +166,7 @@
 <script>
 import { getRoutingBySDTNumber, updatePlanTrip, getMapStationRunUser, getStationStopTime } from '@/api/runplan';
 import { getRunplanConfig } from '@/api/jmap/mapdraft';
-import { formatTime, formatName } from '@/jmapNew/theme/parser';
+import { formatTime, formatName } from '@/jmapNew/theme/parser/util';
 
 export default {
     name: 'ModifyingTask',
@@ -388,8 +388,8 @@ export default {
                     if (editData) {
                         const trainInfo = editData.trainMap[this.tripNumber];
                         const lastIndex = trainInfo.stationTimeList.length - 1;
-                        debugger;
-                        this.routingList.push({
+
+						this.routingList.push({
                             code:resp.data.code,
                             startStationCode:resp.data.startStationCode,
                             endStationCode:resp.data.endStationCode,
diff --git a/src/views/planMonitor/components/routingoperate/routeConfig.vue b/src/views/planMonitor/components/routingoperate/routeConfig.vue
index 7d255d8b7..22b37c112 100644
--- a/src/views/planMonitor/components/routingoperate/routeConfig.vue
+++ b/src/views/planMonitor/components/routingoperate/routeConfig.vue
@@ -171,7 +171,7 @@ import RouteOperate from './routeOperate';
 import { setUID } from '@/jmapNew/utils/Uid';
 import { addRoutingData, updateRoutingData, gernateRoutingSectionInRunplan } from '@/api/jmap/mapdraft';
 import { mapGetters } from 'vuex';
-import { formatName } from '@/jmapNew/theme/parser';
+import { formatName } from '@/jmapNew/theme/parser/util';
 import Sortable from 'sortablejs';
 export default {
     name:'RouteConfig',