diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index b8383e918..f4f33e774 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -10,17 +10,6 @@ export default { { label: '是', value: true } ], - LinkTypeList: [ - { label: '起始Link', value: '0' }, - { label: '正向Link', value: '1' }, - { label: '侧向Link', value: '2' } - ], - - LinkDriectTypeList: [ - { label: '左侧', value: 'L' }, - { label: '右侧', value: 'R' } - ], - DirectionCodeList: [ { value: '2', label: '上行' }, { value: '1', label: '下行' } @@ -52,11 +41,6 @@ export default { { label: '专用', value: false } ], - PermissionUseListEn: [ - { label: 'Public', value: true }, - { label: 'Private', value: false } - ], - RegionTypeList: [ { label: '零点西上行', value: '01' }, { label: '零点西下行', value: '02' }, @@ -78,15 +62,6 @@ export default { { label: 'SHD三联段线', value: '18' }, { label: 'SHD四联段线', value: '19' } ], - roleType: [ - {label: '管理员', value: 'Admin', enLabel: 'Admin '}, - {label: '教员', value: 'Instructor', enLabel: 'Instructor '}, - {label: '行调', value: 'Dispatcher', enLabel: 'Dispatcher '}, - {label: '行值', value: 'Attendant', enLabel: 'Attendant '}, - {label: '观众', value: 'Audience', enLabel: 'Audience '}, - {label: '司机', value: 'Driver', enLabel: 'Driver '}, - {label: '通号', value: 'Repair', enLabel: 'Repairman '} - ], roleTypeNew:[ {label: '管理员', value: 'ADMIN', enLabel: 'Admin '}, {label: '教员', value: 'Instructor', enLabel: 'Instructor '}, @@ -100,21 +75,7 @@ export default { {label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department'}, {label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING', enLabel: 'Parking Signal Building'} ], - SimulationType: [ - { label: '实训', value: 'Training'}, - { label: '仿真(行调/现地/司机)', value: 'Simulation'}, - { label: '综合演练', value: 'Joint'}, - { label: '大屏', value: 'BigScreen'}, - { label: '琏计划', value: 'RunPlan'}, - { label: '剧本录制', value: 'ScriptWrite'} - ], - skinCode: [ - { label: '福州一号线', value: '02'}, - { label: '北京一号线', value: '03'}, - { label: '成都三号线', value: '04'}, - { label: '北京八通线', value: '05'} - ], releaseReview: [ { enlabel: 'Unpublished', label: '未发布', value: '0'}, { enlabel: 'Pending review', label: '待审核', value: '1'}, @@ -199,10 +160,6 @@ export default { { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05'}, { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06'} ], - trainingPrdType: [ - { enlabel: 'ATS local workstation', label: 'ATS现地工作站', value: 'Local'}, - { enlabel: 'ATS Traffic dispatching workstation', label: 'ATS行调工作站', value: 'Center'} - ], trainingDeviceType: { Switch: {enlabel: 'Switch training', label:'道岔实训'}, Section: {enlabel: 'Section training', label:'区段实训'}, diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js index 6cefbfc8b..51c66ebd4 100644 --- a/src/scripts/ConstDic.js +++ b/src/scripts/ConstDic.js @@ -1,12 +1,12 @@ -/** - * 真实设备类型 - */ -export const RealDeviceType = { - Section: '区段', - Switch: '道岔', - Signal: '信号机', - ScreenDoor: '屏蔽门' -}; +// /** +// * 真实设备类型 +// */ +// export const RealDeviceType = { +// Section: '区段', +// Switch: '道岔', +// Signal: '信号机', +// ScreenDoor: '屏蔽门' +// }; /** * 权限类型 */ @@ -60,13 +60,13 @@ export const OperateMode = { DIRECTIVE: '03' }; -/** - * 分发、转赠 - */ -export const OperatorModel = { - DISTRIBUTE: '01', - TRANSFER: '02' -}; +// /** +// * 分发、转赠 +// */ +// export const OperatorModel = { +// DISTRIBUTE: '01', +// TRANSFER: '02' +// }; /** * 菜单编号 @@ -152,99 +152,55 @@ export const SimulationType = { export const UrlConfig = { displayNew: '/displayNew', scriptDisplayNew:'/scriptDisplayNew', - practiceDisplayNew:'/practiceDisplayNew', - passengerDisplay:'/passengerDisplay', examRuleDraft: '/examRule/draft', examRuleManage: '/examRule/manage', examDetail: '/exam', lesson: { - prefix: '/lesson', - record: '/system/record/training', - manage: '/lesson/manage/training' + record: '/system/record/training' }, design: { prefix: '/design/home', - mapDraw: '/design/map/draw', lessonEdit: '/design/lesson/edit', lessonHome: '/design/lesson/home', - lessonManage: '/design/lesson/manage', taskManage: '/design/lesson/taskManage', trainingRule: '/design/lesson/trainingRule', trainingRuleDetail: '/design/lesson/trainingRule/detail', trainingManage: '/design/lesson/trainingManage', - trainingManageOld: '/design/lesson/trainingManageOld', - lessonTraining: '/design/lesson/training', trainingRecord: '/design/lesson/training', runPlan: '/design/runPlan/detail', testRunPlan: '/design/runPlan/testRunplan', scriptHome: '/design/script/home', - display: '/design/display', displayNew: '/design/displayNew', mapPreviewNew: '/design/mapPreviewNew', ibpHome: '/design/ibp/home' }, - designUser: { - prefix: '/design/userlist/home', - scriptHome: '/design/userlist/script/home', - mapDraw: '/design/userlist/map/draw', - lessonHome: '/design/userlist/lesson/home', - runPlan: '/design/userlist/runPlan/detail' - }, newDesignuser: { prefix: '/design/usermap/home', - scriptHome: '/design/usermap/script/home', - mapDraw: '/design/usermap/map/draw', - lessonHome: '/design/usermap/lesson/home', - runPlan: '/design/usermap/runPlan/detail' - }, - replay: { - prefix: '/replay' + mapDraw: '/design/usermap/map/draw' }, publish: { - prefix: '/publish', - map: '/publish/map', runPlanEveryDay: '/publish/runPlan/everyDay', runPlanTemplate: '/publish/runPlan/template', runPlanCommon: '/publish/runPlan/common', runPlanView: '/publish/runPlan/view' }, orderauthor: { - prefix: '/orderauthor', - commodityManage: '/orderauthor/commodity/manage', commodityDraft: '/orderauthor/commodity/draft', orderManage: '/orderauthor/order/manage', orderDraft: '/orderauthor/order/draft', authorMange: '/orderauthor/author/manage', - authorDetail: '/orderauthor/author/detail', transferDetail: '/orderauthor/transfer/detail', createPackage: '/orderauthor/transfer/create' }, - script: { - prefix: '/script', - detail: '/script/detail', - display: '/script/display' - }, - ibp: { - prefix: 'ibp', - draft: '/ibp/draft', - edit: 'ibp/edit' - }, trainingPlatform: { - trainingPlatform: '/trainingPlatform', prodDetail: '/trainingPlatform/detail', teachDetail: '/trainingPlatform/teach', teachHome: '/trainingPlatform/teachHome', - examDetail: '/trainingPlatform/exam', examHome: '/trainingPlatform/examHome', - examRuleManage: '/trainingPlatform/examRule/manage', - examRuleDraft: '/trainingPlatform/examRule/Draft', course: '/trainingPlatform/course', practical: '/trainingPlatform/practical', permission: '/trainingPlatform/permission', - permissionDetails: '/trainingPlatform/permission/detail', - draft: '/trainingPlatform/draft', - pay: '/trainingPlatform/pay', - runPlan: '/trainingPlatform/runPlan/manage' + pay: '/trainingPlatform/pay' }, bank: { questionCreate: '/design/race/questionCreate', diff --git a/src/scripts/plugin/OperateHandler.js b/src/scripts/plugin/OperateHandler.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/views/approval/index.vue b/src/views/approval/index.vue index 5b13f0459..97853fdb6 100644 --- a/src/views/approval/index.vue +++ b/src/views/approval/index.vue @@ -510,7 +510,7 @@ export default { const mapInfo = this.mapList.find(elem=>{ return elem.id == row.mapId; }); scriptDraftRecordNotify(row.id).then(resp => { const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:mapInfo.lineCode}; - this.$router.push({ path: `${UrlConfig.design.display}/demon`, query }); + this.$router.push({ path: `${UrlConfig.design.displayNew}/demon`, query }); launchFullscreen(); }).catch(error => { this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);