@@ -48,13 +48,15 @@ import ShutdownPic from '@/assets/ctc_icon/shutdown.png'
import { EventBus } from '@/scripts/event-bus'
import SettingsMenu from './components/menu.vue'
import BoardViewSetting from './dialog/boardViewSetting.vue'
+import RailViewSetting from './dialog/railViewSetting.vue'
export default {
- name: 'RouteCreate',
+ name: 'MenuPanel',
components: {
NoticeInfo,
SettingsMenu,
BoardViewSetting,
+ RailViewSetting,
},
data() {
return {
@@ -71,7 +73,7 @@ export default {
activeMenu: '',
settingsMenuItems: [
{ label: '占线板视图设置', id: 'boardView' },
- { label: '股道视图显示设置', id: 'trackView' },
+ { label: '股道视图显示设置', id: 'railView' },
{
label: '方向显示设置',
id: 'directionView',
@@ -102,14 +104,14 @@ export default {
{ label: '版本信息', id: 'version' },
],
T3MenuItems: [
- { label: '设置供电臂状态', id: 'powerSupplyArm' },
- { label: '封锁设备操作', id: 'blockedDeviceOperation' },
- { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}] },
- { label: '站存车管理', id: 'stationTrainManage', children: [{}] },
- { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}] },
- { label: '操作日志查询', id: 'operationLog' },
- { label: '防溜设置查询', id: 'deviceAffectAnalyze' },
- { label: '设备影响分析', id: 'deviceAffectAnalyze' },
+ { label: '设置供电臂状态', id: 'powerSupplyArm', ctc: true },
+ { label: '封锁设备操作', id: 'blockedDeviceOperation', ctc: true },
+ { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}], ctc: true },
+ { label: '站存车管理', id: 'stationTrainManage', children: [{}], ctc: true },
+ { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}], ctc: true },
+ { label: '操作日志查询', id: 'operationLog', ctc: true },
+ { label: '防溜设置查询', id: 'deviceAffectAnalyze', ctc: true },
+ { label: '设备影响分析', id: 'deviceAffectAnalyze', ctc: true },
],
}
},
@@ -150,7 +152,6 @@ export default {
mounted() {
this.dragEvent() // 24
window.addEventListener('click', this.closeMenus)
- window.addEventListener('click', this.closeMenus)
},
unmounted() {
window.removeEventListener('click', this.closeMenus)
@@ -180,6 +181,9 @@ export default {
case 'boardView':
this.$refs.boardViewSetting.doShow()
break
+ case 'railView':
+ this.$refs.railViewSetting.doShow()
+ break
}
},
handleT3MenuSelect(id) {
@@ -250,14 +254,6 @@ export default {
diff --git a/src/views/bigTrainRunplanManage/stationTrack.vue b/src/views/bigTrainRunplanManage/stationTrack.vue
index 28c637c18..6bcad0e83 100644
--- a/src/views/bigTrainRunplanManage/stationTrack.vue
+++ b/src/views/bigTrainRunplanManage/stationTrack.vue
@@ -166,29 +166,29 @@ export default {
filterSectionMap:{},
currentRow:null,
lineTypeMap:{
- 1:'正线',
- 2:'到发线'
+ 'RIGHT_TRACK':'正线',
+ 'ARRIVE_DEPART_TRACK':'到发线'
},
directionMap:{
- 1:'上行',
- 2:'下行',
- 3:'上下行'
+ 'S':'上行',
+ 'X':'下行',
+ 'D':'上下行'
},
typeMap:{
- 1:'客车',
- 2:'货车',
- 3:'客货车'
+ 'VAN':'客车',
+ 'GOODS_VAN':'货车',
+ 'PASSENGER':'客货车'
},
transfiniteTypeMap:{
- 1:'不能接发超限列车',
- 2:'一级超限',
- 3:'二级超限',
- 4:'超级超限'
+ 'NO':'不能接发超限列车',
+ 'TRANSFINITE_ONE_LEVEL':'一级超限',
+ 'TRANSFINITE_TWO_LEVEL':'二级超限',
+ 'TRANSFINITE_SUPER':'超级超限'
},
standTypeMap:{
- 1:'无',
- 2:'高站台',
- 3:'低站台'
+ 'NO':'无',
+ 'LOW':'高站台',
+ 'HIGH':'低站台'
},
allowEmuMap:{
true:'是',
@@ -254,7 +254,8 @@ export default {
if (this.currentRow) {
this.$refs.trackInformation.doShow({
row:this.currentRow,
- filterSectionMap:this.filterSectionMap
+ filterSectionMap:this.filterSectionMap,
+ stationCode:this.currentStationCode
});
}
},
diff --git a/src/views/bigTrainRunplanManage/trackInformation.vue b/src/views/bigTrainRunplanManage/trackInformation.vue
index 3961b761a..749370ac8 100644
--- a/src/views/bigTrainRunplanManage/trackInformation.vue
+++ b/src/views/bigTrainRunplanManage/trackInformation.vue
@@ -15,7 +15,7 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
{
if (valid) {
- // this.loading = true;
- // const param = {stationCode:this.addModel.stationCode, runPlanParamList:[this.addModel]};
- // commitOperate(menuOperate.CTC.addTrainFixedPath, param, 3).then(({valid})=>{
- // if (valid) {
- // this.doClose();
- // }
- // }).catch(() => {
- // this.doClose();
- // this.$emit('noticeInfo');
- // });
+ this.loading = true;
+ commitOperate(menuOperate.CTC.modifyStationTrack, Object.assign({stationCode:this.stationCode}, this.model), 3).then(({valid})=>{
+ if (valid) {
+ this.doClose();
+ }
+ }).catch(() => {
+ this.doClose();
+ this.$emit('noticeInfo');
+ });
}
});
},
diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue
index c775bc312..4bb85ee5a 100644
--- a/src/views/newMap/newMapdraft/dataRelation/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/index.vue
@@ -58,7 +58,7 @@ export default {
TurnedOperate,
DwellTimeOperate,
ContinueProtectOperate,
- IndicatorAssociatedInfo
+ IndicatorAssociatedInfo
// DestinationOperate
},
props: {
@@ -99,7 +99,7 @@ export default {
if (this.$route.query.lineCode == '15' || this.$route.query.lineCode == '16') {
this.tabList = [
{label: '大铁进路', name:'bigRoutingOperate', menus:BigRoutingOperate},
- {label: '指示灯关联', name: 'indicatorAssociatedInfo', menus: IndicatorAssociatedInfo}
+ {label: '出入口', name: 'indicatorAssociatedInfo', menus: IndicatorAssociatedInfo}
// {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate}
];
this.enabledTab = 'bigRoutingOperate';
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
index 36b3148c3..8df1abbfa 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
@@ -1,5 +1,5 @@
-
+
{ return this.getIoDirectionName(row.ioDirection); },
+ tagType: (row) => { return ''; }
+ },
{
title: '关联区段列表',
prop: 'sectionList',
@@ -139,6 +153,9 @@
const device = this.$store.getters['map/getDeviceByCode'](code);
return device ? device.name : '';
},
+ getIoDirectionName(ioDirection){
+ return this.ioDirectionMap[ioDirection]||'';
+ },
getSectionName(sectionList) {
const sectionName = [];
sectionList.forEach(item => {
@@ -150,11 +167,11 @@
deleteRoute(index, row) {
// this.mapInfo.id,
deleteAssist( row.id).then(res=>{
- this.$message.success('删除指示灯关联信息成功');
+ this.$message.success('删除出入口信息成功');
this.reloadTable();
this.$emit('refresh');
}).catch(error=>{
- this.$messageBox('删除指示灯关联信息失败:' + error.meessage);
+ this.$messageBox('删除出入口信息失败:' + error.meessage);
});
},
handleUpdate(index, row) {
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
index fa9fe1645..f791c8eee 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
@@ -31,6 +31,16 @@
/>
+
+
+
+
+
-
-
-
-
+
+
+
+ {{ $t('trainingManage.editTagTitle') }}
+
+
+
+
+
+
+