From 1b01141b88f8608a9527272cfec22116d18850aa Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 12 Aug 2019 14:21:32 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=A7=E6=9C=AC?= =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lesson/scriptmanage/create.vue | 4 ++-- src/views/lesson/scriptmanage/list.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/lesson/scriptmanage/create.vue b/src/views/lesson/scriptmanage/create.vue index f89141290..98a9503c1 100644 --- a/src/views/lesson/scriptmanage/create.vue +++ b/src/views/lesson/scriptmanage/create.vue @@ -39,7 +39,7 @@ labelWidth: '100px', items: [ { prop: 'name', label: '剧本名称', type: 'text', required: true}, - { prop: 'mapId', label: '地图类型', type: 'select', required: true, options: this.mapList,disabled:this.disabled}, + { prop: 'mapId', label: '地图', type: 'select', required: true, options: this.mapList,disabled:this.disabled}, { prop: 'description', label: '剧本描述', type: 'textarea', required: true}, ] } @@ -51,7 +51,7 @@ { required: true, message: '请输入剧本', trigger: 'blur' }, ], mapId: [ - { required: true, message: '请选择地图类型', trigger: 'change' }, + { required: true, message: '请选择地图', trigger: 'change' }, ], description:[ { required: true, message: '请输入剧本描述', trigger: 'blur' }, diff --git a/src/views/lesson/scriptmanage/list.vue b/src/views/lesson/scriptmanage/list.vue index abac81e50..51952d2cb 100644 --- a/src/views/lesson/scriptmanage/list.vue +++ b/src/views/lesson/scriptmanage/list.vue @@ -39,7 +39,7 @@ queryObject: { mapId: { type: 'select', - label: '地图类型', + label: '地图', config: { data: [] } @@ -56,7 +56,7 @@ prop: 'name' }, { - title: '地图类型', + title: '地图', prop: 'mapId', type: 'tag', columnValue: (row) => { From fcb6076d64021b52fe0682d66433d2b02508aefe Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 12 Aug 2019 15:19:26 +0800 Subject: [PATCH 2/8] =?UTF-8?q?desc:=20=E5=A2=9E=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=BC=96=E8=BE=91=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/map.js | 150 +++++- src/i18n/langs/en/rules.js | 60 ++- src/i18n/langs/en/tip.js | 11 +- src/i18n/langs/zh/map.js | 150 +++++- src/i18n/langs/zh/rules.js | 53 +- src/i18n/langs/zh/tip.js | 11 +- src/main.js | 2 +- src/views/lesson/trainingcategory/edit.vue | 491 +++++++++--------- src/views/lesson/trainingcategory/index.vue | 85 ++- .../mapdraft/mapedit/mapoperate/section.vue | 218 ++++---- .../mapdraft/mapedit/mapoperate/signal.vue | 104 ++-- .../mapdraft/mapedit/mapoperate/station.vue | 66 +-- .../mapedit/mapoperate/stationcontrol.vue | 50 +- 13 files changed, 908 insertions(+), 543 deletions(-) diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index 0b2b13623..356d23165 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -11,6 +11,20 @@ export default { logicalView: '逻辑视图', physicalView: '物理视图', mixedView: '混合视图', + normal: '正常', + + save: '保存', + updata: '更新', + updateObj: '修改', + updateObjAxis: '更新坐标', + saveAs: '另存为', + publish: '发布', + deleteObj: '删除', + confirm: '确 定', + cancel: '取 消', + cancelledDelete: '已取消删除', + confirmDeletion: '是否确认删除？', + hint: '提示', link: 'link', section: '区段', @@ -42,6 +56,7 @@ export default { scaling: '缩放比例', statusSignalName: '状态信号名称:', stateSignalsPlotCoordinates: '状态信号画图坐标:', + equipmentStation: '所属设备集中站:', lineCoding: '线条编码:', lineType: '线条类型:', @@ -49,10 +64,6 @@ export default { segmentCoordinates: '区段显示坐标:', publishMapCreation: '从发布地图创建', - confirm: '确 定', - cancel: '取 消', - - cancelledDelete: '已取消删除', pleaseEnterMapName: '请输入地图名称', pleaseChooseSkinStyle: '请选择皮肤风格', @@ -85,11 +96,6 @@ export default { publishingAssociatedCity: '发布关联城市:', publishMapName: '发布地图名称:', - updateObj: '修改', - updateObjAxis: '更新坐标', - saveAs: '另存为', - publish: '发布', - deleteObj: '删除', editRoute: '编辑进路', editRouting: '编辑交路', editAutoRouting: '编辑自动信号', @@ -97,9 +103,6 @@ export default { pathUnit: '路径单元', jlmap3d: '三维化编辑', - confirmDeletion: '是否确认删除？', - hint: '提示', - automaticSignalList: '自动信号列表', automaticSignalCode: '自动信号编码', signalCodeName: '信号机名称', @@ -109,6 +112,7 @@ export default { operation: '操作', compile: '编辑', delete: '删除', + empty: '清空', sectionName: '区段名称', sectionList: '区段列表', automaticSignal: '自动信号', @@ -116,8 +120,7 @@ export default { signalID: '信号机ID:', activate: '激活', segmentData: '进路自动触发区段数据:', - save: '保存', - updata: '更新', + pleaseSelectSignal: '请选择信号机', triggerSegmentData: '请选择进路自动触发区段数据', automaticSignalSuccessful: '创建自动信号成功！', @@ -181,6 +184,123 @@ export default { linkRightFdCode: '右侧正向Link:', linkRightSdCode: '右侧侧向Link:', linkLp: 'Link 起点坐标:', - linkRp: 'Link 终点坐标:' + linkRp: 'Link 终点坐标:', + rulesChange: '规则修改', + sectionNameC: '区段名称:', + splitMerge: '拆分/合并', + linkSet: 'Link集合', + selectLink: '选择Link', + splitOffset: '拆分偏移量:', + split: '拆分', + merge: '合并', + logicBlock: '逻辑区段', + aux: '第', + sectionLine: '段折线', + sectionPolyline: '区段折线', + switchSection: '道岔区段', + trainDirection: '列车所在方向:', + deleteSwitchSection: '一键删除道岔区段', + createSwitchSection: '一键创建道岔区段', + sectionLogicalNumber: '逻辑区段数量', + sectionLsectioncode: '左侧区段名称:', + sectionRsectioncode: '右侧区段名称:', + associatedSection: '关联物理区段:', + blockCoding: '区段编码:', + sectionType: '区段类型:', + sectionNameColon: '区段名称:', + sectionNameOffset: '区段名称偏移量:', + leftKilometerMark: '左侧公里标(米):', + rightKilometerMark: '右侧公里标(米):', + sectionColon: '区间:', + displayExtentName: '是否显示区段名称:', + displayAxleCounter: '是否显示计轴:', + displayLogicalExtents: '是否显示逻辑区段:', + displayLogicalWxtentNames: '是否显示逻辑区段名称:', + isStandTrack: '是否站台轨:', + standTrackName: '站台轨名称:', + standTrackNamePosition: '站台轨名称偏移量:', + relStandCode: '站台编码:', + isReentryTrack: '是否折返轨:', + reentryTrackName: '折返轨名称:', + reentryTrackNamePosition: '折返轨名称偏移量:', + isTransferTrack: '是否转换轨:', + transferTrackName: '转换轨名称:', + transferTrackNamePosition: '转换轨名称偏移量:', + destinationCode: '目的地码:', + destinationCodePoint: '目的地码坐标:', + destinationCodeShow: '是否显示目的地码:', + leftStopPointOffset: '左向停车点偏移量:', + rightStopPointOffset: '右向停车点偏移量:', + isSwitchSection: '是否道岔区段:', + relSwitchCode: '关联道岔Code:', + logicSectionNameSort: '逻辑区段排序:', + fromSmallToLarge: '从小到大', + fromLargeToSmall: '从大到小', + relevanceLinkCode: '关联的Link:', + sepTypeLeft: '左侧分隔符类型:', + sectionOffsetLeft: '左侧Link偏移量:', + sepTypeRight: '右侧分隔符类型:', + sectionOffsetRight: '右侧Link偏移量:', + isSegmentation: '是否分割:', + segmentationPosition: '默认背景:', + isCurve: '是否曲线:', + sectionPoints: '区段显示坐标:', + trainPosType: '列车所在方向:', + physicalSegmentName: '物理区段名称:', + + directionType: '形式方向:', + leftOrRight: '左右位置:', + positionType: '上下位置:', + + signalFilamentAlarm: '灯丝报警', + signalCodeColon: '信号机编码:', + signalNameColon: '信号机名称:', + signalUniqueName: '信号机唯一名称:', + signalDisplayName: '是否显示信号机名称:', + lampPostType: '灯柱类型:', + lampPositionType: '灯位类型:', + signalUseType: '用途类型:', + potLampType: '点灯类型:', + signalDirectionType: '方向类型:', + signalPositionType: '信号机位置类型:', + signalOffset: '偏移量:', + signalPositionX: '信号机x:', + signalPositionY: '信号机y:', + signalRotate: '旋转角度:', + signalNamePositionX: '信号机名字偏移量 x:', + signalNamePositionY: '信号机名字偏移量 y:', + signalButtonShow: '是否显示按钮:', + signalButtonPositionX: '按钮x:', + signalButtonPositionY: '按钮y:', + signalGuideShow: '是否显示引导信号灯:', + signalGuidePositionX: '引导信号x:', + signalGuidePositionY: '引导信号y:', + + concentrateStationCode: '所属联锁站编码:', + stationCode: '车站编码:', + zcCode: '所属zc区域编码:', + centralized: '是否集中站:', + stationNameColon: '车站名称:', + stationRunPlanName: '真实名称:', + stationVisible: '是否显示:', + stationNameFont: '车站字体:', + stationNameFontColor: '车站字体颜色:', + stationKmPostShow: '是否显示公里标名称:', + stationKmRange: '公里标距离:', + stationKmPost: '公里标名称:', + stationKmPostFont: '公里标字体:', + stationKmPostFontColor: '公里标字体颜色:', + stationPositionX: 'x坐标:', + stationPositionY: 'y坐标:', + + stationControlCode: '控制模式编码:', + stationControlName: '控制模式名称:', + zokContent: '中控内容:', + zakContent: '站控内容:', + jjzkContent: '紧急站控/总报警内容:', + zzkContent: '站中控内容:', + stationControlPositionX: '坐标 x:', + stationControlPositionY: '坐标 y:', + stationControlZok: '中控' }; diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index c9b1bb42f..cba8f1b80 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -1,9 +1,9 @@ export default { + pleaseSelect: '请选择', selectEquipment: '请选择设备', - deviceTypeNotNull: 'Device type code cannot be empty', - operationTypeNotNull: 'Operator code cannot be empty', - tipsNotNull: 'Tips cannot be empty', - + deviceTypeNotNull: '设备类型码不能为空', + operationTypeNotNull: '操作码不能为空', + tipsNotNull: '提示信息不能为空', pleaseSelectEncoding: '请选择唯一编码', pleaseEnterStatusSignal: '请输入状态信号名称', pleaseEnterXCoordinate: '请输入x坐标', @@ -31,5 +31,55 @@ export default { pointX: '坐标 x:', pointY: '坐标 y:', direct: '方向:', - basisLink: '基础Link:' + basisLink: '基础Link:', + + pleaseSelectSectionName: '请选择区段名称', + pleaseFillOffset: '请填写偏移量', + pleaseFillValue: '请填写数值', + pleaseSelectLeftSectionName: '请选择左侧区段名称', + pleaseSelectRightSectionName: '请选择右侧区段名称', + pleaseEnterYValue: '请输入坐标Y值', + pleaseEnterSectionType: '请输入区段类型', + pleaseEnterSectionName: '请输入区段名称', + pleaseSelectAssociatedPlatform: '请选择关联站台', + pleaseEnterLeftStopPointOffset: '请输入左向停车点偏移量', + rightStopPointOffset: '请输入右向停车点偏移量', + destinationCode: '请输入目的地码', + destinationCodePointX: '请输入目的地码坐标X', + destinationCodePointY: '请输入目的地码坐标Y', + sectionNamePointX: '请输入区段名称坐标X', + sectionNamePointY: '请输入区段名称坐标Y', + logicSectionNameSort: '请选择逻辑区段名称排序', + sectionOffsetLeft: '请输入左侧Link偏移量', + sectionSepTypeLeft: '请选择左侧分隔符', + sectionOffsetRight: '请输入右侧Link偏移量', + sectionSepTypeRight: '请选择右侧分隔符', + selectPhysicalExtentName: '请选择物理区段名称', + + pleaseEnterSemaphoreName: '请输入信号灯名称', + pleaseEnterSignalName: '请输入信号机唯一名称', + pleaseEnterSignalOffset: '请输入偏移量', + pleaseEnterSignalStation: '请输入设备集中站', + pleaseEnterSignalPositionX: '请输入信号机x', + pleaseEnterSignalPositionY: '请输入信号机y', + signalButtonPositionX: '请输入按钮x', + signalButtonPositionY: '请输入按钮y', + signalGuidePositionX: '请输入引导信号x', + signalGuidePositionY: '请输入引导信号y', + + stationName: '请输入车站名称', + stationKmRange: '请输入公里标距离', + stationKmPost: '请输入公里标名称', + stationPositionX: '请输入x坐标', + stationPositionY: '请输入y坐标', + + stationControlStationName: '请选择车站名称', + stationControlStationCode: '请选择所属车站', + stationControlZokContent: '请输入中控内容', + stationControlZakContent: '请输入站控内容', + stationControlJjzkContent: '请输入紧急站控内容', + stationControlZzkContent: '请输入站中控内容', + stationControlPositionX: '请输入坐标x', + stationControlPositionY: '请输入坐标y' + }; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 26cb49e78..91b6f76d7 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -3,8 +3,10 @@ export default { cancel: '取 消', creatingSuccessful: '创建成功！', confirmDeletion: '是否确认删除？', + confirmBatchGeneration: '是否确认批量生成？', hint: '提示', cancelledDelete: '已取消删除', + cancelGeneration: '已取消批量生成', updateSuccessfully: '更新成功', updateFailed: '更新失败', @@ -12,6 +14,13 @@ export default { failDelete: '删除失败', cannotCoincide: '起始坐标和结束坐标不能重合', + cannotMerged: '存在非物理区段，不能合并', + linkCannotMerged: '不在同一Link上的物理区段不能合并', - meter: '米' + selectedSectionEmpty: '选择的区段为空', + + stationFont: '车站字体', + kilometerFont: '公里标字体', + meter: '米', + angle: '度' }; diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 0b2b13623..356d23165 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -11,6 +11,20 @@ export default { logicalView: '逻辑视图', physicalView: '物理视图', mixedView: '混合视图', + normal: '正常', + + save: '保存', + updata: '更新', + updateObj: '修改', + updateObjAxis: '更新坐标', + saveAs: '另存为', + publish: '发布', + deleteObj: '删除', + confirm: '确 定', + cancel: '取 消', + cancelledDelete: '已取消删除', + confirmDeletion: '是否确认删除？', + hint: '提示', link: 'link', section: '区段', @@ -42,6 +56,7 @@ export default { scaling: '缩放比例', statusSignalName: '状态信号名称:', stateSignalsPlotCoordinates: '状态信号画图坐标:', + equipmentStation: '所属设备集中站:', lineCoding: '线条编码:', lineType: '线条类型:', @@ -49,10 +64,6 @@ export default { segmentCoordinates: '区段显示坐标:', publishMapCreation: '从发布地图创建', - confirm: '确 定', - cancel: '取 消', - - cancelledDelete: '已取消删除', pleaseEnterMapName: '请输入地图名称', pleaseChooseSkinStyle: '请选择皮肤风格', @@ -85,11 +96,6 @@ export default { publishingAssociatedCity: '发布关联城市:', publishMapName: '发布地图名称:', - updateObj: '修改', - updateObjAxis: '更新坐标', - saveAs: '另存为', - publish: '发布', - deleteObj: '删除', editRoute: '编辑进路', editRouting: '编辑交路', editAutoRouting: '编辑自动信号', @@ -97,9 +103,6 @@ export default { pathUnit: '路径单元', jlmap3d: '三维化编辑', - confirmDeletion: '是否确认删除？', - hint: '提示', - automaticSignalList: '自动信号列表', automaticSignalCode: '自动信号编码', signalCodeName: '信号机名称', @@ -109,6 +112,7 @@ export default { operation: '操作', compile: '编辑', delete: '删除', + empty: '清空', sectionName: '区段名称', sectionList: '区段列表', automaticSignal: '自动信号', @@ -116,8 +120,7 @@ export default { signalID: '信号机ID:', activate: '激活', segmentData: '进路自动触发区段数据:', - save: '保存', - updata: '更新', + pleaseSelectSignal: '请选择信号机', triggerSegmentData: '请选择进路自动触发区段数据', automaticSignalSuccessful: '创建自动信号成功！', @@ -181,6 +184,123 @@ export default { linkRightFdCode: '右侧正向Link:', linkRightSdCode: '右侧侧向Link:', linkLp: 'Link 起点坐标:', - linkRp: 'Link 终点坐标:' + linkRp: 'Link 终点坐标:', + rulesChange: '规则修改', + sectionNameC: '区段名称:', + splitMerge: '拆分/合并', + linkSet: 'Link集合', + selectLink: '选择Link', + splitOffset: '拆分偏移量:', + split: '拆分', + merge: '合并', + logicBlock: '逻辑区段', + aux: '第', + sectionLine: '段折线', + sectionPolyline: '区段折线', + switchSection: '道岔区段', + trainDirection: '列车所在方向:', + deleteSwitchSection: '一键删除道岔区段', + createSwitchSection: '一键创建道岔区段', + sectionLogicalNumber: '逻辑区段数量', + sectionLsectioncode: '左侧区段名称:', + sectionRsectioncode: '右侧区段名称:', + associatedSection: '关联物理区段:', + blockCoding: '区段编码:', + sectionType: '区段类型:', + sectionNameColon: '区段名称:', + sectionNameOffset: '区段名称偏移量:', + leftKilometerMark: '左侧公里标(米):', + rightKilometerMark: '右侧公里标(米):', + sectionColon: '区间:', + displayExtentName: '是否显示区段名称:', + displayAxleCounter: '是否显示计轴:', + displayLogicalExtents: '是否显示逻辑区段:', + displayLogicalWxtentNames: '是否显示逻辑区段名称:', + isStandTrack: '是否站台轨:', + standTrackName: '站台轨名称:', + standTrackNamePosition: '站台轨名称偏移量:', + relStandCode: '站台编码:', + isReentryTrack: '是否折返轨:', + reentryTrackName: '折返轨名称:', + reentryTrackNamePosition: '折返轨名称偏移量:', + isTransferTrack: '是否转换轨:', + transferTrackName: '转换轨名称:', + transferTrackNamePosition: '转换轨名称偏移量:', + destinationCode: '目的地码:', + destinationCodePoint: '目的地码坐标:', + destinationCodeShow: '是否显示目的地码:', + leftStopPointOffset: '左向停车点偏移量:', + rightStopPointOffset: '右向停车点偏移量:', + isSwitchSection: '是否道岔区段:', + relSwitchCode: '关联道岔Code:', + logicSectionNameSort: '逻辑区段排序:', + fromSmallToLarge: '从小到大', + fromLargeToSmall: '从大到小', + relevanceLinkCode: '关联的Link:', + sepTypeLeft: '左侧分隔符类型:', + sectionOffsetLeft: '左侧Link偏移量:', + sepTypeRight: '右侧分隔符类型:', + sectionOffsetRight: '右侧Link偏移量:', + isSegmentation: '是否分割:', + segmentationPosition: '默认背景:', + isCurve: '是否曲线:', + sectionPoints: '区段显示坐标:', + trainPosType: '列车所在方向:', + physicalSegmentName: '物理区段名称:', + + directionType: '形式方向:', + leftOrRight: '左右位置:', + positionType: '上下位置:', + + signalFilamentAlarm: '灯丝报警', + signalCodeColon: '信号机编码:', + signalNameColon: '信号机名称:', + signalUniqueName: '信号机唯一名称:', + signalDisplayName: '是否显示信号机名称:', + lampPostType: '灯柱类型:', + lampPositionType: '灯位类型:', + signalUseType: '用途类型:', + potLampType: '点灯类型:', + signalDirectionType: '方向类型:', + signalPositionType: '信号机位置类型:', + signalOffset: '偏移量:', + signalPositionX: '信号机x:', + signalPositionY: '信号机y:', + signalRotate: '旋转角度:', + signalNamePositionX: '信号机名字偏移量 x:', + signalNamePositionY: '信号机名字偏移量 y:', + signalButtonShow: '是否显示按钮:', + signalButtonPositionX: '按钮x:', + signalButtonPositionY: '按钮y:', + signalGuideShow: '是否显示引导信号灯:', + signalGuidePositionX: '引导信号x:', + signalGuidePositionY: '引导信号y:', + + concentrateStationCode: '所属联锁站编码:', + stationCode: '车站编码:', + zcCode: '所属zc区域编码:', + centralized: '是否集中站:', + stationNameColon: '车站名称:', + stationRunPlanName: '真实名称:', + stationVisible: '是否显示:', + stationNameFont: '车站字体:', + stationNameFontColor: '车站字体颜色:', + stationKmPostShow: '是否显示公里标名称:', + stationKmRange: '公里标距离:', + stationKmPost: '公里标名称:', + stationKmPostFont: '公里标字体:', + stationKmPostFontColor: '公里标字体颜色:', + stationPositionX: 'x坐标:', + stationPositionY: 'y坐标:', + + stationControlCode: '控制模式编码:', + stationControlName: '控制模式名称:', + zokContent: '中控内容:', + zakContent: '站控内容:', + jjzkContent: '紧急站控/总报警内容:', + zzkContent: '站中控内容:', + stationControlPositionX: '坐标 x:', + stationControlPositionY: '坐标 y:', + stationControlZok: '中控' }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 57b5c143a..cba8f1b80 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -1,4 +1,5 @@ export default { + pleaseSelect: '请选择', selectEquipment: '请选择设备', deviceTypeNotNull: '设备类型码不能为空', operationTypeNotNull: '操作码不能为空', @@ -30,5 +31,55 @@ export default { pointX: '坐标 x:', pointY: '坐标 y:', direct: '方向:', - basisLink: '基础Link:' + basisLink: '基础Link:', + + pleaseSelectSectionName: '请选择区段名称', + pleaseFillOffset: '请填写偏移量', + pleaseFillValue: '请填写数值', + pleaseSelectLeftSectionName: '请选择左侧区段名称', + pleaseSelectRightSectionName: '请选择右侧区段名称', + pleaseEnterYValue: '请输入坐标Y值', + pleaseEnterSectionType: '请输入区段类型', + pleaseEnterSectionName: '请输入区段名称', + pleaseSelectAssociatedPlatform: '请选择关联站台', + pleaseEnterLeftStopPointOffset: '请输入左向停车点偏移量', + rightStopPointOffset: '请输入右向停车点偏移量', + destinationCode: '请输入目的地码', + destinationCodePointX: '请输入目的地码坐标X', + destinationCodePointY: '请输入目的地码坐标Y', + sectionNamePointX: '请输入区段名称坐标X', + sectionNamePointY: '请输入区段名称坐标Y', + logicSectionNameSort: '请选择逻辑区段名称排序', + sectionOffsetLeft: '请输入左侧Link偏移量', + sectionSepTypeLeft: '请选择左侧分隔符', + sectionOffsetRight: '请输入右侧Link偏移量', + sectionSepTypeRight: '请选择右侧分隔符', + selectPhysicalExtentName: '请选择物理区段名称', + + pleaseEnterSemaphoreName: '请输入信号灯名称', + pleaseEnterSignalName: '请输入信号机唯一名称', + pleaseEnterSignalOffset: '请输入偏移量', + pleaseEnterSignalStation: '请输入设备集中站', + pleaseEnterSignalPositionX: '请输入信号机x', + pleaseEnterSignalPositionY: '请输入信号机y', + signalButtonPositionX: '请输入按钮x', + signalButtonPositionY: '请输入按钮y', + signalGuidePositionX: '请输入引导信号x', + signalGuidePositionY: '请输入引导信号y', + + stationName: '请输入车站名称', + stationKmRange: '请输入公里标距离', + stationKmPost: '请输入公里标名称', + stationPositionX: '请输入x坐标', + stationPositionY: '请输入y坐标', + + stationControlStationName: '请选择车站名称', + stationControlStationCode: '请选择所属车站', + stationControlZokContent: '请输入中控内容', + stationControlZakContent: '请输入站控内容', + stationControlJjzkContent: '请输入紧急站控内容', + stationControlZzkContent: '请输入站中控内容', + stationControlPositionX: '请输入坐标x', + stationControlPositionY: '请输入坐标y' + }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index 26cb49e78..91b6f76d7 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -3,8 +3,10 @@ export default { cancel: '取 消', creatingSuccessful: '创建成功！', confirmDeletion: '是否确认删除？', + confirmBatchGeneration: '是否确认批量生成？', hint: '提示', cancelledDelete: '已取消删除', + cancelGeneration: '已取消批量生成', updateSuccessfully: '更新成功', updateFailed: '更新失败', @@ -12,6 +14,13 @@ export default { failDelete: '删除失败', cannotCoincide: '起始坐标和结束坐标不能重合', + cannotMerged: '存在非物理区段，不能合并', + linkCannotMerged: '不在同一Link上的物理区段不能合并', - meter: '米' + selectedSectionEmpty: '选择的区段为空', + + stationFont: '车站字体', + kilometerFont: '公里标字体', + meter: '米', + angle: '度' }; diff --git a/src/main.js b/src/main.js index db2e58341..99c4decfd 100644 --- a/src/main.js +++ b/src/main.js @@ -27,7 +27,7 @@ Vue.use(VueI18n); Vue.config.productionTip = false; export const i18n = new VueI18n({ - locale: LangStorage.getLang('en'), + locale: LangStorage.getLang('zh'), messages }); diff --git a/src/views/lesson/trainingcategory/edit.vue b/src/views/lesson/trainingcategory/edit.vue index 9283879c9..062928c58 100644 --- a/src/views/lesson/trainingcategory/edit.vue +++ b/src/views/lesson/trainingcategory/edit.vue @@ -1,255 +1,264 @@ \ No newline at end of file + diff --git a/src/views/lesson/trainingcategory/index.vue b/src/views/lesson/trainingcategory/index.vue index d1e11c30e..829682b01 100644 --- a/src/views/lesson/trainingcategory/index.vue +++ b/src/views/lesson/trainingcategory/index.vue @@ -1,51 +1,50 @@ \ No newline at end of file + diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue index 5ae3a76a1..3a035aea2 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue @@ -1,16 +1,16 @@