From fd5ab1f30d5e98da1805b17fd557b4bce1ca9048 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 19 Aug 2019 14:01:45 +0800 Subject: [PATCH] =?UTF-8?q?desc:=20=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=20?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/zh/map.js | 3 ++ src/views/map/mapdraft/mapedit/configMap.vue | 6 +-- .../dataRelation/pathoperate/route.vue | 2 - .../mapdraft/mapedit/mapoperate/signal.vue | 4 +- .../mapdraft/mapedit/mapoperate/switch.vue | 2 +- .../mapedit/mapoperate/trainmodel.bak.vue | 40 +++++++++---------- 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 435c37198..d3c9b47cf 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -20,6 +20,9 @@ export default { drawMap: '绘图', advanced: '高级', viewLayer: '视图图层', + layerDisplay: '图层显示', + viewShows: '视图显示', + contentShows: '内容显示', save: '保存', updata: '更新', diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue index 47ef12d74..a609125fc 100644 --- a/src/views/map/mapdraft/mapedit/configMap.vue +++ b/src/views/map/mapdraft/mapedit/configMap.vue @@ -2,20 +2,20 @@
-
图层显示
+
{{ $t('map.layerDisplay') }}
- + {{ $t('map.logicalView') }} {{ $t('map.physicalView') }} - + diff --git a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/route.vue b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/route.vue index ec8f90964..80b0373e2 100644 --- a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/route.vue +++ b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/route.vue @@ -247,13 +247,11 @@ export default { this.$refs.form.validate((valid) => { if (valid) { this.display = 2; - this.handleSelectView(ViewMode.MIX); } }); }, lastStep() { this.display = 1; - this.handleSelectView(ViewMode.PHYSICAL); }, buildModel() { this.addModel.mapRouteUnitRelList.forEach((elem, index) => { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue index 880d7dcf4..cc7c42334 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue @@ -205,7 +205,7 @@ export default { { prop: 'name', label: this.$t('map.signalNameColon'), type: 'input' }, { prop: 'nameShow', label: this.$t('map.signalDisplayName'), type: 'checkbox' }, { prop: 'lampPostType', label: this.$t('map.lampPostType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPostTypeList }, - { prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList }, + { prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList }, { prop: 'directionType', label: this.$t('map.signalDirectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalDirectionTypeList }, { prop: 'positionType', label: this.$t('map.signalPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalPositionTypeList }, { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.signalPositionX'), type: 'number', placeholder: 'px' }, @@ -228,7 +228,7 @@ export default { { prop: 'useType', label: this.$t('map.signalUseType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalUseTypeList }, { prop: 'potLampType', label: this.$t('map.potLampType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalPotLampTypeList }, { prop: 'linkCode', label: 'LinkCode:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList }, - { prop: 'offset', label: this.$t('map.signalOffset'), type: 'number', min: 0, placeholder: this.$t('tip.meter') }, + { prop: 'offset', label: this.$t('map.signalOffset'), type: 'number', min: 0, placeholder: this.$t('tip.meter') } ] } diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue index 642189996..f86f8ce36 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue @@ -112,7 +112,7 @@ export default { ] }, map: { - name: '绘图数据', + name: '地图数据', item: [ { prop: 'turnTime', label: this.$t('map.turnTime'), type: 'number', min: 0, max: 1000, placeholder: 's' }, { prop: 'sectionACode', label: this.$t('map.sectionACode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList }, diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue index 218771f38..93244cbaa 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue @@ -1,5 +1,5 @@ @@ -73,31 +73,31 @@ export default { addRules: function () { return { code: [ - { required: true, message: '列车模型Code不能为空', trigger: 'change' } + { required: true, message: this.$t('rules.trainCode'), trigger: 'change' } ], name: [ - { required: true, message: '请输入列车类型名称', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseEnterTrainTypeName'), trigger: 'change' } ], length: [ - { required: true, message: '请输入列车长度', trigger: 'change' } + { required: true, message: this.$t('rules.trainLength'), trigger: 'change' } ], safeDistance: [ - { required: true, message: '请输入安全距离', trigger: 'change' } + { required: true, message: this.$t('rules.safeDistance'), trigger: 'change' } ], maxSafeDistance: [ - { required: true, message: '请输入最大安全距离', trigger: 'change' } + { required: true, message: this.$t('rules.maxSafeDistance'), trigger: 'change' } ], averageVelocity: [ - { required: true, message: '请输入平均速度', trigger: 'change' } + { required: true, message: this.$t('rules.averageVelocity'), trigger: 'change' } ], averageDeceleration: [ - { required: true, message: '请输入平均减速度', trigger: 'change' } + { required: true, message: this.$t('rules.averageDeceleration'), trigger: 'change' } ], defaultVelocity: [ - { required: true, message: '请输入默认速度', trigger: 'change' } + { required: true, message: this.$t('rules.defaultVelocity'), trigger: 'change' } ], maxVelocity: [ - { required: true, message: '请输入最大速度', trigger: 'change' } + { required: true, message: this.$t('rules.maxVelocity'), trigger: 'change' } ] }; },