From 9d850f9653ef214744641a910ad6158f0e48d47a Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 22 Aug 2022 13:40:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=AE=A1=E7=90=86=E7=BB=88=E7=AB=AF=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=82=A1=E9=81=93=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/utils/menuOperate.js | 5 ++ src/scripts/cmdPlugin/CommandEnum.js | 1 + src/scripts/cmdPlugin/OperationHandler.js | 7 ++ .../bigTrainRunplanManage/stationTrack.vue | 33 +++---- .../trackInformation.vue | 85 ++++++++++--------- 5 files changed, 73 insertions(+), 58 deletions(-) diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 9d79f9638..925cbdd18 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, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index a2afc54aa..5b470cbbd 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -451,6 +451,7 @@ export default { CTC_STATION_DETAIL_PUBLISH:{value: 'STATION_DETAIL_PUBLISH', label: '股道发布生效区'}, CTC_STATION_DETAIL_LIST:{value: 'STATION_DETAIL_LIST', label: ' 获取股道列表'}, CTC_REGULAR_TRAIN_LINE_LIST:{value: 'REGULAR_TRAIN_LINE_LIST', label: ' 获取固定列车径路'}, + CTC_STATION_DETAIL_EDIT:{value: 'STATION_DETAIL_EDIT', label: '修改股道信息'}, CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 985e6eee6..93daf0dd6 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3986,6 +3986,13 @@ export const OperationEvent = { operation: '1153', domId: '_Tips-CTC-releaseStationTrack-Menu{TOP}' } + }, + // 修改股道信息 + modifyStationTrack:{ + menu: { + operation: '1154', + domId: '_Tips-CTC-modifyStationTrack-Menu{TOP}' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION 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..cf3497b30 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, this.model, 3).then(({valid})=>{ + if (valid) { + this.doClose(); + } + }).catch(() => { + this.doClose(); + this.$emit('noticeInfo'); + }); } }); }, From ba81b37ca083bd9adc9d28824a2b3db7bece9035 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Mon, 22 Aug 2022 13:43:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trainingManage.js | 4 +- src/i18n/langs/en/index.js | 4 +- src/i18n/langs/en/trainingManage.js | 14 ++++ src/i18n/langs/zh/index.js | 4 +- src/i18n/langs/zh/trainingManage.js | 14 ++++ .../{editBlob.vue => EditContent.vue} | 73 ++++++++++++++++--- src/views/trainingManage/demonMenu.vue | 10 ++- src/views/trainingManage/trainingList.vue | 47 +++++++----- 8 files changed, 134 insertions(+), 36 deletions(-) create mode 100644 src/i18n/langs/en/trainingManage.js create mode 100644 src/i18n/langs/zh/trainingManage.js rename src/views/trainingManage/{editBlob.vue => EditContent.vue} (61%) 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/views/trainingManage/editBlob.vue b/src/views/trainingManage/EditContent.vue similarity index 61% rename from src/views/trainingManage/editBlob.vue rename to src/views/trainingManage/EditContent.vue index ac7c160d5..7cfb29c14 100644 --- a/src/views/trainingManage/editBlob.vue +++ b/src/views/trainingManage/EditContent.vue @@ -1,23 +1,44 @@ + + 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 {