diff --git a/src/api/trainingManage.js b/src/api/trainingManage.js index 63c99781b..3d03fe652 100644 --- a/src/api/trainingManage.js +++ b/src/api/trainingManage.js @@ -57,9 +57,9 @@ export function publishTraining(data) { }); } /** 更新当前用户的某个实训草稿的大字段信息 */ -export function updateTrainingBlob(data) { +export function updateTrainingContent(data) { return request({ - url: `/api/v2/draft/training/update/blob`, + url: `/api/v2/draft/training/update/content`, method: 'post', data }); diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js index 6b247f001..1687a124b 100644 --- a/src/i18n/langs/en/index.js +++ b/src/i18n/langs/en/index.js @@ -28,6 +28,7 @@ import approval from './approval'; import systemGenerate from './systemGenerate'; import login from './login'; import designPlatform from './designPlatform'; +import trainingManage from './trainingManage'; export default { enLocale, @@ -59,5 +60,6 @@ export default { approval, systemGenerate, login, - designPlatform + designPlatform, + trainingManage }; diff --git a/src/i18n/langs/en/trainingManage.js b/src/i18n/langs/en/trainingManage.js new file mode 100644 index 000000000..b354b8476 --- /dev/null +++ b/src/i18n/langs/en/trainingManage.js @@ -0,0 +1,14 @@ +export default { + create: 'create', + editTagTitle: 'Training establishment', + name: 'The name of the training', + description: 'description', + type: 'type', + labelJson: 'tag', + operate: 'operate', + record: 'record', + modify: 'modify', + delete: 'delete', + publish: 'publish', + preview: 'preview' +}; diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js index 3974061e3..36de12e12 100644 --- a/src/i18n/langs/zh/index.js +++ b/src/i18n/langs/zh/index.js @@ -28,6 +28,7 @@ import approval from './approval'; import systemGenerate from './systemGenerate'; import login from './login'; import designPlatform from './designPlatform'; +import trainingManage from './trainingManage'; export default { cnLocale, @@ -59,5 +60,6 @@ export default { approval, systemGenerate, login, - designPlatform + designPlatform, + trainingManage }; diff --git a/src/i18n/langs/zh/trainingManage.js b/src/i18n/langs/zh/trainingManage.js new file mode 100644 index 000000000..17c66bf3b --- /dev/null +++ b/src/i18n/langs/zh/trainingManage.js @@ -0,0 +1,14 @@ +export default { + create: '创建', + editTagTitle: '实训编制', + name: '实训名称', + description: '描述', + type: '类型', + labelJson: '标签', + operate: '操作', + record: '编制', + modify: '修改', + delete: '删除', + publish: '发布', + preview: '预览' +}; diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 9d79f9638..2a91b5e1e 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -781,6 +781,11 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.getStationTrack.menu.operation, cmdType: CMD.CTC.CTC_STATION_DETAIL_LIST }, + // 修改股道信息 + modifyStationTrack:{ + operation: OperationEvent.CTCCommand.modifyStationTrack.menu.operation, + cmdType: CMD.CTC.CTC_STATION_DETAIL_EDIT + }, // 股道发布生效区 releaseStationTrack:{ operation: OperationEvent.CTCCommand.releaseStationTrack.menu.operation, @@ -791,6 +796,11 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.getTrainFixedPath.menu.operation, cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_LIST }, + // 出入口发布生效区 + releaseStationDirection:{ + operation: OperationEvent.CTCCommand.releaseStationDirection.menu.operation, + cmdType: CMD.CTC.CTC_STATION_IO_GATE_PUBLISH + }, setRoute: { operation: OperationEvent.CTCCommand.setRoute.menu.operation, cmdType: CMD.CTC.CTC_SET_ROUTE diff --git a/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue new file mode 100644 index 000000000..6a3a8986f --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index cab5f5b57..4810414c2 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -1,6 +1,5 @@ @@ -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 @@