From aa63be299bc841899841e1b8fc12326f6e846a8e Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 13 Aug 2019 18:43:34 +0800 Subject: [PATCH] =?UTF-8?q?desc:=20=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=20=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/zh/map.js | 60 ++- src/i18n/langs/zh/rules.js | 47 +- src/i18n/langs/zh/tip.js | 4 + .../mapedit/automaticoperate/preview.vue | 5 +- .../mapedit/mapoperate/stationcontrol.vue | 10 +- .../mapedit/mapoperate/stationstand.vue | 80 +-- .../mapdraft/mapedit/mapoperate/stoppoint.vue | 2 +- .../mapdraft/mapedit/mapoperate/switch.vue | 68 +-- .../map/mapdraft/mapedit/mapoperate/text.vue | 58 +- .../map/mapdraft/mapedit/mapoperate/train.vue | 70 +-- .../mapedit/mapoperate/trainmodel.vue | 46 +- .../mapedit/mapoperate/trainwindow.vue | 46 +- .../mapdraft/mapedit/mapoperate/zcControl.vue | 46 +- .../map/mapdraft/mapmanage/operateMenu.vue | 92 ++-- src/views/map/product/draft.vue | 500 +++++++++--------- src/views/map/product/list.vue | 285 +++++----- src/views/map/skinStyle/draft.vue | 399 +++++++------- src/views/map/skinStyle/index.vue | 272 +++++----- 18 files changed, 1105 insertions(+), 985 deletions(-) diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 356d23165..20a51dfb5 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -12,6 +12,7 @@ export default { physicalView: '物理视图', mixedView: '混合视图', normal: '正常', + add: '添加', save: '保存', updata: '更新', @@ -138,6 +139,7 @@ export default { countMax: '计数器最大值:', pointX: '坐标 x:', pointY: '坐标 y:', + meter: '米', code: '编码:', imageName: '图片名称:', @@ -302,5 +304,61 @@ export default { zzkContent: '站中控内容:', stationControlPositionX: '坐标 x:', stationControlPositionY: '坐标 y:', - stationControlZok: '中控' + stationControlZok: '中控', + + stationstandName: '选择车站名称:', + stationstandDirection: '站台方向:', + stationstandHasDoor: '是否显示屏蔽门:', + stationstandNameColon: '站台名称:', + stationstandTopBottom: '上下行方向:', + stationstandShowName: '是否显示名称:', + stationstandWidth: '宽度 w:', + stationstandHeight: '高度 h:', + stationstandPositionX: '坐标 x:', + stationstandPositionY: '坐标 y:', + + switchCode: '道岔编码:', + switchName: '道岔名称:', + switchShowName: '是否显示道岔名称:', + switchPositionX: '道岔名称x偏移量:', + switchPositionY: '道岔名称y偏移量:', + turnTime: '道岔时间:', + timeoutShow: '是否显示道岔时间:', + sectionACode: '关联的A Section Code:', + sectionBCode: '关联的B Section Code:', + sectionCCode: '关联的C Section Code:', + switchTpX: '时间x坐标偏移量:', + switchTpY: '时间y坐标偏移量:', + + textCode: '文字编码:', + textContent: '文本内容:', + textFont: '字体格式:', + textFontColor: '字体颜色:', + + trainCode: '列车编号:', + groupNumber: '车组号:', + modelCode: '车类型:', + + trainmodelCreate: '新建车类型', + trainmodelUpdate: '更新列车模型', + trainTypeName: '列车类型名称:', + trainLength: '列车长度:', + trainSafeDistance: '安全距离:', + trainMaxSafeDistance: '最大安全距离:', + averageVelocity: '平均速度:', + averageDeceleration: '平均减速度:', + defaultVelocity: '默认速度:', + maxVelocity: '最大速度:', + + trainWindowCode: '车次窗编码:', + trainWindowWidth: '车次窗宽度:', + trainWindowHeight: '车次窗高度:', + trainWindowSectionCode: '关联区段:', + + deleteTrainWindow: '一键删除车次窗', + createTrainWindow: '一键创建车次窗', + + zcCodeColon: '编码:', + showZc: '是否可见:', + }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index cba8f1b80..4a91b7109 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -80,6 +80,51 @@ export default { stationControlJjzkContent: '请输入紧急站控内容', stationControlZzkContent: '请输入站中控内容', stationControlPositionX: '请输入坐标x', - stationControlPositionY: '请输入坐标y' + stationControlPositionY: '请输入坐标y', + + pleaseReSelectDevice: '请重新选择设备', + stationCode: '请选择关联车站', + stationstandCountName: '请输入计数器名称', + doorLocationType: '请选择站台方向', + deviceStationCode: '请选择所属设备集中站', + stationstandDirection: '请选择上下行方向', + stationstandWidth: '请输入车站宽度', + stationstandHeight: '请输入车站高度', + stationstandPositionX: '请输入x坐标', + stationstandPositionY: '请输入y坐标', + + switchName: '请输入道岔名称', + switchNamePointX: '请输入道岔名称坐标x', + switchNamePointY: '请输入道岔名称坐标y', + switchStationCode: '请输入设备集中站', + switchTurnTime: '请输入道岔时间', + switchTpX: '请输入时间坐标x', + switchTpY: '请输入时间坐标y', + + selectText: '请选择Text', + pleaseEnterContent: '请输入内容', + textFont: '请选择文字格式', + textFontColor: '请选择文字颜色', + pleaseEnterGroupNumber: '请输入车组号', + selectTrainType: '请选择车类型', + trainPositionX: '请输入x坐标位置', + trainPositionY: '请输入y坐标位置', + pleaseEnterTrainNumber: '请填写车组号', + + trainCode: '列车模型Code不能为空', + pleaseEnterTrainTypeName: '请输入列车类型名称', + trainLength: '请输入列车长度', + safeDistance: '请输入安全距离', + maxSafeDistance: '请输入最大安全距离', + averageVelocity: '请输入平均速度', + averageDeceleration: '请输入平均减速度', + defaultVelocity: '请输入默认速度', + maxVelocity: '请输入最大速度', + + trainWindowWidth: '请输入车次窗宽度', + trainWindowHeight: '请输入车次窗高度', + trainWindowSectionCode: '请输入关联区段', + + visible: '请选择是否可见', }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index 91b6f76d7..c842f827f 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -18,6 +18,10 @@ export default { linkCannotMerged: '不在同一Link上的物理区段不能合并', selectedSectionEmpty: '选择的区段为空', + selectedStationEmpty: '选择的车站为空', + + selectMap: '请先选择地图', + selectTrainType: '请选择查看的列车模型', stationFont: '车站字体', kilometerFont: '公里标字体', diff --git a/src/views/map/mapdraft/mapedit/automaticoperate/preview.vue b/src/views/map/mapdraft/mapedit/automaticoperate/preview.vue index 816dce7e9..0d7447e49 100644 --- a/src/views/map/mapdraft/mapedit/automaticoperate/preview.vue +++ b/src/views/map/mapdraft/mapedit/automaticoperate/preview.vue @@ -33,7 +33,8 @@ export default { name: 'DictionaryDetailEdit', props: { mapInfo: { - type: Object + type: Object, + required: true } }, data() { @@ -50,7 +51,7 @@ export default { if (fieldList.model) { const items = fieldList.model.items; if (fieldList.model.convert) { - data = fieldList.model.convert(data); + // data = fieldList.model.convert(data); } if (items) { this.form = items; diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue index d8532a8fc..9a0634f98 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue @@ -207,7 +207,7 @@ export default { this.$emit('addOrUpdateMapModel', model); } else { - this.$messageBox('选择的车站为空'); + this.$messageBox(this.$t('tip.selectedStationEmpty')); } } }); @@ -242,15 +242,15 @@ export default { const selected = this.$store.getters['map/getDeviceByCode'](this.editModel.code); if (selected && selected._type.toUpperCase() === 'StationControl'.toUpperCase()) { const _that = this; - this.$confirm('是否确认删除?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), { + confirmButtonText: this.$t('tip.confirm'), + cancelButtonText: this.$t('tip.cancel'), type: 'warning' }).then(() => { _that.$emit('delMapModel', _that.selected); _that.deviceSelect(); }).catch(() => { - _that.$message.info('已取消删除'); + _that.$message.info(this.$t('tip.cancelledDelete')); }); } } diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue index 407e5edb3..5568c140b 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue @@ -1,19 +1,19 @@