diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index 219be537f..877011e54 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -115,7 +115,7 @@ export default { const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); this.initDate(date); } - },// 1668 + },// 138 mounted() { this.$nextTick(() => { this.$store.dispatch('config/updateMenuBar'); diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue index 0cd4eae8d..eea45e0fa 100644 --- a/src/views/newMap/displayCity/lineBoard.vue +++ b/src/views/newMap/displayCity/lineBoard.vue @@ -2,12 +2,14 @@ -
-
+
+
- +
列车未接近
- + {{ item.sectionName }}
-
-
-
-
进路序列模式:/<可修改/>
- 修改申请 - 只读申请 - 查找列车 - +
+
+
+
{{ '进路序列模式:<可修改>' }}
+ 修改申请 + 只读申请 + 查找列车 +
上下行
- +
接车口
- +
发车口
- + @@ -97,9 +100,9 @@
-
-
- +
+
+
调机-J101
- 进路预览 - + 进路预览 + - 办理进路 - 发送机车 + 办理进路 + 发送机车
@@ -135,7 +138,7 @@ - +
@@ -153,14 +156,25 @@ andDown: 'all', unknow: '', unknow1: '', - tableData: [], + tableData: [{},{}], unknowList1: [{label: '全部机车', value: 'all'}], unknowList: [{label: 'J101-执行中', value: 'J101'}], andDownList: [{ label: '全部', value: 'all' }, { label: '上行', value: 'up' }, { label: '下行', value: 'down' }], sectionStatusList: [ {label: '办理发车进路', value: ''} ], - infoList : [{ id: 1 }] + infoList : [ + { id: 1 }, + { id: 2 }, + { id: 3 }, + { id: 4 }, + { id: 5 }, + { id: 6 }, + { id: 7 }, + { id: 8 }, + { id: 9 }, + { id: 10 } + ] } }, computed: { @@ -180,5 +194,11 @@ diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue index c6a2e40ec..8626f4597 100644 --- a/src/views/system/configLine/config.vue +++ b/src/views/system/configLine/config.vue @@ -115,7 +115,8 @@ export default { 'routeDefaultCheckConflict', 'tripNumberIsUnique', 'standTbStrategyIsInvalid', - 'updateTripPlanByServiceNumber' + 'updateTripPlanByServiceNumber', + 'hasCTC' ], selectList: ['runMode', 'singleApproachLockCancelRoute'], generalConfig: [ @@ -164,7 +165,8 @@ export default { 'routeDefaultCheckConflict', 'tripNumberIsUnique', 'standTbStrategyIsInvalid', - 'updateTripPlanByServiceNumber' + 'updateTripPlanByServiceNumber', + 'hasCTC' ], rangeList: ['noParkingSM', 'parkingSM'], speedList: ['rmAtpSpeed', 'urmAtpSpeed'], @@ -219,7 +221,8 @@ export default { routeDefaultCheckConflict: '进路默认开启冲突检测', tripNumberIsUnique: '运行图中车次号是否唯一', standTbStrategyIsInvalid: '站台折返策略不生效', - updateTripPlanByServiceNumber: '根据服务号更新车次计划' + updateTripPlanByServiceNumber: '根据服务号更新车次计划', + hasCTC: '有CTC系统(大铁)' } }; },