From 74fea0b56ea9a66bf7a4880f34efa70ddea0223f Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 20 Aug 2019 11:17:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/tip.js | 128 ++++---- src/views/display/demon/chartView.vue | 2 +- src/views/map/mapdraft/mapedit/configMap.vue | 57 +++- .../mapdraft/mapedit/dataRelation/index.vue | 8 +- .../dataRelation/routeoperate/detail.vue | 6 +- .../dataRelation/routeoperate/route.vue | 6 +- src/views/map/mapdraft/mapedit/index.vue | 23 +- .../mapedit/mapoperate/ImageControl.vue | 30 +- .../mapedit/mapoperate/config/list.vue | 14 +- .../mapdraft/mapedit/mapoperate/counter.vue | 29 +- .../mapedit/mapoperate/delayunlock.vue | 29 +- .../map/mapdraft/mapedit/mapoperate/index.vue | 17 +- .../mapdraft/mapedit/mapoperate/lcControl.vue | 30 +- .../mapedit/mapoperate/limitControl.vue | 30 +- .../map/mapdraft/mapedit/mapoperate/line.vue | 18 +- .../map/mapdraft/mapedit/mapoperate/link.vue | 34 +- .../mapdraft/mapedit/mapoperate/section.vue | 53 +++- .../mapdraft/mapedit/mapoperate/signal.vue | 35 ++- .../mapdraft/mapedit/mapoperate/station.vue | 33 +- .../mapedit/mapoperate/stationcontrol.vue | 31 +- .../mapedit/mapoperate/stationstand.vue | 37 ++- .../mapdraft/mapedit/mapoperate/switch.vue | 32 +- .../map/mapdraft/mapedit/mapoperate/text.vue | 30 +- .../mapdraft/mapedit/mapoperate/train.bak.vue | 297 ------------------ .../mapedit/mapoperate/train/index.vue | 60 +--- .../mapedit/mapoperate/trainmodel.bak.vue | 186 ----------- .../mapedit/mapoperate/trainwindow.vue | 29 +- .../mapdraft/mapedit/mapoperate/zcControl.vue | 32 +- 28 files changed, 536 insertions(+), 780 deletions(-) delete mode 100644 src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue delete mode 100644 src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 42700b811..a327dbedc 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -1,79 +1,79 @@ export default { - confirm: '确 定', - cancel: '取 消', - creatingSuccessful: '创建成功！', - creatingFailed: '创建失败', - confirmDeletion: '是否确认删除？', - confirmBatchGeneration: '是否确认批量生成？', - hint: '提示', - cancelledDelete: '已取消删除', - cancelGeneration: '已取消批量生成', + confirm: 'confirm', + cancel: 'cancel', + creatingSuccessful: 'Created successfully!', + creatingFailed: 'Create a failure', + confirmDeletion: 'Confirm deletion?', + confirmBatchGeneration: 'Is batch generation confirmed?', + hint: 'hint', + cancelledDelete: 'Cancelled delete', + cancelGeneration: 'Batch generation has been cancelled', - updateSuccessfully: '更新成功', - saveSuccessfully: '保存成功', - saveFailed: '保存失败', - updateFailed: '更新失败', - successfullyDelete: '删除成功', - failDelete: '删除失败', - operationAbnormal: '操作异常', - createSuccess: '创建成功', + updateSuccessfully: 'The update is successful', + saveSuccessfully: 'Save success', + saveFailed: 'Save failed', + updateFailed: 'Update failed', + successfullyDelete: 'Delete the success', + failDelete: 'Delete failed', + operationAbnormal: 'Abnormal operation', + createSuccess: 'Creating a successful', - cannotCoincide: '起始坐标和结束坐标不能重合', - cannotMerged: '存在非物理区段，不能合并', - linkCannotMerged: '不在同一Link上的物理区段不能合并', + cannotCoincide: 'The starting and ending coordinates cannot coincide', + cannotMerged: 'Non-physical extents exist and cannot be merged', + linkCannotMerged: 'Physical extents that are not on the same Link cannot be merged', - selectedSectionEmpty: '选择的区段为空', - selectedStationEmpty: '选择的车站为空', + selectedSectionEmpty: 'The selected section is empty', + selectedStationEmpty: 'The selected station is empty', - selectMap: '请先选择地图', - selectTrainType: '请选择查看的列车模型', + selectMap: 'Please select the map first', + selectTrainType: 'Please select the train model to view', - stationFont: '车站字体', - kilometerFont: '公里标字体', - meter: '米', - angle: '度', + stationFont: 'The font', + kilometerFont: 'Kilometer mark font', + meter: 'meter', + angle: 'angle', - operationSuccessfully: '操作成功', - operationFailed: '操作失败', - setupSuccessfully: '设置成功', - setupFailed: '设置失败', - recoveryPrivilegesSuccessful: '回收权限成功', - recoveryPrivilegesFailed: '回收权限失败', - unpackingSuccessful: '解包成功', - unpackingFailed: '解包失败', - pleaseEnterNameQuery: '请输入名称查询', - routeSameID: '相同ID的数据已存在', + operationSuccessfully: 'Operation is successful', + operationFailed: 'The operation failure', + setupSuccessfully: 'Set up the success', + setupFailed: 'Setup failed', + recoveryPrivilegesSuccessful: 'Successful recovery authority', + recoveryPrivilegesFailed: 'Recovery authority failed', + unpackingSuccessful: 'Unpack the success', + unpackingFailed: 'Unpack the failure', + pleaseEnterNameQuery: 'Please enter name query', + routeSameID: 'Data with the same ID already exists', - skinDeleteSuccessfully: '删除皮肤成功', - skinDeleteFailed: '删除皮肤失败', - publishedOperationalGraphSuccessfully: '发布运行图成功', - publishedOperationalGraphFailed: '发布运行图失败', - deleteOperationGraphFailed: '删除运行图失败', - importOperationGraphSuccessfully: '导入运行图成功!', - importOperationGraphFailed: '导入运行图失败!', - parsingOperationGraphFailed: '解析运行图失败!', - productCreationSuccessfully: '创建产品成功', - productCreationFailed: '创建产品失败', - updateProductSuccessfully: '更新产品成功', - updateProductFailed: '更新产品失败', - deleteProductSuccessfully: '删除产品成功', - deleteProductFailed: '删除产品失败', - cannotDeleteProduct: '产品已被使用无法删除', - pathCreationSuccessful: '创建交路成功！', - createRoutingFailed: '创建交路失败', - pathUpdataSuccessful: '更新交路成功！', - pathUpdataFailed: '更新交路失败', + skinDeleteSuccessfully: 'Skin removed successfully', + skinDeleteFailed: 'Failed to remove skin', + publishedOperationalGraphSuccessfully: 'Published operational diagram successfully', + publishedOperationalGraphFailed: 'Failed to publish operation diagram', + deleteOperationGraphFailed: 'Failed to delete operation diagram', + importOperationGraphSuccessfully: 'The operation diagram was successfully imported!', + importOperationGraphFailed: 'Failed to import operation diagram!', + parsingOperationGraphFailed: 'Failed to parse the operational diagram!', + productCreationSuccessfully: 'Product creation success', + productCreationFailed: 'Failed to create product', + updateProductSuccessfully: 'Product update is successful.', + updateProductFailed: 'Product update failed', + deleteProductSuccessfully: 'Product deleted successfully', + deleteProductFailed: 'Product deletion failed', + cannotDeleteProduct: 'The product has been used and cannot be deleted', + pathCreationSuccessful: 'Create road successfully!', + createRoutingFailed: 'Failed to create junction', + pathUpdataSuccessful: 'Road update successful!', + pathUpdataFailed: 'Update traffic failed', - failedLoadMap: '加载地图数据失败', - sectionPointsDeficiency: '区段坐标缺失', + failedLoadMap: 'Failed to load map data', + sectionPointsDeficiency: 'Segment coordinates missing', - dataValidationFailed: '数据校验不通过', - dataValidationSuccess: '数据校验通过！', + dataValidationFailed: 'Data validation failed', + dataValidationSuccess: 'Data verified!', - requestFailed: '请求失败', + requestFailed: 'The request failed', - dataQuestion: '有问题数据', - dataList: '数据列表', + dataQuestion: 'Data in question', + dataList: 'Data list', updateProductTip: 'Will this operation modify the commodity status?', deleteProductTip: 'This operation will delete the item. Do you want to continue?', diff --git a/src/views/display/demon/chartView.vue b/src/views/display/demon/chartView.vue index bb5908139..660f72e74 100644 --- a/src/views/display/demon/chartView.vue +++ b/src/views/display/demon/chartView.vue @@ -267,7 +267,7 @@ export default { group: this.group, conversationId: this.conversationId }; - const res = await postDataBd(param).catch(error => { + await postDataBd(param).catch(error => { this.sending = false; const message = JSON.parse(error.message); if (message.err_no == 3301) { diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue index a609125fc..0f377d721 100644 --- a/src/views/map/mapdraft/mapedit/configMap.vue +++ b/src/views/map/mapdraft/mapedit/configMap.vue @@ -7,8 +7,8 @@ - - + + {{ $t('map.logicalView') }} @@ -28,6 +28,12 @@ {{ view.name }} + + + + {{ view.name }} + + @@ -53,8 +59,15 @@ export default { { code: 'Signal', name: this.$t('map.signal') }, { code: 'Switch', name: this.$t('map.switch') } ], + HybridViewTypeList: [], + + defaultLogicalSelect: [], + defaultPhysicalSelect: [], + defaultHybridSelect: [], + logicalLevelsSelect: [], - physicalLevelsSelect: [] + physicalLevelsSelect: [], + hybridLevelsSelect: [] // 混合图层 }; }, watch: { @@ -75,22 +88,40 @@ export default { initPage() { this.$Dictionary.logicalViewType().then(list => { this.LogicalViewTypeList = list; + list.forEach(v => { + this.HybridViewTypeList.push(v); + this.hybridLevelsSelect.push(v.code); + this.defaultHybridSelect.push(v.code); + }); this.LogicalViewTypeList.forEach(elem => { this.logicalLevelsSelect.push(elem.code); + this.defaultLogicalSelect.push(elem.code); }); }); this.$Dictionary.physicalViewType().then(list => { this.PhysicalViewTypeList = list; + list.forEach(v => { + this.HybridViewTypeList.push(v); + this.hybridLevelsSelect.push(v.code); + this.defaultHybridSelect.push(v.code); + }); this.PhysicalViewTypeList.forEach(elem => { this.physicalLevelsSelect.push(elem.code); + this.defaultPhysicalSelect.push(elem.code); }); }); }, handleSelectView(value) { if (value.length == 2) { this.$emit('handleSelectView', '03'); + this.hybridLevelsSelect = this.copyList(this.defaultHybridSelect); } else { this.$emit('handleSelectView', value); + if (this.viewSelect[0] == this.ViewMode.LOGIC) { + this.logicalLevelsSelect = this.copyList(this.defaultLogicalSelect); + } else { + this.physicalLevelsSelect = this.copyList(this.defaultPhysicalSelect); + } } }, handleSelectLogicalView(handle) { @@ -98,6 +129,12 @@ export default { }, handleSelectPhysicalView(handle) { this.$emit('handleSelectPhysicalView', handle); + }, + handleSelectHybridView(handle) { + this.$emit('handleSelectHybridView', handle); + }, + copyList(list) { + return JSON.parse(JSON.stringify(list)); } } }; @@ -126,11 +163,11 @@ export default { right: 24px; top: 43px; z-index: 10; - padding: 15px; .title{ - margin-bottom: 8px; overflow: hidden; + border-bottom: 1px solid #ccc; + padding: 9px; .fl-title{ float: left; } @@ -140,17 +177,23 @@ export default { } } + .content_box{ + padding: 15px; + padding-top: 4px; + } + /deep/{ .el-dialog__body{ padding: 0 8px 8px 21px; } .el-checkbox{ - margin-right: 14px; + margin-right: 10px; + width: 75px; } .el-form-item{ - margin-bottom: 2px; + margin-bottom: -4px; } } } diff --git a/src/views/map/mapdraft/mapedit/dataRelation/index.vue b/src/views/map/mapdraft/mapedit/dataRelation/index.vue index 8e79be55d..e3c56f266 100644 --- a/src/views/map/mapdraft/mapedit/dataRelation/index.vue +++ b/src/views/map/mapdraft/mapedit/dataRelation/index.vue @@ -28,7 +28,7 @@ @click="showMap" >{{ $t('map.viewLayer') }} - + s - + -
-
+
+
-
+
@@ -40,6 +38,7 @@ @handleSelectView="handleSelectView" @handleSelectLogicalView="handleSelectLogicalView" @handleSelectPhysicalView="handleSelectPhysicalView" + @handleSelectHybridView="handleSelectHybridView" />
@@ -57,7 +56,6 @@ import { EventBus } from '@/scripts/event-bus'; import ConfigMap from './configMap'; import DataRelation from './dataRelation/index'; -import { setTimeout } from 'timers'; export default { name: 'MapView', @@ -80,8 +78,7 @@ export default { autoSaveTask: null, selected: null, mapInfo: { name: this.$t('map.pleaseSelectMap') }, - timeDemon: null, - loading: false + timeDemon: null }; }, watch: { @@ -123,10 +120,7 @@ export default { this.$refs.configMap.doShow(); }, selectViewDraft(data) { - this.loading = true; - setTimeout(() => { - this.viewDraft = data; - }, 300); + this.viewDraft = data; }, loadInitPage() { this.$store.dispatch('training/changeMode', { mode: TrainingMode.MAP_EDIT }); @@ -178,6 +172,11 @@ export default { this.$refs.jlmapVisual.setLevelVisible(handle); } }, + handleSelectHybridView(handle) { + if (this.$refs && this.$refs.jlmapVisual) { + this.$refs.jlmapVisual.setLevelVisible(handle); + } + }, clickEvent(em) { var device = this.getDeviceByEm(em); this.onSelect(device); diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue index edee0f19e..e23552c46 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue @@ -1,22 +1,26 @@