diff --git a/src/jmapNew/theme/beijing_01/menus/index.vue b/src/jmapNew/theme/beijing_01/menus/index.vue index 01a075fa4..e7e5cb502 100644 --- a/src/jmapNew/theme/beijing_01/menus/index.vue +++ b/src/jmapNew/theme/beijing_01/menus/index.vue @@ -11,7 +11,7 @@ - + @@ -29,7 +29,7 @@ import MenuStation from './menuStation'; import MenuBar from './menuBar'; import MenuLimit from './menuLimit'; import PassiveAlarm from './passiveDialog/alarm'; -import PassiveContorl from './passiveDialog/control'; +import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; export default { diff --git a/src/jmapNew/theme/beijing_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/beijing_01/menus/passiveDialog/control.vue deleted file mode 100644 index 5f80c3b06..000000000 --- a/src/jmapNew/theme/beijing_01/menus/passiveDialog/control.vue +++ /dev/null @@ -1,304 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/index.vue b/src/jmapNew/theme/chengdu_01/menus/index.vue index fbc39598b..847c436d6 100644 --- a/src/jmapNew/theme/chengdu_01/menus/index.vue +++ b/src/jmapNew/theme/chengdu_01/menus/index.vue @@ -11,7 +11,7 @@ - + @@ -28,7 +28,7 @@ import MenuTrain from './menuTrain'; import MenuStation from './menuStation'; import MenuBar from './menuBar'; import PassiveAlarm from './passiveDialog/alarm'; -import PassiveContorl from './passiveDialog/control'; +import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; import MenuStationPlatform from './menuStationPlatform'; diff --git a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/chengdu_01/menus/passiveDialog/control.vue deleted file mode 100644 index e74e234e2..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/control.vue +++ /dev/null @@ -1,305 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/chengdu_03/menus/index.vue b/src/jmapNew/theme/chengdu_03/menus/index.vue index ae870f13a..4897a60a8 100644 --- a/src/jmapNew/theme/chengdu_03/menus/index.vue +++ b/src/jmapNew/theme/chengdu_03/menus/index.vue @@ -10,7 +10,7 @@ - + @@ -27,7 +27,7 @@ import MenuTrain from './menuTrain'; import MenuStation from './menuStation'; import MenuBar from './menuBar'; import PassiveAlarm from './passiveDialog/alarm'; -import PassiveContorl from './passiveDialog/control'; +import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; export default { diff --git a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/control.vue b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/control.vue deleted file mode 100644 index 57de70a04..000000000 --- a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/control.vue +++ /dev/null @@ -1,325 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/foshan_01/menus/index.vue b/src/jmapNew/theme/foshan_01/menus/index.vue index 65b37d577..f828a456f 100644 --- a/src/jmapNew/theme/foshan_01/menus/index.vue +++ b/src/jmapNew/theme/foshan_01/menus/index.vue @@ -13,7 +13,7 @@ - + @@ -33,7 +33,7 @@ import MenuStation from './menuStation'; import MenuBar from './menuBar'; import MenuLimit from './menuLimit'; import PassiveAlarm from './passiveDialog/alarm'; -import PassiveContorl from './passiveDialog/control'; +import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; export default { diff --git a/src/jmapNew/theme/foshan_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/foshan_01/menus/passiveDialog/control.vue deleted file mode 100644 index 32f2451f1..000000000 --- a/src/jmapNew/theme/foshan_01/menus/passiveDialog/control.vue +++ /dev/null @@ -1,347 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/fuzhou_01/menus/index.vue b/src/jmapNew/theme/fuzhou_01/menus/index.vue index c10277c9d..c13d3a0ed 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/index.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/index.vue @@ -9,7 +9,7 @@ - + @@ -25,7 +25,7 @@ import MenuTrain from './menuTrain'; import MenuStation from './menuStation'; import MenuBar from './menuBar'; import PassiveAlarm from './passiveDialog/alarm'; -import PassiveContorl from './passiveDialog/control'; +import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; export default { diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/control.vue deleted file mode 100644 index a483b458c..000000000 --- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/control.vue +++ /dev/null @@ -1,328 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/haerbin_01/menus/index.vue b/src/jmapNew/theme/haerbin_01/menus/index.vue index 629a2debb..6572f98d4 100644 --- a/src/jmapNew/theme/haerbin_01/menus/index.vue +++ b/src/jmapNew/theme/haerbin_01/menus/index.vue @@ -2,15 +2,15 @@ @@ -27,7 +27,7 @@ import MenuSection from './menuSection'; import MenuStation from './menuStation'; import MenuStationStand from './menuStationStand'; import PassiveAlarm from './passiveDialog/alarm'; -import PassiveContorl from './passiveDialog/control'; +import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; export default { @@ -36,13 +36,13 @@ export default { MenuBar, MenuButton, MenuCancel, - MenuTrain, - MenuSignal, - MenuSwitch, - MenuSection, - MenuStation, - MenuStationStand, - PassiveAlarm, + MenuTrain, + MenuSignal, + MenuSwitch, + MenuSection, + MenuStation, + MenuStationStand, + PassiveAlarm, PassiveContorl, PassiveTimeout }, diff --git a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/control.vue deleted file mode 100644 index f022c072f..000000000 --- a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/control.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue index db1f223ef..203ef6cf2 100644 --- a/src/jmapNew/theme/ningbo_01/menus/index.vue +++ b/src/jmapNew/theme/ningbo_01/menus/index.vue @@ -14,7 +14,7 @@ - + @@ -35,7 +35,7 @@ import MenuBar from './menuBar'; import MenuLimit from './menuLimit'; import MenuStationTurnBack from './menuStationTurnBack'; // import PassiveAlarm from './passiveDialog/alarm'; -import PassiveContorl from './passiveDialog/control'; +import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; // import PassiveTimeout from './passiveDialog/timeout'; export default { diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue deleted file mode 100644 index 216d68b82..000000000 --- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue +++ /dev/null @@ -1,317 +0,0 @@ - - - - -