diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 902f0206a..7c32a30b0 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/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 715691739..2a712b9c2 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -142,6 +142,7 @@ export default { meter: '米', code: '编码:', + codeC: '编码', imageName: '图片名称:', imageWidth: '图片宽度:', imageHeight: '图片高度:', @@ -329,6 +330,7 @@ export default { trainCode: '列车编号:', groupNumber: '车组号:', + trainNumber: '车组号', modelCode: '车类型:', trainmodelCreate: '新建车类型', diff --git a/src/mixin/WindowResizeHandler.js b/src/mixin/WindowResizeHandler.js index e74700b04..53d3ff02b 100644 --- a/src/mixin/WindowResizeHandler.js +++ b/src/mixin/WindowResizeHandler.js @@ -3,8 +3,8 @@ import * as throttleUtil from '@/utils/throttle'; export default { data() { return { - _clientWidth: '', - _clientHeight: '' + _clientWidth: 0, + _clientHeight: 0 }; }, beforeMount() { diff --git a/src/router/index.js b/src/router/index.js index 5faa83896..b2058ee8a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -40,6 +40,7 @@ import Lessoncategory from '@/views/lesson/lessoncategory/index'; import Scriptmanage from '@/views/scriptManage/index'; import ScriptmanageHome from '@/views/scriptManage/home'; +import ScriptDisplay from '@/views/scriptManage/display/index'; import ScriptDetail from '@/views/scriptManage/detail/index'; import Teach from '@/views/teach/index'; @@ -133,6 +134,7 @@ export const userPlan = '015'; // 计划系统 export const UrlConfig = { display: '/display', + scriptDisplay: '/scriptDisplay', examRuleDraft: '/examRule/draft', examRuleManage: '/examRule/manage', map: { @@ -211,7 +213,8 @@ export const UrlConfig = { }, script: { prefix: '/script', - detail: '/script/detail' + detail: '/script/detail', + display: '/script/display' } }; @@ -310,6 +313,13 @@ export const asyncRouter = [ }, hidden: true }, + { + path: '/scriptDisplay/:mode', + component: ScriptDisplay, + meta: { + }, + hidden: true + }, { path: '/trainroom', component: TrainRoom, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 2e575c51e..4050e7e22 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,9 +3,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.4:9000' // 琰培 } else { BASE_API = process.env.VUE_APP_BASE_API; 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/display/index.vue b/src/views/display/index.vue index 76819dbe0..ad44ba7fd 100644 --- a/src/views/display/index.vue +++ b/src/views/display/index.vue @@ -107,6 +107,14 @@ export default { Jl3dDrive }, mixins: [WindowResizeHandler], + props: { + size: { + type: Object, + default() { + return null; + } + } + }, data() { return { mode: '', @@ -235,8 +243,8 @@ export default { }, methods: { resizeHandler() { - const width = this._clientWidth; - const height = this._clientHeight; + const width = this.size ? this.size.width : this._clientWidth; + const height = this.size ? this.size.height : this._clientHeight; this.$store.dispatch('config/resize', { width, height }); @@ -332,9 +340,9 @@ export default { }, // 加载地图数据 async initLoadData() { - const width = document.documentElement.clientWidth; - const height = document.documentElement.clientHeight + 200; - this.$store.dispatch('config/resize', { width, height }); + // const width = document.documentElement.clientWidth; + // const height = document.documentElement.clientHeight + 200; + // this.$store.dispatch('config/resize', { width, height }); this.$store.dispatch('training/reset'); try { diff --git a/src/views/display/menuScript.vue b/src/views/display/menuScript.vue index 40fd70bdd..c342725b7 100644 --- a/src/views/display/menuScript.vue +++ b/src/views/display/menuScript.vue @@ -13,7 +13,7 @@ - + @@ -45,7 +45,8 @@ export default { required: true }, offset: { - type: Number + type: Number, + required: true } }, data() { @@ -101,7 +102,7 @@ export default { selectBeginTime() { this.$refs.setTime.doShow(); }, - resetBeginTime(){ + resetBeginTime() { this.isDisable = false; }, start(model) { diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue index 60210617f..3bef80120 100644 --- a/src/views/display/tipScriptRecord.vue +++ b/src/views/display/tipScriptRecord.vue @@ -1,4 +1,5 @@ \ No newline at end of file + diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue index fae4fa351..3e83e78ee 100644 --- a/src/views/jlmap/index.vue +++ b/src/views/jlmap/index.vue @@ -1,5 +1,5 @@