diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
index db4b65eb6..7258c84bd 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
@@ -2,9 +2,9 @@
@@ -15,7 +15,7 @@ import PopMenu from '@/components/PopMenu';
import RouteControl from '@/jmapNew/theme/components/menus/dialog/routeControl';
import RouteSelection from './dialog/routeSelection';
import RouteHandControl from './dialog/routeHandControl';
-import RouteDetail from './dialog/routeDetail';
+import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
@@ -49,6 +49,7 @@ export default {
return {
menu: [],
clickNum:0,
+ systemName:'beijing-01__systerm',
oldSelected:null,
menuNormal: {
Local: [
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
similarity index 94%
rename from src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue
rename to src/jmapNew/theme/components/menus/dialog/routeDetail.vue
index e3556db61..30125ffd9 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
@@ -2,7 +2,7 @@
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { mouseCancelState } from '../utils/menuItemStatus';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
+// import { mouseCancelState } from '../utils/menuItemStatus';
+import NoticeInfo from '../childDialog/noticeInfo';
export default {
name: 'RouteDetail',
components: {
NoticeInfo
},
+ props:{
+ systemName:{
+ type:String,
+ required:true
+ }
+ },
data() {
return {
dialogShow: false,
@@ -128,7 +134,7 @@ export default {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
- mouseCancelState(this.selected);
+ // mouseCancelState(this.selected);
},
commit() {
const operate = {
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routeDetail.vue
deleted file mode 100644
index 059e1366e..000000000
--- a/src/jmapNew/theme/foshan_01/menus/dialog/routeDetail.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 进路列表
-
-
-
- {{ scope.row.name }}
-
-
-
-
-
- {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
index 82c76d2c2..5e0385080 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
@@ -4,9 +4,9 @@
-
+
-
+
@@ -20,7 +20,7 @@ import RouteLock from './dialog/routeLock';
import RouteUnLock from './dialog/routeUnLock';
import RouteHandControl from './dialog/routeHandControl';
import RouterCommand from './dialog/routerCommand';
-import RouteDetail from './dialog/routeDetail';
+import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
@@ -54,6 +54,7 @@ export default {
data() {
return {
menu: [],
+ systemName:'foshan-01__systerm',
menuNormal: {
Local: [
{
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
deleted file mode 100644
index 80f0b5cbc..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 进路列表
-
-
-
- {{ scope.row.name }}
-
-
-
-
- {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index 08bbc4319..4126ee37f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -3,11 +3,11 @@
-
+
-
+
- \
+
@@ -18,7 +18,7 @@ import RouteSelection from './dialog/routeSelection';
import RouteUnLock from './dialog/routeUnLock';
import RouteHandControl from './dialog/routeHandControl';
import RouterCommand from './dialog/routerCommand';
-import RouteDetail from './dialog/routeDetail';
+import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import {menuOperate, commitOperate} from './utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
@@ -49,6 +49,7 @@ export default {
data() {
return {
menu: [],
+ systemName:'ningbo-01__systerm',
menuNormal: {
Local: [
{