diff --git a/src/api/jmap/training.js b/src/api/jmap/training.js index 4b4b16e5c..516158387 100644 --- a/src/api/jmap/training.js +++ b/src/api/jmap/training.js @@ -53,9 +53,9 @@ export function getTrainingTree() { } /** 获取章节基本信息*/ -export function getTrainingDetail(args) { +export function getTrainingDetail(trainingId) { return request({ - url: `/api/training/${args.id}`, + url: `/api/training/${trainingId}`, method: 'get' }); } diff --git a/src/api/simulation.js b/src/api/simulation.js index bc3594bb6..1ec95ce0a 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -435,3 +435,19 @@ export function saveTaskScript(group, data) { data }); } + +/** 暂停剧本编制的仿真 */ +export function scriptPause(group) { + return request({ + url: `/api/simulation/${group}/scriptWrite/pause`, + method: 'post' + }); +} + +/** 恢复仿真运行并执行刚编辑的剧本动作 */ +export function executeScript(group) { + return request({ + url: `/api/simulation/${group}/scriptWrite/execute`, + method: 'post' + }); +} diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js index 37c3bf268..30fa912f3 100644 --- a/src/i18n/langs/en/error.js +++ b/src/i18n/langs/en/error.js @@ -3,6 +3,7 @@ export default { createSimulationFailed: 'Failure to create simulation', loadMapDataFailed: 'Failed to load map data', getMapStepsFailed: 'Failed to get map step data', + getMapDetailFailed: 'Failed to get map detail', resetFailed: 'Reset failure', startTrainingFailed: 'Failure to start training', saveBackgroundFailed: 'Failed to save background', @@ -39,5 +40,10 @@ export default { codeHasExist: 'Coding already exists', formartError: 'The format is incorrect, only characters/numbers/_', createDictionaryFailed: 'Failed to create dictionary', - updateDictionaryFailed: 'Failed to update dictionary' + updateDictionaryFailed: 'Failed to update dictionary', + createDetailFailed: 'Failed to create details', + updateDetailFailed: 'Failed to update details', + addFailed: 'Failure to add', + updateFailed: 'Failure to update' + }; diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js index 3e76f9476..5f7dc44cc 100644 --- a/src/i18n/langs/en/global.js +++ b/src/i18n/langs/en/global.js @@ -75,9 +75,10 @@ export default { synthesisTrainingTitle: 'Synthesis Training Fast Entrance', pleaseChooseRoom: 'You did not choose a room', inviteJoinRoom: 'Invite you to join the synthesis training!', - trainingHasStart: "(name)'s room has begun", - trainingNotStart: "(name)'s room hasn't started yet", + trainingHasStart: "{name}'s room has begun", + trainingNotStart: "{name}'s room hasn't started yet", inputRoomNumber: 'Please enter the room number.', - chooseRoom: 'Choose Room' + chooseRoom: 'Choose Room', + month: 'month' }; diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index 632c20fe7..94037d77d 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -302,16 +302,8 @@ export default { skinDesignation: 'SkinName', skinCoding: 'SkinCoding', coordinatesOrigin: 'CoordinatesOrigin', - skinDeleteConfirmation: 'This will permanently remove the skin. Do you want to continue?', addMapSkin: 'AddMapSkin', updateMapSkin: 'UpdateMapSkin', - maxScaling: '(The maximum scale is 8 steps)', - skinCodingInput: 'Please enter skin code', - skinDesignationInput: 'Please enter skin name', - coordinatesOriginInput: 'Please enter the origin coordinates', - scalingInput: 'Please enter the scale', - scalingInputPrompt: 'Please enter a valid scale', - skinCodingExist: 'Map skin codes already exist', stationKilometerMark: 'StationKilometerMark', arrivalTime: 'ArrivalTime', operationGraphPublished: 'The operation diagram is published as', @@ -320,10 +312,8 @@ export default { importOperationGraph: 'ImportOperationGraph', publishOperationGraph: 'PublishOperationGraph', deleteOperationGraph: 'DeleteOperationGraph', - underImport: 'UnderImport...', mapList: 'MapList', import: 'Import', - selectImportFiles: 'Select the file you want to import', createNewOperationGraph: 'CreateNewOperationGraph', setOperatingSpeed: 'SetOperatingSpeed', speedClass1: 'SpeedLevel 1', @@ -336,29 +326,17 @@ export default { stopTime: 'StopTime', entranceStation: 'EntranceStation', exportStation: 'ExportStation', - speedLevelEnter1: 'Please enter speed level 1', - speedLevelEnter2: 'Please enter speed level 2', - speedLevelEnter3: 'Please enter speed level 3', - speedLevelEnter4: 'Please enter speed level 4', - nameEnter: 'Please enter name', - drivingDirectionSelect: 'Please choose your driving direction', - timeBetweenDeparturesEnter: 'Please enter the interval', - stopTimeEnter: 'Please enter the docking time', - entranceStationSelect: 'Please select the entrance', - exportStationSelect: 'Please select the exit gate', validityCheck: 'ValidityCheck', setupOperationGraph: 'SetupOperationGraph', selectOperationGraphDataRange: 'SelectOperationGraphDataRange', to: 'to', selectionTimeRange: 'Please select time range', - selectDataRange: 'Please select the data range range', pointSystem1: 'OnePointSystem', pointSystem2: 'TwoPointSystem', pointSystem5: 'FivePointSystem', skinType: 'SkinType', turnoverTime: 'TurnoverTime', productList: 'ProductList', - deleteTypeHint: 'This action deletes the type. Do you want to continue?', belongsToMapName: 'BelongsToMapName', productType: 'ProductType', productCode: 'ProductCode', @@ -367,20 +345,11 @@ export default { associateTrainingTypes: 'AssociateTrainingTypes', createTrainingCategories: 'CreateTrainingCategories', editTrainingCategories: 'EditTrainingCategories', - productCodeEnter: 'Please enter the product code', - productNameEnter: 'Please enter product name', - productDescriptionEnter: 'Please enter product description', - trainingTypeSelect: 'Please select the associated training type', linkWidth: 'LinkWidth', maxLinkWidth: '(Link width is at most 20)', sectionWidth: 'SectionWidth', maxSectionWidth: '(Section width is maximum 30)', showWatermarkOrNot: 'ShowWatermarkOrNot', - linkWidthInput: 'Please enter Link width', - linkWidthInputPrompt: 'Please enter a valid Link width', - sectionWidthInput: 'Please enter section width', - sectionWidthInputPrompt: 'Please enter a valid segment width', - selectShowWatermark: 'Select whether or not to watermark', stationstandName: 'Select station name:', stationstandDirection: 'Direction of the platform:', stationstandHasDoor: 'Whether to display screen door:', diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js index 64514d27b..820341d33 100644 --- a/src/i18n/langs/en/orderAuthor.js +++ b/src/i18n/langs/en/orderAuthor.js @@ -1,86 +1,88 @@ export default { name: 'Name', - productType: 'ProductType', + productType: 'Product type', map: 'Map', state: 'State', - commodityName: 'CommodityName', - mapName: 'MapName', - courseName: 'CourseName', + commodityName: 'Commodity name', + mapName: 'Map name', + courseName: 'Course name', price: 'Price', describtion: 'Describtion', - creationTime: 'CreationTime', - setupFailure: 'SetupFailure', - setupEffective: 'SetupEffective', + creationTime: 'Creation time', + setupFailure: 'Setup failure', + setupEffective: 'Setup effective', organizationOrEnterprise: 'Organization/Enterprise', - userName: 'UserName', - permissionType: 'PermissionType', - permissionNumber: 'PermissionNumber', - permanenceOrNot: 'PermanenceOrNot', + userName: 'User Name', + permissionType: 'Permission type', + permissionNumber: 'Permission number', + permanenceOrNot: 'Permanence or not', startDate: 'StartDate', - purchaseMonths: 'PurchaseMonths', - totalPrice: 'TotalPrice', - paymentMethod: 'PaymentMethod', - creationDate: 'CreationDate', - orderType: 'OrderType', - contractNumber: 'ContractNumber', - businessType: 'BusinessType', - paymentStatus: 'PaymentStatus', + purchaseMonths: 'Purchase months', + totalPrice: 'Total price', + paymentMethod: 'Payment method', + creationDate: 'Creation date', + orderType: 'Order type', + contractNumber: 'Contract number', + businessType: 'Business type', + paymentStatus: 'Payment status', salesman: 'Salesman', - obtainQrCode: 'ObtainQrCode', - userMobile: 'UserMobile', - mapProductName: 'MapProductName', + obtainQrCode: 'Obtain QrCode', + userMobile: 'User mobile', + mapProductName: 'Map product name', publicOrPrivate: 'Public/Private', - totalPermissions: 'TotalPermissions', - residualPermissionNumber: 'ResidualPermissionNumber', - authorityStatus: 'AuthorityStatus', + totalPermissions: 'Total permissions', + residualPermissionNumber: 'Residual permissionNumber', + authorityStatus: 'Authority status', startTime: 'StartTime', endTime: 'EndTime', - courseAuthorityStatus: 'CourseAuthorityStatus', + courseAuthorityStatus: 'Course authority status', source: 'Source', - founderPhone: 'FounderPhone', + founderPhone: 'Founder phone', founder: 'Founder', - privilegePackaging: 'PrivilegePackaging', + privilegePackaging: 'Privilege packaging', packaging: 'Packaging', unpacking: 'Unpacking', - authorityDetails: 'AuthorityDetails', + authorityDetails: 'Authority details', renew: 'Renew', - productName: 'ProductName', + productName: 'Product name', recovery: 'Recovery', - permissionPack: 'PermissionPack', - privilegeTransferQRCode: 'PrivilegeTransferQRCode', - generatingQRCode: 'GeneratingQRCode', - transferQRCode: 'TransferQRCode', + permissionPack: 'Permission pack', + privilegeTransferQRCode: 'Privilege transfer QRCode', + generatingQRCode: 'Generating QRCode', + transferQRCode: 'Transfer QRCode', today: 'Today', yesterday: 'Yesterday', - aWeekAgo: 'AWeekAgo', - updateOrder: 'UpdateOrder', - renewOrder: 'RenewOrder', - unknownRouter: 'UnknownRouter', - increasePurchaseTime: 'IncreasePurchaseTime', - choosePurchaseTime: 'ChoosePurchaseTime', - increasePermissionNumber: 'IncreasePermissionNumber', - choosePermissionNumber: 'ChoosePermissionNumber', + addOrder: 'AddOrder', + aWeekAgo: 'A week ago', + updateOrder: 'Update order', + renewOrder: 'Renew order', + unknownRouter: 'Unknown router', + increasePurchaseTime: 'Increase purchase time', + choosePurchaseTime: 'Choose purchase time', + increasePermissionNumber: 'Increase permission number', + choosePermissionNumber: 'Choose permission number', itemPricing: 'itemPricing', addUserPermissions: 'Add user permissions', - publicAuthority: 'PublicAuthority', - privateAuthority: 'PrivateAuthority', + publicAuthority: 'Public authority', + privateAuthority: 'Private authority', optionPrivilegeTransfer: 'Option privilege transfer', - trainingList: 'TrainingList', + trainingList: 'Training list', selectPermissionsPackage: 'Select package authority', - addRecords: 'AddRecords', - totalNumber: 'TotalNumber', + addRecords: 'Add records', + totalNumber: 'Total number', permissionToDistributeQRCode: 'Permission to distribute qr code', - selectPackagingRecord: 'Please select the packaging record', editPermissionRules: 'Edit permission rules', - addGoods: 'AddGoods', - updateGoods: 'UpdateGoods', + addGoods: 'Add goods', + updateGoods: 'Update goods', lesson: 'Lesson', whetherTrial: 'WhetherTrial', - unitOfTime: 'UnitOfTime', - trialTime: 'TrialTime', - distributionUser: 'DistributionUser', - orderNumber: 'OrderNumber', - sourcesOfInformation: 'SourcesOfInformation', - distributePermission: 'DistributePermission', - orderCreation: 'OrderCreation' + unitOfTime: 'Unit of time', + trialTime: 'Trial time', + distributionUser: 'Distribution user', + orderNumber: 'Order Number', + select: 'Select', + sourcesOfInformation: 'Sources of information', + distributePermission: 'Distribute permission', + orderCreation: 'Order creation', + chooseGoods: 'Choose goods' }; diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index e4d54884c..43dc28eb8 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -180,6 +180,37 @@ export default { unitOfTimeRadio: 'Please select a time unit', goodsDescribtionInput: 'Please enter product description', userNameInput: 'Please enter user name', - permissionTypeInput: 'Please select the permission type' + permissionTypeInput: 'Please select the permission type', + timeInput: 'Please enter the time', + chooseUser: 'Please select the user', + pleaseInputLessonName: 'Please enter the course name', + pleaseSelectTraining: 'Please select training', + + maxScaling: '(The maximum scale is 8 steps)', + skinCodingInput: 'Please enter skin code', + skinDesignationInput: 'Please enter skin name', + coordinatesOriginInput: 'Please enter the origin coordinates', + scalingInput: 'Please enter the scale', + scalingInputPrompt: 'Please enter a valid scale', + selectImportFiles: 'Select the file you want to import', + speedLevelEnter1: 'Please enter speed level 1', + speedLevelEnter2: 'Please enter speed level 2', + speedLevelEnter3: 'Please enter speed level 3', + speedLevelEnter4: 'Please enter speed level 4', + drivingDirectionSelect: 'Please choose your driving direction', + timeBetweenDeparturesEnter: 'Please enter the interval', + stopTimeEnter: 'Please enter the docking time', + entranceStationSelect: 'Please select the entrance', + exportStationSelect: 'Please select the exit gate', + selectDataRange: 'Please select the data range range', + productCodeEnter: 'Please enter the product code', + productNameEnter: 'Please enter product name', + productDescriptionEnter: 'Please enter product description', + trainingTypeSelect: 'Please select the associated training type', + linkWidthInput: 'Please enter Link width', + linkWidthInputPrompt: 'Please enter a valid Link width', + sectionWidthInput: 'Please enter section width', + sectionWidthInputPrompt: 'Please enter a valid segment width', + selectShowWatermark: 'Select whether or not to watermark' }; diff --git a/src/i18n/langs/en/system.js b/src/i18n/langs/en/system.js index ada9a3241..eeb86c0a7 100644 --- a/src/i18n/langs/en/system.js +++ b/src/i18n/langs/en/system.js @@ -11,8 +11,8 @@ export default { updateSuccess: 'Update successful', destory: 'Destory', simulationGroup: 'Simulation Group', - username: 'User Name', - phoneNumber: 'Cell-phone Number', + userName: 'User Name', + mobile: 'Cell-phone Number', skinCode: 'Skin Code', prdType: 'Product Type', simulationType: 'Simulation Type', @@ -21,5 +21,34 @@ export default { isError: 'Is Error', isSuspend: 'Is Suspend', isDrivingAsplanned: 'Whether to drive as planned', - delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?' + delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?', + createDetail: 'Create details', + editDetail: 'Editorial details', + mapName: 'Map Name', + trainingName: 'Training Name', + trainingUseTime: 'Training Time', + minute: 'Minute', + second: 'Second', + createSimulationTitle: 'Create Simulation Information', + addSuccess: 'Added Successfully', + pleaseInputNames: 'Please enter your nickname/name/cell phone number', + examUser: 'Examination Users', + examScore: 'Examination Score', + examResult: 'Examination Results', + examName: 'Paper Name', + delExamResultIsContinue: 'This operation will delete the test result. Do you want to continue?', + editExamDetail: 'Edit exam details', + subscribeMap: 'Subscribe', + roles: 'Roles', + email: 'Email', + nickname: 'Nickname', + delTypeIsContinue: 'This operation will delete the type. Do you want to continue?', + permission: 'Permission', + editUserPermission: 'Edit User Rights', + lessonName: 'Lesson Name', + selectTraining: 'Selection Training', + createUserTraining: 'Creating User Training', + editTrainingDetail: 'Editor Training Details', + trainingTime: 'Training duration' + }; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index a327dbedc..7c32a30b0 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -83,5 +83,11 @@ export default { updatePrivilegeTip: 'This action will modify the permission status. Do you want to continue?', addOrganizationPrefix: 'Whether to add "', addOrganizationSuffix: '" Organization/enterprise entry information?', - packagingFailed: 'Authority distribution packaging failed' + packagingFailed: 'Authority distribution packaging failed', + selectPackagingRecord: 'Please select the packaging record', + + skinDeleteConfirmation: 'This will permanently remove the skin. Do you want to continue?', + skinCodingExist: 'Map skin codes already exist', + underImport: 'UnderImport...', + deleteTypeHint: 'This action deletes the type. Do you want to continue?' }; diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js index 1b35b669c..9d2918ead 100644 --- a/src/i18n/langs/zh/error.js +++ b/src/i18n/langs/zh/error.js @@ -2,7 +2,8 @@ export default { refreshFailed: '刷新失败', createSimulationFailed: '创建仿真失败', loadMapDataFailed: '加载地图数据失败', - getMapStepsFailed: '获取地图步骤数据', + getMapStepsFailed: '获取地图步骤数据失败', + getMapDetailFailed: '获取地图详细信息失败', resetFailed: '重置失败', startTrainingFailed: '开始实训失败', saveBackgroundFailed: '保存背景失败', @@ -39,6 +40,10 @@ export default { codeHasExist: '编码已存在', formartError: '格式不正确，只能是字符/数字/_', createDictionaryFailed: '创建字典失败', - updateDictionaryFailed: '更新字典失败' + updateDictionaryFailed: '更新字典失败', + createDetailFailed: '创建明细失败', + updateDetailFailed: '更新明细失败', + addFailed: '添加失败', + updateFailed: '更新失败' }; diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js index 7ac7adcb7..a54e0ebcf 100644 --- a/src/i18n/langs/zh/global.js +++ b/src/i18n/langs/zh/global.js @@ -76,8 +76,9 @@ export default { synthesisTrainingTitle: '综合演练快速入口', pleaseChooseRoom: '您没有选择房间', inviteJoinRoom: '邀请你加入综合演练！', - trainingHasStart: '{{name}}的房间已开始', - trainingNotStart: '{{name}}的房间未开始', + trainingHasStart: '{name}的房间已开始', + trainingNotStart: '{name}的房间未开始', inputRoomNumber: '请输入房间号', - chooseRoom: '选择房间' + chooseRoom: '选择房间', + month: '月' }; diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 9aa81979a..715691739 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -415,16 +415,8 @@ export default { skinDesignation: '皮肤名称', skinCoding: '皮肤编码', coordinatesOrigin: '坐标原点', - skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?', addMapSkin: '添加地图皮肤', updateMapSkin: '更新地图皮肤', - maxScaling: '(缩放比例最大为8级)', - skinCodingInput: '请输入皮肤编码', - skinDesignationInput: '请输入皮肤名称', - coordinatesOriginInput: '请输入原点坐标', - scalingInput: '请输入缩放比例', - scalingInputPrompt: '请输入有效的缩放比例', - skinCodingExist: '地图皮肤编码已存在', stationKilometerMark: '车站公里标', arrivalTime: '到站时间', operationGraphPublished: '运行图发布为', @@ -433,10 +425,8 @@ export default { importOperationGraph: '导入运行图', publishOperationGraph: '发布运行图', deleteOperationGraph: '删除运行图', - underImport: '正在导入中...', mapList: '地图列表', import: '导入', - selectImportFiles: '请选择需要导入的文件', createNewOperationGraph: '新建运行图', setOperatingSpeed: '设置运行速度', speedClass1: '速度等级1', @@ -449,29 +439,17 @@ export default { stopTime: '停靠时间', entranceStation: '入口车站', exportStation: '出口车站', - speedLevelEnter1: '请输入速度等级1', - speedLevelEnter2: '请输入速度等级2', - speedLevelEnter3: '请输入速度等级3', - speedLevelEnter4: '请输入速度等级4', - nameEnter: '请输入名称', - drivingDirectionSelect: '请选择行驶方向', - timeBetweenDeparturesEnter: '请输入发车间隔时间', - stopTimeEnter: '请输入停靠时间', - entranceStationSelect: '请选择入站口', - exportStationSelect: '请选择出站口', validityCheck: '有效性检查', setupOperationGraph: '设置运行图', selectOperationGraphDataRange: '选取运行图数据范围', to: '至', selectionTimeRange: '选择时间范围', - selectDataRange: '请选择数据范围区间', pointSystem1: '1分制', pointSystem2: '2分制', pointSystem5: '5分制', skinType: '皮肤风格', turnoverTime: '更新时间', productList: '产品列表', - deleteTypeHint: '此操作将删除该类型, 是否继续？', belongsToMapName: '所属地图名称', productType: '产品类型', productCode: '产品编码', @@ -480,20 +458,11 @@ export default { associateTrainingTypes: '关联实训类型', createTrainingCategories: '创建实训类目', editTrainingCategories: '编辑实训类目', - productCodeEnter: '请输入产品编码', - productNameEnter: '请输入产品名称', - productDescriptionEnter: '请输入产品说明', - trainingTypeSelect: '请选择关联实训类型', linkWidth: 'link宽度', maxLinkWidth: '(Link宽度最大为20)', sectionWidth: '区段宽度', maxSectionWidth: '(区段宽度最大为30)', showWatermarkOrNot: '是否显示水印', - linkWidthInput: '请输入Link宽度', - linkWidthInputPrompt: '请输入有效Link宽度', - sectionWidthInput: '请输入区段宽度', - sectionWidthInputPrompt: '请输入有效区段宽度', - selectShowWatermark: '请选择是否水印', routingCode: '交路code', routingName: '交路名称', startStationCodeColon: '起始站:', diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js index 6c1dea71e..e0012e7fd 100644 --- a/src/i18n/langs/zh/orderAuthor.js +++ b/src/i18n/langs/zh/orderAuthor.js @@ -71,7 +71,6 @@ export default { addRecords: '添加记录', totalNumber: '总数', permissionToDistributeQRCode: '权限分发二维码', - selectPackagingRecord: '请选择打包记录', editPermissionRules: '编辑权限规则', addGoods: '添加商品', updateGoods: '修改商品', @@ -83,5 +82,7 @@ export default { orderNumber: '订单号', sourcesOfInformation: '信息来源', distributePermission: '权限分发', - orderCreation: '订单创建' + orderCreation: '订单创建', + select: '选择', + chooseGoods: '选择商品' }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 98072406c..302f5ee23 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -179,5 +179,36 @@ export default { unitOfTimeRadio: '请选择时间单位', goodsDescribtionInput: '请输入商品描述', userNameInput: '请输入用户名称', - permissionTypeInput: '请选择权限类型' + permissionTypeInput: '请选择权限类型', + timeInput: '请输入时长', + chooseUser: '请选择用户', + pleaseInputLessonName: '请输入课程名称', + pleaseSelectTraining: '请选择实训', + + maxScaling: '(缩放比例最大为8级)', + skinCodingInput: '请输入皮肤编码', + skinDesignationInput: '请输入皮肤名称', + coordinatesOriginInput: '请输入原点坐标', + scalingInput: '请输入缩放比例', + scalingInputPrompt: '请输入有效的缩放比例', + selectImportFiles: '请选择需要导入的文件', + speedLevelEnter1: '请输入速度等级1', + speedLevelEnter2: '请输入速度等级2', + speedLevelEnter3: '请输入速度等级3', + speedLevelEnter4: '请输入速度等级4', + drivingDirectionSelect: '请选择行驶方向', + timeBetweenDeparturesEnter: '请输入发车间隔时间', + stopTimeEnter: '请输入停靠时间', + entranceStationSelect: '请选择入站口', + exportStationSelect: '请选择出站口', + selectDataRange: '请选择数据范围区间', + productCodeEnter: '请输入产品编码', + productNameEnter: '请输入产品名称', + productDescriptionEnter: '请输入产品说明', + trainingTypeSelect: '请选择关联实训类型', + linkWidthInput: '请输入Link宽度', + linkWidthInputPrompt: '请输入有效Link宽度', + sectionWidthInput: '请输入区段宽度', + sectionWidthInputPrompt: '请输入有效区段宽度', + selectShowWatermark: '请选择是否水印' }; diff --git a/src/i18n/langs/zh/system.js b/src/i18n/langs/zh/system.js index b92e9f29b..ac2ef3ca0 100644 --- a/src/i18n/langs/zh/system.js +++ b/src/i18n/langs/zh/system.js @@ -11,8 +11,8 @@ export default { updateSuccess: '更新成功', destory: '销 毁', simulationGroup: '仿真Group', - username: '用户名', - phoneNumber: '手机号', + userName: '用户名', + mobile: '手机号', skinCode: '皮肤编号', prdType: '产品类型', simulationType: '仿真类型', @@ -21,5 +21,34 @@ export default { isError: '是否错误', isSuspend: '是否暂停', isDrivingAsplanned: '是否按计划行车', - delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?' + delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?', + createDetail: '创建明细', + editDetail: '编辑明细', + mapName: '地图名称', + trainingName: '实训名称', + trainingUseTime: '实训用时', + minute: '分', + second: '秒', + createSimulationTitle: '创建仿真信息', + addSuccess: '添加成功', + pleaseInputNames: '请输入昵称/名字/手机号', + examUser: '考试用户', + examScore: '考试成绩', + examResult: '考试结果', + examName: '试卷名称', + delExamResultIsContinue: '此操作将删除此考试结果, 是否继续?', + editExamDetail: '编辑考试详情', + subscribeMap: '订阅地图', + roles: '角色', + email: '邮箱', + nickname: '昵称', + delTypeIsContinue: '此操作将删除该类型, 是否继续?', + permission: '权限', + editUserPermission: '编辑用户权限', + lessonName: '课程名称', + selectTraining: '选择实训', + createUserTraining: '创建用户实训', + editTrainingDetail: '编辑实训详情', + trainingTime: '实训时长' + }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index 7fc9e684e..2a1aec950 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -83,6 +83,12 @@ export default { updatePrivilegeTip: '此操作将修改权限状态，是否继续?', addOrganizationPrefix: '是否添加 "', addOrganizationSuffix: '" 组织/企业条目信息?', - packagingFailed: '权限分发打包失败' + packagingFailed: '权限分发打包失败', + selectPackagingRecord: '请选择打包记录', + + skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?', + skinCodingExist: '地图皮肤编码已存在', + underImport: '正在导入中...', + deleteTypeHint: '此操作将删除该类型, 是否继续？' }; diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js index e830934da..74bcc594c 100644 --- a/src/jmap/config/skinCode/chengdu_03.js +++ b/src/jmap/config/skinCode/chengdu_03.js @@ -374,6 +374,10 @@ class SkinCode extends defaultStyle { type: '03', serviceNumber: '---', nameFormat: 'groupNumber:serviceNumber' + }, + { + type: '03', + nameFormat: 'serviceNumber:trainNumber' } ], // 特殊列车类型需设置显示格式 lrPadding: 4, // 两边间隔 @@ -435,6 +439,10 @@ class SkinCode extends defaultStyle { useSelfText: true // 使用配置项的字体大小 }, trainStatusStyle: { + trainTypeStatus: [ + {type: '03', serviceNumberColor: '#FFF000', groupNumberColor: '#FFF000'}, + {type: '02', trainNumberColor: '#FFF000', groupNumberColor: '#FFF000'} + ], // 列车类型对应的识别号样式 defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色 destinationStatusSetText: 'trainWindowBorder', // 目的地状态设置的对应哪个颜色 destinationStatus: [ diff --git a/src/jmap/map.js b/src/jmap/map.js index 8ccc23e9c..9e1e77b74 100644 --- a/src/jmap/map.js +++ b/src/jmap/map.js @@ -248,7 +248,7 @@ class Jlmap { }); // 状态后处理 - this.postHandle(list); + this.postHandle(list || []); if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); } } diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js index bc9534d8f..86a9a54fe 100644 --- a/src/jmap/shape/Train/TrainBody.js +++ b/src/jmap/shape/Train/TrainBody.js @@ -174,12 +174,20 @@ export default class TrainBody extends Group { this.trainBodyBox && this.trainBodyBox.setStyle('fill', color); } setTextTrainServerColor(color) { - this.textTrainServer.setStyle('textFill', color); - this.textTrainServer.setStyle('textStroke', color); + this.textTrainServer&&this.textTrainServer.setStyle('textFill', color); + this.textTrainServer&&this.textTrainServer.setStyle('textStroke', color); } setTextTrainTargetColor(color) { - this.textTrainTarget.setStyle('textFill', color); - this.textTrainTarget.setStyle('textStroke', color); + this.textTrainTarget&&this.textTrainTarget.setStyle('textFill', color); + this.textTrainTarget&&this.textTrainTarget.setStyle('textStroke', color); + } + setTextTrainNumberColor(color) { + this.textTrainNumber&&this.textTrainNumber.setStyle('textFill', color); + this.textTrainNumber&&this.textTrainNumber.setStyle('textStroke', color); + } + setTextTrainTargetNumberColor(color) { + this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textFill', color); + this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textStroke', color); } setHShow(isShow) { if (this.textH) { diff --git a/src/jmap/shape/Train/index.js b/src/jmap/shape/Train/index.js index b1e8c1413..b71b6acb5 100644 --- a/src/jmap/shape/Train/index.js +++ b/src/jmap/shape/Train/index.js @@ -282,7 +282,18 @@ export default class Train extends Group { }); } } - + setTrainTypeStatus(type) { + if (this.style.Train.trainStatusStyle.trainTypeStatus) { + this.style.Train.trainStatusStyle.trainTypeStatus.some((item) => { + if ( type === item.type) { + item.serviceNumberColor && this.trainB && this.trainB.setTextTrainServerColor(item.serviceNumberColor); + item.trainNumberColor && this.trainB && this.trainB.setTextTrainNumberColor(item.trainNumberColor); + item.trainTargetColor && this.trainB && this.trainB.setTextTrainTargetColor(item.trainTargetColor); + item.groupNumberColor && this.trainB && this.trainB.setTextTrainTargetNumberColor(item.groupNumberColor); + } + }); + } + } // 设置状态 setState(model) { this.model = model; @@ -296,6 +307,7 @@ export default class Train extends Group { this.setDoorStatus(model.doorStatus); // 设置车门状态类型 this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型 this.setAlarmStatus(model.alarmStatus); // 设置报警状态 + this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式 } } // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度 diff --git a/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue index 96fdd3fa4..5ef35ef0f 100644 --- a/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue +++ b/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue @@ -1,183 +1,188 @@ \ No newline at end of file + this.$store.dispatch('map/updateMapDevices', updatList); + } + }, + trainNameFormatBy(mode) { + switch (mode.toString()) { + case '1': return 'serverNo:trainNo'; // 表号+车次号 + case '2': return 'serverNo:trainNumber'; // 表号+车组号 + case '3': return 'targetCode:trainNo'; // 目的地号+车次号 + case '4': return 'targetCode:trainNumber'; // 目的地号+车组号 + case '5': return 'targetCode:serverNo:trainNo'; // 目的地号+表号+车次号 + case '6': return 'targetCode:serverNo:trainNumber'; // 目的地号+表号+车组号 + } + return ''; // 无格式类型 + } + } +}; + diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue index b3318c33b..4cbeb6cb4 100644 --- a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue +++ b/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue @@ -1,77 +1,84 @@ \ No newline at end of file + this.$store.dispatch('map/updateMapDevices', updatList); + } + }, + trainNameFormatBy(mode) { + switch (mode.toString()) { + case '1': return 'serviceNumber:tripNumber'; // 表号+车次号 + case '2': return 'serviceNumber:groupNumber'; // 表号+车组号 + case '3': return 'targetCode:tripNumber'; // 目的地号+车次号 + case '4': return 'targetCode:groupNumber'; // 目的地号+车组号 + case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号 + case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号 + } + return ''; // 无格式类型 + } + } +}; + diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue index 888ba8d38..d3cde99aa 100644 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue +++ b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue @@ -1,77 +1,84 @@ \ No newline at end of file + this.$store.dispatch('map/updateMapDevices', updatList); + } + }, + trainNameFormatBy(mode) { + switch (mode.toString()) { + case '1': return 'serviceNumber:tripNumber'; // 表号+车次号 + case '2': return 'serviceNumber:groupNumber'; // 表号+车组号 + case '3': return 'targetCode:tripNumber'; // 目的地号+车次号 + case '4': return 'targetCode:groupNumber'; // 目的地号+车组号 + case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号 + case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号 + } + return ''; // 无格式类型 + } + } +}; + diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue index ea4dd99f4..a40e6f049 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue @@ -166,7 +166,7 @@ export default { }, setTrainDispaly() { const updatlist = []; - const trainList = this.$store.getters['training/viewTrainList']; + const trainList = this.$store.getters['training/viewTrainList'](); if (trainList && trainList.length > 0) { const nameFormat = this.trainNameFormatBy(this.planMode); const nameFontSize = this.fontSize; diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js index 14bd652de..3f27a3f44 100644 --- a/src/store/modules/scriptRecord.js +++ b/src/store/modules/scriptRecord.js @@ -4,26 +4,35 @@ const scriptRecord = { namespaced: true, state: { - mapLocation: {}, //地图定位 + mapLocation: {}, //地图定位, + simulationPause: true , }, getters: { - mapLocation:(state)=>{ + mapLocation: (state)=>{ return state.mapLocation; - } + }, + simulationPause:(state)=>{ + return state.simulationPause; + }, }, mutations: { - setMapLocation:(state, mapLocation) => { + setMapLocation: (state, mapLocation) => { state.mapLocation = mapLocation; }, + setSimulationPause: (state, simulationPause) => { + state.simulationPause = simulationPause; + }, }, actions: { /** * 设置地图定位 */ - updateMapLocation:({ commit }, mapLocation) => { + updateMapLocation: ({ commit }, mapLocation) => { commit('setMapLocation', mapLocation); }, - + updateSimulationPause: ({ commit }, simulationPause) => { + commit('setSimulationPause', simulationPause); + }, } }; export default scriptRecord; \ No newline at end of file diff --git a/src/store/modules/training.js b/src/store/modules/training.js index 3f089b514..573bccfeb 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -78,7 +78,7 @@ const training = { return state.roles; }, // 视图中的列车列表 - viewTrainList: (state) => { + viewTrainList: (state) => () =>{ const trainList = []; const mapDevice = Vue.prototype.$jlmap.mapDevice; Object.values(mapDevice).forEach(device => { diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue index c1ce266f0..9b94b9fa2 100644 --- a/src/views/demonstration/deomonList/index.vue +++ b/src/views/demonstration/deomonList/index.vue @@ -21,14 +21,13 @@ @node-click="clickEvent" > - {{ $t('global.trainingHasStart').replace('(name)', data.creator.nickName) }} - {{ $t('global.trainingHasStart').replace('(name)', data.creator.nickName) }} + {{ $t('global.trainingHasStart').replace('{name}', data.creator.nickName) }} + {{ $t('global.trainingHasStart').replace('{name}', data.creator.nickName) }} {{ $t('global.joinRoom') }} diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue index d9ab6bf52..ff39fe9ab 100644 --- a/src/views/display/demon/addQuest.vue +++ b/src/views/display/demon/addQuest.vue @@ -111,7 +111,7 @@ export default { width: '250', buttons: [ { - name: '加载任务', + name: '加载剧本', type: 'primary', handleClick: this.handleLoad } diff --git a/src/views/display/index.vue b/src/views/display/index.vue index 1e705151f..76819dbe0 100644 --- a/src/views/display/index.vue +++ b/src/views/display/index.vue @@ -70,7 +70,7 @@ import MenuScript from '@/views/display/menuScript'; import WindowResizeHandler from '@/mixin/WindowResizeHandler'; import AddQuest from './demon/addQuest'; import { mapGetters } from 'vuex'; -import { getTrainingStepsDetail } from '@/api/jmap/training'; +import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training'; import { setGoodsTryUse } from '@/api/management/goods'; import { getProductDetail } from '@/api/management/mapprd'; import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation'; @@ -146,6 +146,18 @@ export default { ...mapGetters('config', [ 'canvasId' ]), + trainingId() { + return this.$route.query.trainingId; + }, + skinCode() { + return this.$route.query.skinCode; + }, + mapId() { + return this.$route.query.mapId; + }, + prdType() { + return this.$route.query.prdType; + }, isLesson() { return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage'; }, @@ -168,10 +180,7 @@ export default { return this.mode === 'plan'; }, isDrive() { - return this.$route.query.prdType == '04'; - }, - trainingId() { - return this.$route.query.trainingId; + return this.prdType == '04'; } }, watch: { @@ -181,6 +190,14 @@ export default { '$store.state.map.mapViewLoadedCount': function (val) { this.mapBoxP = document.getElementById(this.canvasId).children[0]; this.mapBox = document.getElementsByTagName('canvas'); + + if (this.trainingId) { + getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => { + this.trainingObj = resp.data; + this.$store.dispatch('training/setTrainingData', this.trainingObj); + }); + } + }, '$store.state.socket.permissionOver': function () { this.$alert('用户权限已被收回', '提示', { @@ -191,7 +208,9 @@ export default { }); }, $route() { - this.initLoadData(); + this.$nextTick(() => { + this.initLoadData(); + }); } }, async created() { @@ -307,6 +326,7 @@ export default { async loadSimulationInfo() { const resp = await getSimulationInfo(this.group); if (resp && resp.code == 200) { + this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); this.questId = Number(resp.data.questId) || 0; } }, @@ -349,14 +369,14 @@ export default { if (parseInt(this.trainingId)) { // 设置地图数据 // 设置实训数据 - const resp = await getTrainingStepsDetail(this.trainingId, { group: this.group }); + const resp = await getTrainingDetail(this.trainingId); if (resp && resp.code == 200) { - const stepdData = this.trainingObj = resp.data; - const rest = await getProductDetail(stepdData.prdCode); + const detail = resp.data; + const rest = await getProductDetail(detail.prdCode); if (rest && rest.code == 200) { - await this.$store.dispatch('training/setPrdType', rest.data.prdType); - await this.loadMapData(resp.data.skinCode); - await this.$store.dispatch('training/setTrainingData', stepdData); + const data = rest.data; + await this.$store.dispatch('training/setPrdType', data.prdType); + await this.loadMapData(detail.skinCode); } } else { this.$messageBox(`获取实训步骤数据失败`); @@ -372,9 +392,8 @@ export default { this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/setPrdType', ''); - const skinCode = this.$route.query.skinCode; - if (parseInt(skinCode)) { - await this.loadMapData(skinCode); + if (parseInt(this.skinCode)) { + await this.loadMapData(this.skinCode); } else { this.endViewLoading(); @@ -384,11 +403,10 @@ export default { async initLoadDemonData() { this.$store.dispatch('training/end', TrainingMode.NORMAL); this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 - this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.$route.query.prdType]); + this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]); - const skinCode = this.$route.query.skinCode; - if (parseInt(skinCode)) { - await this.loadMapData(skinCode); + if (parseInt(this.skinCode)) { + await this.loadMapData(this.skinCode); } else { this.endViewLoading(); @@ -400,9 +418,8 @@ export default { this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/setPrdType', '01'); - const skinCode = this.$route.query.skinCode; - if (parseInt(skinCode)) { - await this.loadMapData(skinCode); + if (parseInt(this.skinCode)) { + await this.loadMapData(this.skinCode); } else { this.endViewLoading(); @@ -414,9 +431,8 @@ export default { this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.switchMode('01'); - const mapId = this.$route.query.mapId; - if (parseInt(mapId)) { - await this.loadMapDataById(mapId); + if (parseInt(this.mapId)) { + await this.loadMapDataById(this.mapId); } else { this.endViewLoading(); } @@ -427,9 +443,8 @@ export default { this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/setPrdType', '01'); - const skinCode = this.$route.query.skinCode; - if (parseInt(skinCode)) { - await this.loadMapData(skinCode); + if (parseInt(this.skinCode)) { + await this.loadMapData(this.skinCode); } else { this.endViewLoading(); @@ -522,11 +537,11 @@ export default { if (this.isDrive) { this.panelShow = false; this.drivingShow = true; - this.$refs.Jl3dDrive.show(this.$route.query.skinCode); + this.$refs.Jl3dDrive.show(this.skinCode); } else { this.panelShow = false; this.simulationShow = true; - this.$refs.Jl3dSimulation.show(this.$route.query.skinCode); + this.$refs.Jl3dSimulation.show(this.skinCode); } }, showpanel() { diff --git a/src/views/display/menuScript.vue b/src/views/display/menuScript.vue index 68ef4e807..40fd70bdd 100644 --- a/src/views/display/menuScript.vue +++ b/src/views/display/menuScript.vue @@ -101,6 +101,9 @@ export default { selectBeginTime() { this.$refs.setTime.doShow(); }, + resetBeginTime(){ + this.isDisable = false; + }, start(model) { this.isDisable = true; runDiagramStart(model, this.group).then(res => { diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue index 776480db3..2079ded0f 100644 --- a/src/views/display/scriptRecord/addAction.vue +++ b/src/views/display/scriptRecord/addAction.vue @@ -2,43 +2,40 @@
- + - - - + + - + - + - - + + - + - + - {{buttonName}} + {{buttonName}}
@@ -74,7 +71,16 @@ { this.initData(); } - } + }, + '$store.state.map.mapViewLoadedCount': function (val) { + Vue.prototype.$jlmap.setOptions(this.$store.state.scriptRecord.mapLocation); + this.isPause=!(this.$store.state.scriptRecord.simulationPause); + this.$parent.$parent.$parent.setIsParse(this.isPause); + }, + '$store.state.scriptRecord.simulationPause': function(val){ + this.isPause=!(this.$store.state.scriptRecord.simulationPause); + this.$parent.$parent.$parent.setIsParse(this.isPause); + }, }, data() { return { @@ -82,7 +88,6 @@ actionVO:{ memberId:"", targetId:"", - // time:0, reply:"", type:"Conversation", deviceCommand:"", @@ -93,6 +98,10 @@ endStation:"", } }, + deviceTypeReadOnly:false, + isPause:false, + isNotModify:true, + modifying:false, isConversitionAdd:true, isCommandAdd:false, actionTypeList:DeviceTypeDic.ConstSelect.actionType, @@ -163,15 +172,17 @@ {this.modalData.actionVO.commandParamList=[this.modalData.param.startStation,this.modalData.param.endStation];} let data=this.modalData.actionVO; let obj=this; - + this.modifying=true; if(this.$props.operateType=="add") { addScriptAction(group,data).then(response=>{ - this.initActionData(); + this.modifying=false; this.$message.success('添加动作成功'); this.$emit('create'); - this.resetDisabled(); + // this.resetDisabled(); + this.initActionData(); }).catch(error => { + this.modifying=false; this.$messageBox(`添加动作失败: ${error.message}`); }); } @@ -179,12 +190,17 @@ { let actionId=this.modalData.actionVO.id; modifyScriptAction(group,actionId,data).then(response=>{ - this.initActionData(); + this.modifying=false; + + this.isNotModify=true; + this.$parent.$parent.$parent.setDisabled(this.isNotModify); this.$emit('modifyButtonName'); this.$message.success('修改动作成功'); this.$emit('create'); - this.resetDisabled(); + // this.resetDisabled(); + this.initActionData(); }).catch(error => { + this.modifying=false; this.$messageBox(`修改动作失败: ${error.message}`); }); } @@ -199,6 +215,19 @@ if(this.$refs['modalData']) { this.$refs['modalData'].resetFields(); + // this.$nextTick(function(){ + this.deviceTypeReadOnly=false; + this.modalData.actionVO.type="Conversation"; + this.modalData.actionVO.memberId=""; + this.modalData.actionVO.targetId=""; + // this.modalData.actionVO.deviceCommand=""; + this.modalData.actionVO.reply=""; + this.modalData.param.startStation=""; + this.isConversitionAdd=true; + this.isCommandAdd=false; + this.isJinLu=false; + this.modalData.param.endStation=""; + // }); } }, clearValidate(){ @@ -208,18 +237,7 @@ } }, initActionData(){ - // debugger; - this.modalData.actionVO.memberId=""; - this.modalData.actionVO.targetId=""; - this.modalData.actionVO.type="Conversation"; - // this.modalData.actionVO.time=0; - this.modalData.actionVO.reply=""; - this.modalData.param.startStation=""; - this.isConversitionAdd=true; - this.isCommandAdd=false; - this.isJinLu=false; - this.modalData.actionVO.deviceCommand=null; - this.modalData.param.endStation=""; + this.resetDisabled(); }, changeType(index){ switch(index) @@ -254,6 +272,7 @@ }, changeCommand(index){ + this.modalData.actionVO.deviceCommand switch(index) { case "Train_Manual_Route_Blocking_Drive":{ @@ -273,14 +292,18 @@ doShow(data){ if(data) { - // debugger; + this.clearValidate(); + this.isNotModify=false; + this.$parent.$parent.$parent.setDisabled(this.isNotModify); this.initData(); this.modalData.actionVO.id=data.id; this.modalData.actionVO.memberId=data.memberId; this.modalData.actionVO.type=data.type; + this.deviceTypeReadOnly=true; // this.modalData.actionVO.time=data.time; if(data.type=="Conversation") { + this.isJinLu=false; this.modalData.actionVO.targetId=data.targetId; this.isConversitionAdd=true; this.isCommandAdd=false; @@ -288,6 +311,7 @@ } else if(data.type=="Command") { + this.isJinLu=false; this.isConversitionAdd=false; this.isCommandAdd=true; this.modalData.actionVO.reply=""; @@ -312,10 +336,10 @@ font-size: 15px; } .actionInfo{ - margin-top:20px; + margin-top:10px; margin-left: 5px; font-size: 15px; - width:98%; + // width:98%; } .inputStyle{ width:300px; diff --git a/src/views/display/scriptRecord/getAction.vue b/src/views/display/scriptRecord/getAction.vue index 9401ed438..6eaf8aa73 100644 --- a/src/views/display/scriptRecord/getAction.vue +++ b/src/views/display/scriptRecord/getAction.vue @@ -6,43 +6,24 @@
+
- {{actionInfo.otherInfo}}
- 修改 - 删除 + 修改 +
- -
@@ -77,13 +58,11 @@ AddAction, }, mounted(){ - this.loadInitData(this.$route.query); - // this.memberName=this.$store.state.scriptRecord.memberName; - // this.behaviorName=this.$store.state.scriptRecord.behaviorName; + this.loadInitData(); }, methods:{ - loadInitData(obj) { - let group=obj.group; + loadInitData() { + let group=this.$route.query.group; getAvailableDeviceCommand().then(response=>{ this.deviceCommandList=response.data; this.loadOtherData(this.$route.query); @@ -101,7 +80,6 @@ }); memberVOList=JSON.parse(memberVOList); let actionList=response.data.actionVOList; - // actionList=actionList.reverse(); actionList.forEach(element => { let member=memberVOList.find(elem=>{return elem.id==element.memberId}); let memberName=member.name==undefined?"":" - "+member.name; @@ -111,7 +89,7 @@ { let target=memberVOList.find(elem=>{return elem.id==element.targetId}); let targetName=target.name==undefined?"":" - "+target.name; - this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+""+" 对 "+""+target.role+targetName+"：",otherInfo:element.reply,row:element}); + this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+""+" 对 "+""+target.role+targetName+"：",otherInfo:element.reply,row:element,disabled:false}); break; } case "Command": @@ -121,12 +99,12 @@ { case 'Train_Manual_Route_Blocking_Drive': { - this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 ：",otherInfo:deviceCommand.label,row:element}); + this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 ：",otherInfo:deviceCommand.label,row:element,disabled:true}); break; } case 'Train_Manual_Limit_Drive': { - this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 : ",otherInfo:deviceCommand.label,row:element}); + this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 : ",otherInfo:deviceCommand.label,row:element,disabled:true}); break; } default: @@ -137,7 +115,6 @@ } } }); - // this.actionList=response.data.actionVOList; if(response.data.mapLocation) { let mapLocation={"offsetX":response.data.mapLocation.x,"offsetY":response.data.mapLocation.y,"scaleRate":response.data.mapLocation.scale}; @@ -156,7 +133,7 @@ }); }, reloadTable(){ - this.loadInitData(this.$route.query); + this.loadInitData(); }, create(){ this.reloadTable(); @@ -215,5 +192,11 @@ vertical-align: top; display: inline-block; } - + .vertialLine{ + height: 380px; + margin-left: 440px; + border-right: 1px #dadada solid; + position: fixed; + width: 0px; + } diff --git a/src/views/display/tipExamList.vue b/src/views/display/tipExamList.vue index aa889654f..c6fbe9f82 100644 --- a/src/views/display/tipExamList.vue +++ b/src/views/display/tipExamList.vue @@ -140,10 +140,8 @@ export default { } }); if (obj) { - const that = this; - const data = { id: obj.trainingId }; - getTrainingDetail(data).then(res => { - that.courseModel = { + getTrainingDetail(obj.trainingId ).then(res => { + this.courseModel = { id: res.data.id, name: res.data.name, maxDuration: res.data.maxDuration, @@ -152,7 +150,7 @@ export default { updateTime: res.data.updateTime }; }).catch(error => { - that.$message.error('获取试题息失败:' + error.message); + this.$message.error('获取试题息失败:' + error.message); }); } diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue index 3d596cf76..1db46d317 100644 --- a/src/views/display/tipScriptRecord.vue +++ b/src/views/display/tipScriptRecord.vue @@ -13,9 +13,14 @@
+ + + - 重置剧本 + 暂停 + 恢复并执行 {{$t('scriptRecord.saveMaplocation')}} + 重置剧本 {{$t('scriptRecord.saveBackground')}} {{$t('scriptRecord.saveData')}} @@ -29,7 +34,7 @@ import Vue from 'vue'; import GetAction from './scriptRecord/getAction'; import { launchFullscreen, exitFullscreen } from '@/utils/screen'; - import {saveScriptScenes, saveScriptData, dumpScriptData,updateMapLocation} from '@/api/simulation'; + import {saveScriptScenes, saveScriptData, dumpScriptData,updateMapLocation,scriptPause,executeScript} from '@/api/simulation'; export default { name: 'TipScriptRecord', @@ -50,14 +55,11 @@ mapLocation:{}, autoSaveScript: null, isSavingScript:false, + isPause:false, + executeDisabled:false, // isSaveStage: true, } }, - watch: { - '$store.state.map.mapViewLoadedCount': function (val) { - Vue.prototype.$jlmap.setOptions(this.$store.state.scriptRecord.mapLocation); - } - }, created() { }, mounted(){ @@ -83,6 +85,13 @@ this.isShrink = true; } }, + setIsParse(isPause){ + this.isPause=isPause; + }, + setDisabled(data) + { + this.executeDisabled=!data; + }, initAutoSaveScript() { const timeout = 1000 * 20; this.clearAutoSave(this.autoSaveScript); @@ -94,13 +103,25 @@ this.autoSaveScript = null; } }, - // getActions(row){ - // this.displayType="action"; - // this.behaviorId=row.id; - // this.$store.dispatch('scriptRecord/updateBehaviorName',row.description); - // }, + pauseScript(){ + scriptPause(this.group).then(resp => { + // this.isSaveStage = false; + this.$store.dispatch('scriptRecord/updateSimulationPause',true); + // this.$message.success('暂停成功'); + }).catch(error => { + this.$messageBox('暂停失败!'); + }); + }, + executePlayScript(){ + executeScript(this.group).then(resp => { + // this.isSaveStage = false; + this.$store.dispatch('scriptRecord/updateSimulationPause',false); + // this.$message.success('暂停成功'); + }).catch(error => { + this.$messageBox('恢复失败!'); + }); + }, saveScenesStage() { - saveScriptScenes(this.group).then(resp => { // this.isSaveStage = false; this.$message.success('保存背景成功'); @@ -125,6 +146,7 @@ }) }, dumpScenesData() { + this.clearAutoSave(); let group=this.group; this.$confirm('此操作将会清除已保存的编制数据, 是否继续?', '提示', { confirmButtonText: '确定', @@ -133,11 +155,16 @@ }).then(() => { dumpScriptData(group).then(resp => { // this.isSaveStage = true; + this.$parent.resetBeginTime(); + this.$refs["getAction"].loadInitData(); + this.initAutoSaveScript(); this.$message.success('清除数据成功'); }).catch(error => { this.$messageBox('清除数据失败!'); }) - }).catch(error => { }) + }).catch(error => { + this.initAutoSaveScript(); + }) }, saveMaplocation() { @@ -205,6 +232,11 @@ margin-left: 20px; float:right; } + .button-group1{ + margin-top:15px; + margin-left: 20px; + float:left; + } .actionInfo{ margin-top:30px; } diff --git a/src/views/exam/detail/questionDetail.vue b/src/views/exam/detail/questionDetail.vue index f6a531a2a..0af3c608a 100644 --- a/src/views/exam/detail/questionDetail.vue +++ b/src/views/exam/detail/questionDetail.vue @@ -78,9 +78,9 @@ export default { this.height = this._clientHeight; }, initLoadPage() { - const data = { id: this.$route.query.trainingId }; - if (parseInt(data.id)) { - getTrainingDetail(data).then(res => { + const trainingId = this.$route.query.trainingId; + if (parseInt(trainingId)) { + getTrainingDetail(trainingId).then(res => { this.courseModel = { id: res.data.id, name: res.data.name, diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue index a03ae0f20..fae4fa351 100644 --- a/src/views/jlmap/index.vue +++ b/src/views/jlmap/index.vue @@ -116,6 +116,7 @@ export default { EventBus.$off('refresh'); EventBus.$off('viewLoading'); EventBus.$off('viewProgressAt'); + this.$store.dispatch('map/mapClear'); if (this.$jlmap) { this.$jlmap.dispose(); } diff --git a/src/views/jointTraining/chartView.vue b/src/views/jointTraining/chartView.vue index 913def256..7609cc58f 100644 --- a/src/views/jointTraining/chartView.vue +++ b/src/views/jointTraining/chartView.vue @@ -297,7 +297,7 @@ export default { }, // 更新列车列表 updateTrainList() { - const list = this.$store.getters['training/viewTrainList']; + const list = this.$store.getters['training/viewTrainList'](); if (this.treeData[4].children.length != list.length) { this.treeData[4].children = []; if (list && list.length) { diff --git a/src/views/jointTraining/index.vue b/src/views/jointTraining/index.vue index 78b59f78b..eee930af4 100644 --- a/src/views/jointTraining/index.vue +++ b/src/views/jointTraining/index.vue @@ -89,7 +89,10 @@ export default { ]), ...mapGetters('config', [ 'canvasId' - ]) + ]), + skinCode() { + return this.$route.query.skinCode; + } }, watch: { '$store.state.config.menuBarLoadedCount': function (val) { @@ -123,7 +126,9 @@ export default { } }, $route() { - this.initLoadData(); + this.$nextTick(() => { + this.initLoadData(); + }); } }, async created() { @@ -268,8 +273,7 @@ export default { this.$store.dispatch('training/end', TrainingMode.NORMAL); this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 - const skinCode = this.$route.query.skinCode; - if (skinCode) { + if (this.skinCode) { // 01 现地 02 行调 '' 观众 const resp = await this.getUserRole(); if (resp && resp.code == 200) { @@ -285,7 +289,7 @@ export default { case 'Repair': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair'); break; } } - await this.getTrainDetail(skinCode); + await this.getTrainDetail(this.skinCode); } else { this.endViewLoading(); } @@ -318,7 +322,7 @@ export default { hidepanel() { this.panelShow = false; this.drivingShow = true; - this.$refs.Jl3dDrive.show(this.$route.query.skinCode); + this.$refs.Jl3dDrive.show(this.skinCode); }, messageInfo(message, type) { diff --git a/src/views/lesson/trainingrecord/category/draft.vue b/src/views/lesson/trainingrecord/category/draft.vue index 99de0b45e..65bad1203 100644 --- a/src/views/lesson/trainingrecord/category/draft.vue +++ b/src/views/lesson/trainingrecord/category/draft.vue @@ -210,7 +210,7 @@ export default { this.operateModel.id = node.data.id; this.operateModel.name = node.data.name; - getTrainingDetail({ id: node.data.id }).then(response => { + getTrainingDetail(node.data.id).then(response => { this.operateModel.minDuration = response.data.minDuration; this.operateModel.maxDuration = response.data.maxDuration; this.operateModel.operateType = response.data.operateType; diff --git a/src/views/lesson/trainingrecord/index.vue b/src/views/lesson/trainingrecord/index.vue index 72054c1b2..bbf07c652 100644 --- a/src/views/lesson/trainingrecord/index.vue +++ b/src/views/lesson/trainingrecord/index.vue @@ -47,7 +47,6 @@ export default { }, $route() { this.resizeHandler(); - this.$; } }, mounted() { diff --git a/src/views/lesson/trainingrecord/manage/index.vue b/src/views/lesson/trainingrecord/manage/index.vue index ef87ee053..a03a35e16 100644 --- a/src/views/lesson/trainingrecord/manage/index.vue +++ b/src/views/lesson/trainingrecord/manage/index.vue @@ -15,7 +15,7 @@ import MapSystemDraft from '@/views/mapsystem/index'; import StepManage from './stepmanage/index'; import { mapGetters } from 'vuex'; -import { getTrainingStepsDetail } from '@/api/jmap/training'; +import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training'; import { getProductDetail } from '@/api/management/mapprd'; import { TrainingMode, OperateMode } from '@/scripts/ConstDic'; import { loadMapData } from '@/utils/loaddata'; @@ -49,6 +49,16 @@ export default { watch: { $route(newVal) { this.initLoadData(); + }, + '$store.state.map.mapViewLoadedCount': function() { + if (this.trainingId) { + getTrainingStepsDetail(this.trainingId, { group: this.group }).then(response => { + this.$store.dispatch('training/setTrainingData', response.data); + }).catch(() => { + this.$messageBox(this.$t('error.getMapStepsFailed')); + this.endViewLoading(); + }); + } } }, mounted() { @@ -77,19 +87,19 @@ export default { // 获取实训的详细数据 // 加载地图数据 // 设置实训数据 - getTrainingStepsDetail(this.trainingId, { group: this.group }).then(response => { - const stepdData = response.data; - getProductDetail(stepdData.prdCode).then(res => { - loadMapData(stepdData.skinCode).then(() => { - this.$store.dispatch('training/setPrdType', res.data.prdType); - this.$store.dispatch('training/setTrainingData', stepdData); + getTrainingDetail(this.trainingId).then(resp => { + const detail = resp.data; + getProductDetail(detail.prdCode).then(rest => { + const data = rest.data; + loadMapData(detail.skinCode).then(() => { + this.$store.dispatch('training/setPrdType', data.prdType); }).catch(() => { this.$messageBox(this.$t('error.loadMapDataFailed')); this.endViewLoading(); }); }); }).catch(() => { - this.$messageBox(this.$t('error.getMapStepsFailed')); + this.$messageBox(this.$t('error.getMapDetailFailed')); this.endViewLoading(); }); } else { diff --git a/src/views/management/dictionaryDetail/edit.vue b/src/views/management/dictionaryDetail/edit.vue index 19d88b51d..3a80b410a 100644 --- a/src/views/management/dictionaryDetail/edit.vue +++ b/src/views/management/dictionaryDetail/edit.vue @@ -40,12 +40,12 @@ export default { const form = { labelWidth: '60px', items: [ - { prop: 'code', label: '编码', type: 'text', required: true, disabled: !isAdd }, - { prop: 'name', label: '名称', type: 'text', required: true }, + { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd }, + { prop: 'name', label: this.$t('system.name'), type: 'text', required: true }, { - prop: 'status', label: '状态', type: 'select', required: true, options: this.$ConstSelect.Status + prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status }, - { prop: 'remarks', label: '备注', type: 'textarea', required: false } + { prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false } ] }; return form; @@ -53,21 +53,21 @@ export default { rules() { const crules = { name: [ - { required: true, message: '请输入名称', trigger: 'blur' }, - { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }, + { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' } ], status: [ - { required: true, message: '请选择状态', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' } ], remarks: [ - { max: 50, message: '不能超过 50 个字符', trigger: 'blur' } + { max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' } ] }; if (this.type === 'ADD') { return Object.assign(crules, { code: [ - { required: true, message: '请输入编码', trigger: 'blur' }, - { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }, + { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' }, + { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }, { validator: this.validateCode, trigger: 'blur' } ] }); @@ -77,25 +77,25 @@ export default { }, title() { if (this.type === 'ADD') { - return '创建明细'; + return this.$t('system.createDetail'); } else { - return '编辑明细'; + return this.$t('system.editDetail'); } } }, methods: { validateCode(rule, value, callback) { if (!validateCharCode(value)) { - return callback(new Error('格式不正确，只能是字符/数字/_')); + return callback(new Error(this.$t('error.formartError'))); } else { checkDicDetailCodeExist(this.dicId, value).then(response => { if (response.data) { - return callback(new Error('编码已存在')); + return callback(new Error(this.$t('error.codeHasExist'))); } else { return callback(); } }).catch(() => { - return callback(new Error('服务异常')); + return callback(new Error(this.$t('error.serviceException'))); }); } }, @@ -121,21 +121,21 @@ export default { create() { const self = this; create(this.dicId, this.formModel).then(response => { - self.$message.success('创建字典目录成功'); + self.$message.success(this.$t('system.createSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('创建字典目录失败：' + error.message); + self.$message.error(`${this.$t('error.createDetailFailed')}:${error.message}`); }); }, update() { const self = this; update(this.dicId, this.formModel).then(response => { - self.$message.success('更新字典目录成功'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('更新字典目录失败：' + error.message); + self.$message.error(`${this.$t('error.updateDetailFailed')}:${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/existingSimulation/index.vue b/src/views/management/existingSimulation/index.vue index c8275dc98..34c5fbd50 100644 --- a/src/views/management/existingSimulation/index.vue +++ b/src/views/management/existingSimulation/index.vue @@ -28,11 +28,11 @@ export default { }, userName: { type: 'text', - label: this.$t('system.username') + label: this.$t('system.userName') }, mobile: { type: 'text', - label: this.$t('system.phoneNumber') + label: this.$t('system.mobile') }, skinCode: { type: 'select', @@ -64,11 +64,11 @@ export default { indexShow: true, columns: [ { - title: this.$t('system.username'), + title: this.$t('system.userName'), prop: 'creator.name' }, { - title: this.$t('system.phoneNumber'), + title: this.$t('system.mobile'), prop: 'creator.mobile' }, { @@ -170,7 +170,7 @@ export default { return sessionId; }, handleDelete(index, row) { - this.$confirm(this.$t('global.delUserSimulationIsContinue'), this.$t('global.tips'), { + this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), { confirmButtonText: this.$t('global.confirm'), cancelButtonText: this.$t('global.cancel'), type: 'warning' diff --git a/src/views/management/userControl/edit.vue b/src/views/management/userControl/edit.vue index 73562f1e2..4550fece4 100644 --- a/src/views/management/userControl/edit.vue +++ b/src/views/management/userControl/edit.vue @@ -1,9 +1,9 @@ @@ -31,11 +31,11 @@ export default { const form = { labelWidth: '60px', items: [ - { prop: 'name', label: '名称', type: 'text', required: true, disabled: true }, + { prop: 'name', label: this.$t('system.name'), type: 'text', required: true, disabled: true }, // { prop: 'nickname', label: '昵称', type: 'text', required: true }, // { prop: 'mobile', label: '电话', type: 'text', required: true }, // { prop: 'email', label: '邮箱', type: 'text' }, - { prop: 'roles', label: '权限', type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true } + { prop: 'roles', label: this.$t('system.permission'), type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true } ] }; return form; @@ -43,11 +43,11 @@ export default { rules() { const crules = { name: [ - { required: true, message: '请输入名称', trigger: 'blur' }, - { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }, + { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' } ], status: [ - { required: true, message: '请选择状态', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' } ] }; return crules; @@ -76,11 +76,11 @@ export default { update() { const self = this; putRoles(this.formModel).then(response => { - self.$message.success('修改成功'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('修改失败：' + error.message); + self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/userControl/index.vue b/src/views/management/userControl/index.vue index 35aab7498..eafbbbe37 100644 --- a/src/views/management/userControl/index.vue +++ b/src/views/management/userControl/index.vue @@ -29,11 +29,11 @@ export default { queryObject: { name: { type: 'text', - label: '名称' + label: this.$t('system.name') }, roles: { type: 'select', - label: '角色', + label: this.$t('system.roles'), config: { data: this.$ConstSelect.roleList } @@ -47,23 +47,23 @@ export default { indexShow: true, columns: [ { - title: '名称', + title: this.$t('system.name'), prop: 'name' }, { - title: '昵称', + title: this.$t('system.nickname'), prop: 'nickname' }, { - title: '电话', + title: this.$t('system.mobile'), prop: 'mobile' }, { - title: '邮箱', + title: this.$t('system.email'), prop: 'email' }, { - title: '角色', + title: this.$t('system.roles'), prop: 'roles', type: 'tagMore', columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); }, @@ -71,15 +71,15 @@ export default { }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.handleUserEdit }, { - name: '订阅地图', + name: this.$t('system.subscribeMap'), handleClick: this.handleMapCorrelation, type: 'danger' } @@ -100,9 +100,9 @@ export default { // 删除 handleUserDelete(index, row) { - this.$confirm('此操作将删除该类型, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delTypeIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { // delPublishMap(row.id).then(response => { diff --git a/src/views/management/userExam/edit.vue b/src/views/management/userExam/edit.vue index 24c4769c3..ccd8f4e38 100644 --- a/src/views/management/userExam/edit.vue +++ b/src/views/management/userExam/edit.vue @@ -2,8 +2,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -34,12 +34,12 @@ export default { computed: { form() { const form = { - labelWidth: '100px', + labelWidth: '160px', items: [ - { prop: 'userName', label: '用户名称', type: 'text', required: false, disabled: true }, - { prop: 'examName', label: '试卷名称', type: 'text', required: true, disabled: true }, - { prop: 'score', label: '考试分数', type: 'text', required: true }, - { prop: 'result', label: '考试结果', type: 'select', required: true, options: this.$ConstSelect.examResultList } + { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: false, disabled: true }, + { prop: 'examName', label: this.$t('system.examName'), type: 'text', required: true, disabled: true }, + { prop: 'score', label: this.$t('system.examScore'), type: 'text', required: true }, + { prop: 'result', label: this.$t('system.examResult'), type: 'select', required: true, options: this.$ConstSelect.examResultList } ] }; return form; @@ -47,16 +47,16 @@ export default { rules() { const crules = { score: [ - { required: true, message: '请输入名称', trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' } ], result: [ - { required: true, message: '请选择状态', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' } ] }; return crules; }, title() { - return '编辑考试详情'; + return this.$t('system.editExamDetail'); } }, methods: { @@ -79,11 +79,11 @@ export default { update() { const self = this; updateExam(this.formModel).then(response => { - self.$message.success('修改成功！'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('修改失败！' + error.message); + self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/userExam/index.vue b/src/views/management/userExam/index.vue index 4e44c07c8..95efae1af 100644 --- a/src/views/management/userExam/index.vue +++ b/src/views/management/userExam/index.vue @@ -22,20 +22,20 @@ export default { pageIndex: 'pageNum' }, queryForm: { - labelWidth: '80px', + labelWidth: '150px', reset: true, queryObject: { examName: { type: 'text', - label: '试卷名称' + label: this.$t('system.examName') }, userName: { type: 'text', - label: '考试用户' + label: this.$t('system.examUser') }, result: { type: 'select', - label: '考试结果', + label: this.$t('system.examResult'), config: { data: this.$ConstSelect.examResultList } @@ -49,11 +49,11 @@ export default { indexShow: true, columns: [ { - title: '试卷名称', + title: this.$t('system.examName'), prop: 'examName' }, { - title: '考试结果', + title: this.$t('system.examResult'), prop: 'result', type: 'tag', columnValue: (row) => { return this.$convertField(row.result, this.$ConstSelect.examResultList, ['value', 'label']); }, @@ -67,28 +67,28 @@ export default { } }, { - title: '考试成绩', + title: this.$t('system.examScore'), prop: 'score' }, { - title: '考试用户', + title: this.$t('system.examUser'), prop: 'userName' }, { - title: '用户手机号', + title: this.$t('system.mobile'), prop: 'userMobile' }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.edit }, { - name: '删除', + name: this.$t('global.delete'), handleClick: this.handleDelete, type: 'danger' } @@ -115,17 +115,17 @@ export default { // 删除 handleDelete(index, row) { - this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { delPublishExam(row.id).then(response => { - this.$message.success('删除成功'); + this.$message.success(this.$t('system.deleteSuccess')); this.reloadTable(); }).catch(() => { this.reloadTable(); - this.$messageBox('删除失败'); + this.$messageBox(this.$t('error.deleteFailed')); }); }); }, diff --git a/src/views/management/userSimulation/add.vue b/src/views/management/userSimulation/add.vue index ae18d9c62..94a44d4df 100644 --- a/src/views/management/userSimulation/add.vue +++ b/src/views/management/userSimulation/add.vue @@ -2,8 +2,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -41,12 +41,12 @@ export default { computed: { form() { const form = { - labelWidth: '100px', + labelWidth: '120px', items: [ - { prop: 'mapId', label: '地图名称', type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange }, - { prop: 'mapPrdCode', label: '产品名称', type: 'select', required: true, options: this.mapPrdList, placeholder: '请选择产品' }, - { prop: 'userName', label: '用户名称', type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' }, - { prop: 'duration', label: '实训时长', type: 'text', rightWidth: true, required: true, message: 's' } + { prop: 'mapId', label: this.$t('system.mapName'), type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange, placeholder: this.$t('rules.mapInput') }, + { prop: 'mapPrdCode', label: this.$t('system.productName'), type: 'select', required: true, options: this.mapPrdList, placeholder: this.$t('rules.productInput') }, + { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') }, + { prop: 'duration', label: this.$t('system.trainingUseTime'), type: 'text', rightWidth: true, required: true, message: 's' } ] }; return form; @@ -54,22 +54,22 @@ export default { rules() { const crules = { mapId: [ - { required: true, message: '请选择地图', trigger: 'change' } + { required: true, message: this.$t('rules.mapInput'), trigger: 'change' } ], userName: [ - { required: true, message: '请选择用户', trigger: 'change' } + { required: true, message: this.$t('rules.chooseUser'), trigger: 'change' } ], mapPrdCode: [ - { required: true, message: '请选择产品', trigger: 'change' } + { required: true, message: this.$t('rules.productInput'), trigger: 'change' } ], duration: [ - { required: true, message: '请输入时长', trigger: 'blur' } + { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' } ] }; return crules; }, title() { - return '创建仿真信息'; + return this.$t('system.createSimulationTitle'); } }, mounted() { @@ -113,7 +113,7 @@ export default { }); cb(results); } catch (error) { - console.error(error, '查询用户list'); + console.error(error); cb(results); } } else { @@ -148,13 +148,6 @@ export default { }, show(data) { this.dialogVisible = true; - // this.formModel = { - // mapId: '', - // mapPrdCode: '', - // userId: '', - // userName: '', - // duration: '', - // }; }, doSave() { const self = this; @@ -172,14 +165,14 @@ export default { }; if (params.userId) { postSimulationStats(params).then(response => { - self.$message.success('新增成功！'); + self.$message.success(this.$t('system.addSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('新增失败！' + error.message); + self.$message.error(this.$t('error.addFailed') + error.message); }); } else { - this.$message.error('请选择用户'); + this.$message.error(this.$t('rules.chooseUser')); } }, handleClose(done) { diff --git a/src/views/management/userSimulation/index.vue b/src/views/management/userSimulation/index.vue index e16045f55..1251f9b9f 100644 --- a/src/views/management/userSimulation/index.vue +++ b/src/views/management/userSimulation/index.vue @@ -29,16 +29,16 @@ export default { pageIndex: 'pageNum' }, queryForm: { - labelWidth: '80px', + labelWidth: '120px', reset: true, queryObject: { trainingName: { type: 'text', - label: '实训名称' + label: this.$t('system.trainingName') }, userName: { type: 'text', - label: '用户名' + label: this.$t('system.userName') } } @@ -49,41 +49,41 @@ export default { indexShow: true, columns: [ { - title: '用户名称', + title: this.$t('system.userName'), prop: 'userName' }, { - title: '用户手机号', + title: this.$t('system.mobile'), prop: 'userMobile' }, { - title: '地图名称', + title: this.$t('system.mapName'), prop: 'mapName' }, { - title: '实训用时', + title: this.$t('system.trainingUseTime'), prop: 'duration', type: 'tag', columnValue: (row) => { return this.computation(row.duration); }, tagType: (row) => { return 'success'; } }, { - title: '产品名称', + title: this.$t('system.productName'), prop: 'mapPrdName' }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', hide: (row) => { return !row.fake; }, buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.edit, showControl: (row) => { return row.fake; } }, { - name: '删除', + name: this.$t('global.delete'), handleClick: this.handleDelete, type: 'danger', showControl: (row) => { return row.fake; } @@ -92,7 +92,7 @@ export default { } ], actions: [ - { text: '新增', handler: this.createTraining } + { text: this.$t('global.add'), handler: this.createTraining } ] }, currentModel: {} @@ -121,9 +121,9 @@ export default { const f = parseInt(fieldValue / 60); const s = fieldValue % 60; if (f > 0) { - return `${f}分${s}秒`; + return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`; } else { - return `${s}秒`; + return `${s} ${this.$t('system.second')}`; } } }, @@ -135,17 +135,17 @@ export default { // 删除 handleDelete(index, row) { - this.$confirm('此操作将删除此用户仿真数据, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { deleteSimulationStats(row.id).then(response => { - this.$message.success('删除成功'); + this.$message.success(this.$t('system.deleteSuccess')); this.reloadTable(); }).catch(() => { this.reloadTable(); - this.$messageBox('删除失败'); + this.$messageBox(this.$t('error.deleteFailed')); }); }); }, diff --git a/src/views/management/userTraining/add.vue b/src/views/management/userTraining/add.vue index d943c6e29..9bd04ad24 100644 --- a/src/views/management/userTraining/add.vue +++ b/src/views/management/userTraining/add.vue @@ -3,8 +3,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -48,12 +48,12 @@ export default { form() { this.type === 'ADD'; const form = { - labelWidth: '100px', + labelWidth: '150px', items: [ - { prop: 'lessonId', label: '课程名称', type: 'select', required: true, options: this.LessonList }, - { prop: 'trainingName', label: '实训名称', type: 'text', required: true, rightWidth: true, disabled: true, buttontip: '选择实训', buttonClick: this.buttonClick, placeholder: '请选择实训' }, - { prop: 'userName', label: '用户名称', type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' }, - { prop: 'duration', label: '实训时长', type: 'text', required: true, rightWidth: true, message: 's' } + { prop: 'lessonId', label: this.$t('system.lessonName'), type: 'select', required: true, options: this.LessonList }, + { prop: 'trainingName', label: this.$t('system.trainingName'), type: 'text', required: true, rightWidth: true, disabled: true, buttontip: this.$t('system.selectTraining'), buttonClick: this.buttonClick, placeholder: this.$t('rules.pleaseSelectTraining') }, + { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') }, + { prop: 'duration', label: this.$t('system.trainingTime'), type: 'text', required: true, rightWidth: true, message: 's' } ] }; return form; @@ -61,22 +61,22 @@ export default { rules() { const crules = { lessonId: [ - { required: true, message: '请输入教学名称', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseInputLessonName'), trigger: 'change' } ], trainingName: [ - { required: true, message: '请选择实训', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectTraining'), trigger: 'change' } ], userName: [ - { required: true, message: '请输入用户名称', trigger: 'change' } + { required: true, message: this.$t('rules.userNameInput'), trigger: 'change' } ], duration: [ - { required: true, message: '请输入时长', trigger: 'blur' } + { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' } ] }; return crules; }, title() { - return '创建用户实训'; + return this.$t('system.createUserTraining'); } }, mounted() { @@ -139,14 +139,6 @@ export default { }, show(data) { this.dialogVisible = true; - // this.formModel = { - // lessonId: '', - // trainingId: '', - // trainingName: '', - // userId: '', - // userName: '', - // duration: '', - // }; }, doSave() { const self = this; @@ -158,14 +150,14 @@ export default { const self = this; if (this.formModel.userId) { addUserTraining(this.formModel).then(response => { - self.$message.success('创建成功！'); + self.$message.success(this.$t('system.addSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('创建失败！' + error.message); + self.$message.error(this.$t('error.addFailed') + error.message); }); } else { - self.$message.error('请选择用户'); + self.$message.error(this.$t('rules.chooseUser')); } }, handleClose(done) { diff --git a/src/views/management/userTraining/addTraining.vue b/src/views/management/userTraining/addTraining.vue index fb7d44382..92a079ab3 100644 --- a/src/views/management/userTraining/addTraining.vue +++ b/src/views/management/userTraining/addTraining.vue @@ -17,8 +17,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -34,7 +34,7 @@ export default { data() { return { dialogVisibles: false, - title: '选择实训', + title: this.$t('system.selectTraining'), treeData: [{ children: [], name: '' diff --git a/src/views/management/userTraining/edit.vue b/src/views/management/userTraining/edit.vue index ed229affe..8555f8b11 100644 --- a/src/views/management/userTraining/edit.vue +++ b/src/views/management/userTraining/edit.vue @@ -2,8 +2,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -37,10 +37,10 @@ export default { const form = { labelWidth: '100px', items: [ - { prop: 'lessonName', label: '教学名称', type: 'text', required: false, disabled: true }, - { prop: 'trainingName', label: '实训名称', type: 'text', required: true, disabled: true }, - { prop: 'userName', label: '用户名称', type: 'text', required: true, disabled: true }, - { prop: 'duration', label: '实训时长', type: 'text', required: true, rightWidth: true, message: 's' } + { prop: 'lessonName', label: this.$t('system.lessonName'), type: 'text', required: false, disabled: true }, + { prop: 'trainingName', label: this.$t('system.trainingName'), type: 'text', required: true, disabled: true }, + { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: true, disabled: true }, + { prop: 'duration', label: this.$t('system.trainingTime'), type: 'text', required: true, rightWidth: true, message: 's' } ] }; return form; @@ -48,13 +48,13 @@ export default { rules() { const crules = { duration: [ - { required: true, message: '请输入时长', trigger: 'blur' } + { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' } ] }; return crules; }, title() { - return '编辑实训详情'; + return this.$t('system.editTrainingDetail'); } }, methods: { @@ -67,7 +67,6 @@ export default { userName: data.userName, trainingName: data.trainingName, duration: data.duration - // trainingCount: data.trainingCount }; } }, @@ -84,11 +83,11 @@ export default { duration: this.formModel.duration }; putUserTraining(param).then(response => { - self.$message.success('修改成功！'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('修改失败！' + error.message); + self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/userTraining/index.vue b/src/views/management/userTraining/index.vue index 39fac325b..f69b186d6 100644 --- a/src/views/management/userTraining/index.vue +++ b/src/views/management/userTraining/index.vue @@ -24,16 +24,16 @@ export default { pageIndex: 'pageNum' }, queryForm: { - labelWidth: '80px', + labelWidth: '120px', reset: true, queryObject: { trainingName: { type: 'text', - label: '实训名称' + label: this.$t('system.trainingName') }, userName: { type: 'text', - label: '用户名' + label: this.$t('system.userName') } } @@ -44,40 +44,40 @@ export default { indexShow: true, columns: [ { - title: '用户名称', + title: this.$t('system.userName'), prop: 'userName' }, { - title: '用户手机号', + title: this.$t('system.mobile'), prop: 'userMobile' }, { - title: '课程名称', + title: this.$t('system.lessonName'), prop: 'lessonName' }, { - title: '实训用时', + title: this.$t('system.trainingUseTime'), prop: 'duration', type: 'tag', columnValue: (row) => { return this.computation(row.duration); }, tagType: (row) => { return 'success'; } }, { - title: '实训名称', + title: this.$t('system.trainingName'), prop: 'trainingName' }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.edit, showControl: (row) => { return row.fake != '0'; } }, { - name: '删除', + name: this.$t('global.delete'), handleClick: this.handleDelete, type: 'danger', showControl: (row) => { return row.fake != '0'; } @@ -86,7 +86,7 @@ export default { } ], actions: [ - { text: '新增', handler: this.createTraining } + { text: this.$t('global.add'), handler: this.createTraining } ] }, currentModel: {} @@ -107,9 +107,9 @@ export default { const f = parseInt(fieldValue / 60); const s = fieldValue % 60; if (f > 0) { - return `${f}分${s}秒`; + return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`; } else { - return `${s}秒`; + return `${s} ${this.$t('system.second')}`; } } }, @@ -121,17 +121,17 @@ export default { // 删除 handleDelete(index, row) { - this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { deleteUserTraining(row.id).then(response => { - this.$message.success('删除成功'); + this.$message.success(this.$t('system.deleteSuccess')); this.reloadTable(); }).catch(() => { this.reloadTable(); - this.$messageBox('删除失败'); + this.$messageBox(this.$t('error.deleteFailed')); }); }); }, diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue index 644c6990a..9bfe84ddd 100644 --- a/src/views/map/mapdraft/mapedit/index.vue +++ b/src/views/map/mapdraft/mapedit/index.vue @@ -86,7 +86,9 @@ export default { this.initAutoSaveTask(); }, $route() { - this.loadInitPage(); + this.$$nextTick(() => { + this.loadInitPage(); + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue index e23552c46..048fad5f9 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue @@ -177,8 +177,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue index 9415fffd7..28460adda 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue @@ -170,8 +170,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue index 1b8280cc1..d9ca8026a 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue @@ -152,8 +152,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue index 519161ae6..9ce723829 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue @@ -161,8 +161,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue index 5ca33cece..f9ae9608e 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue @@ -152,8 +152,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue index 27e1956e0..68e7f0b5a 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue @@ -181,8 +181,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue index dcff2b146..4d5b750e3 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue @@ -294,8 +294,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.dataform.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.dataform.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue index ca9aaaa0e..2fcbbfedc 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue @@ -181,8 +181,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.dataform.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.dataform.resetFields(); + this.activeName = 'first'; + }); } }, methods: { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue index 45a0f615c..474face21 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue @@ -165,8 +165,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.dataform.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.dataform.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue index 2b0809ad3..993dd7c19 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue @@ -217,8 +217,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.dataform.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.dataform.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue index 3de885a33..52f1ef399 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue @@ -180,8 +180,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.dataform.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.dataform.resetFields(); + this.activeName = 'first'; + }); } }, mounted() { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/text.vue b/src/views/map/mapdraft/mapedit/mapoperate/text.vue index 51908993c..b3cb71c26 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/text.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/text.vue @@ -150,8 +150,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, methods: { diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue b/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue new file mode 100644 index 000000000..6a80f4714 --- /dev/null +++ b/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue @@ -0,0 +1,299 @@ + + + + diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue index fb49bd227..d81c54548 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue @@ -163,8 +163,10 @@ export default { this.deviceSelect(val); }, $route() { - this.$refs.form.resetFields(); - this.activeName = 'first'; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.activeName = 'first'; + }); } }, methods: { diff --git a/src/views/map/product/draft.vue b/src/views/map/product/draft.vue index 31dbaaff1..c1947c450 100644 --- a/src/views/map/product/draft.vue +++ b/src/views/map/product/draft.vue @@ -127,16 +127,16 @@ export default { baseRules() { return { code: [ - { required: true, message: this.$t('map.productCodeEnter'), trigger: 'change' } + { required: true, message: this.$t('rules.productCodeEnter'), trigger: 'change' } ], name: [ - { required: true, message: this.$t('map.productNameEnter'), trigger: 'change' } + { required: true, message: this.$t('rules.productNameEnter'), trigger: 'change' } ], remarks: [ - { required: true, message: this.$t('map.productDescriptionEnter'), trigger: 'change' } + { required: true, message: this.$t('rules.productDescriptionEnter'), trigger: 'change' } ], trainTypes: [ - { required: true, message: this.$t('map.trainingTypeSelect'), trigger: 'change' } + { required: true, message: this.$t('rules.trainingTypeSelect'), trigger: 'change' } ] }; } diff --git a/src/views/map/product/list.vue b/src/views/map/product/list.vue index d7f857546..9a6485761 100644 --- a/src/views/map/product/list.vue +++ b/src/views/map/product/list.vue @@ -130,7 +130,7 @@ export default { // 删除 handleDelete(index, row) { - this.$confirm(this.$t('map.deleteTypeHint'), this.$t('tip.hint'), { + this.$confirm(this.$t('tip.deleteTypeHint'), this.$t('tip.hint'), { confirmButtonText: this.$t('tip.confirm'), cancelButtonText: this.$t('tip.cancel'), type: 'warning' diff --git a/src/views/map/runplan/chart.vue b/src/views/map/runplan/chart.vue index b384b2f56..0c9ff5650 100644 --- a/src/views/map/runplan/chart.vue +++ b/src/views/map/runplan/chart.vue @@ -3,7 +3,7 @@
- {{$t('global.return')}} + {{ $t('global.return') }}
@@ -136,14 +136,6 @@ export default { kmRangeCoordMap: {} }; }, - watch: { - '$store.state.runPlan.planSizeCount': function () { - this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height }); - }, - $route() { - this.loadChartPage(this.$route.query); - } - }, computed: { ...mapGetters('runPlan', [ 'stations' @@ -158,6 +150,16 @@ export default { return this.$route.params.mode; } }, + watch: { + '$store.state.runPlan.planSizeCount': function () { + this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height }); + }, + $route() { + this.$nextTick(() => { + this.loadChartPage(this.$route.query); + }); + } + }, mounted() { this.loadChartPage(this.$route.query); }, diff --git a/src/views/map/runplan/draft/setting.vue b/src/views/map/runplan/draft/setting.vue index 0eea20c7c..9a05cfdd1 100644 --- a/src/views/map/runplan/draft/setting.vue +++ b/src/views/map/runplan/draft/setting.vue @@ -36,7 +36,7 @@ rules() { return { timeArea: [ - { required: true, message: this.$t('map.selectDataRange'), trigger: 'change' } + { required: true, message: this.$t('rules.selectDataRange'), trigger: 'change' } ] } } diff --git a/src/views/map/runplan/manage/create.vue b/src/views/map/runplan/manage/create.vue index 54ab7a7c3..4f2917a74 100644 --- a/src/views/map/runplan/manage/create.vue +++ b/src/views/map/runplan/manage/create.vue @@ -163,29 +163,29 @@ export default { levelRules() { return { level1: [ - { required: true, message: this.$t('map.speedLevelEnter1'), trigger: 'change' } + { required: true, message: this.$t('rules.speedLevelEnter1'), trigger: 'change' } ], level2: [ - { required: true, message: this.$t('map.speedLevelEnter2'), trigger: 'change' } + { required: true, message: this.$t('rules.speedLevelEnter2'), trigger: 'change' } ], level3: [ - { required: true, message: this.$t('map.speedLevelEnter3'), trigger: 'change' } + { required: true, message: this.$t('rules.speedLevelEnter3'), trigger: 'change' } ], level4: [ - { required: true, message: this.$t('map.speedLevelEnter4'), trigger: 'change' } + { required: true, message: this.$t('rules.speedLevelEnter4'), trigger: 'change' } ] }; }, chartRules() { return { name: [ - { required: true, message: this.$t('map.nameEnter'), trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' } ], direct: [ - { required: true, message: this.$t('map.drivingDirectionSelect'), trigger: 'change' } + { required: true, message: this.$t('rules.drivingDirectionSelect'), trigger: 'change' } ], timeInterval: [ - { required: true, message: this.$t('map.timeBetweenDeparturesEnter'), trigger: 'blur' } + { required: true, message: this.$t('rules.timeBetweenDeparturesEnter'), trigger: 'blur' } ], startTime: [ { required: true, message: this.$t('global.enterStartTime'), trigger: 'blur' } @@ -194,13 +194,13 @@ export default { { required: true, message: this.$t('global.enterEndTime'), trigger: 'blur' } ], parkingTime: [ - { required: true, message: this.$t('map.stopTimeEnter'), trigger: 'blur' } + { required: true, message: this.$t('rules.stopTimeEnter'), trigger: 'blur' } ], entrance: [ - { required: true, message: this.$t('map.entranceStationSelect'), trigger: 'change' } + { required: true, message: this.$t('rules.entranceStationSelect'), trigger: 'change' } ], exit: [ - { required: true, message: this.$t('map.exportStationSelect'), trigger: 'change' } + { required: true, message: this.$t('rules.exportStationSelect'), trigger: 'change' } ] }; } diff --git a/src/views/map/runplan/manage/import.vue b/src/views/map/runplan/manage/import.vue index 9cef296dd..c06ff5e44 100644 --- a/src/views/map/runplan/manage/import.vue +++ b/src/views/map/runplan/manage/import.vue @@ -36,7 +36,7 @@ export default { rules() { return { filename: [ - { required: true, message: this.$t('map.selectImportFiles'), trigger: 'change' } + { required: true, message: this.$t('rules.selectImportFiles'), trigger: 'change' } ] }; } @@ -57,7 +57,7 @@ export default { if (file) { const loading = this.$loading({ lock: true, - text: this.$t('map.underImport'), + text: this.$t('tip.underImport'), spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }); diff --git a/src/views/map/runplan/manage/operateMenu.vue b/src/views/map/runplan/manage/operateMenu.vue index a2e3b838a..f114b475d 100644 --- a/src/views/map/runplan/manage/operateMenu.vue +++ b/src/views/map/runplan/manage/operateMenu.vue @@ -129,7 +129,7 @@ export default { const loading = this.$loading({ lock: true, visible: true, - text: this.$t('map.underImport'), + text: this.$t('tip.underImport'), spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }); diff --git a/src/views/map/skinCode/draft.vue b/src/views/map/skinCode/draft.vue index 599cfd8b6..036f11c2b 100644 --- a/src/views/map/skinCode/draft.vue +++ b/src/views/map/skinCode/draft.vue @@ -71,7 +71,7 @@ export default { { prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled }, { prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false }, { prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false }, - { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('map.maxScaling') } + { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('rules.maxScaling') } ] }; return form; @@ -80,22 +80,22 @@ export default { rules() { const baseRules = { code: [ - { required: true, message: this.$t('map.skinCodingInput'), trigger: 'blur' } + { required: true, message: this.$t('rules.skinCodingInput'), trigger: 'blur' } ], name: [ - { required: true, message: this.$t('map.skinDesignationInput'), trigger: 'blur' } + { required: true, message: this.$t('rules.skinDesignationInput'), trigger: 'blur' } ], origin: [ - { required: true, message: this.$t('map.coordinatesOriginInput'), trigger: 'blur' } + { required: true, message: this.$t('rules.coordinatesOriginInput'), trigger: 'blur' } ], scaling: [ - { required: true, message: this.$t('map.scalingInput'), trigger: 'blur' }, + { required: true, message: this.$t('rules.scalingInput'), trigger: 'blur' }, { validator(rule, value, callback) { if (Number(value) >= 1 && Number(value) <= 8) { callback(); } else { - callback(new Error(this.$t('map.scalingInputPrompt'))); + callback(new Error(this.$t('rules.scalingInputPrompt'))); } }, trigger: 'blur' @@ -151,7 +151,7 @@ export default { this.$messageBox(this.$t('tip.creatingFailed')); }); }).catch(() => { - this.$messageBox(this.$t('map.skinCodingExist')); + this.$messageBox(this.$t('tip.skinCodingExist')); }); }); }, diff --git a/src/views/map/skinCode/index.vue b/src/views/map/skinCode/index.vue index 278b0c009..e27e6f5f3 100644 --- a/src/views/map/skinCode/index.vue +++ b/src/views/map/skinCode/index.vue @@ -103,7 +103,7 @@ export default { this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`); }, handleDelete(index, row) { - this.$confirm(this.$t('map.skinDeleteConfirmation'), this.$t('tip.hint'), { + this.$confirm(this.$t('tip.skinDeleteConfirmation'), this.$t('tip.hint'), { confirmButtonText: this.$t('tip.confirm'), cancelButtonText: this.$t('tip.cancel'), type: 'warning' diff --git a/src/views/map/skinStyle/draft.vue b/src/views/map/skinStyle/draft.vue index 4e0f512a6..8726d1bc2 100644 --- a/src/views/map/skinStyle/draft.vue +++ b/src/views/map/skinStyle/draft.vue @@ -74,7 +74,7 @@ export default { { prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled }, { prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false }, { prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false }, - { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('map.maxScaling') }, + { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('rules.maxScaling') }, { prop: 'linkWidth', label: this.$t('map.linkWidth'), type: 'number', required: false, message: this.$t('map.maxLinkWidth') }, { prop: 'zoneWidth', label: this.$t('map.sectionWidth'), type: 'number', required: false, message: this.$t('map.maxSectionWidth') }, { prop: 'watermarkShow', label: this.$t('map.showWatermarkOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether } @@ -86,55 +86,55 @@ export default { rules() { const baseRules = { code: [ - { required: true, message: this.$t('map.skinCodingInput'), trigger: 'blur' } + { required: true, message: this.$t('rules.skinCodingInput'), trigger: 'blur' } ], name: [ - { required: true, message: this.$t('map.skinDesignationInput'), trigger: 'blur' } + { required: true, message: this.$t('rules.skinDesignationInput'), trigger: 'blur' } ], origin: [ - { required: true, message: this.$t('map.coordinatesOriginInput'), trigger: 'blur' } + { required: true, message: this.$t('rules.coordinatesOriginInput'), trigger: 'blur' } ], scaling: [ - { required: true, message: this.$t('map.scalingInput'), trigger: 'blur' }, + { required: true, message: this.$t('rules.scalingInput'), trigger: 'blur' }, { validator(rule, value, callback) { if (Number(value) >= 1 && Number(value) <= 8) { callback(); } else { - callback(new Error(this.$t('map.scalingInputPrompt'))); + callback(new Error(this.$t('rules.scalingInputPrompt'))); } }, trigger: 'blur' } ], linkWidth: [ - { required: true, message: this.$t('map.linkWidthInput'), trigger: 'blur' }, + { required: true, message: this.$t('rules.linkWidthInput'), trigger: 'blur' }, { validator(rule, value, callback) { if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 20) { callback(); } else { - callback(new Error(this.$t('map.linkWidthInputPrompt'))); + callback(new Error(this.$t('rules.linkWidthInputPrompt'))); } }, trigger: 'blur' } ], zoneWidth: [ - { required: true, message: this.$t('map.sectionWidthInput'), trigger: 'blur' }, + { required: true, message: this.$t('rules.sectionWidthInput'), trigger: 'blur' }, { validator(rule, value, callback) { if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 30) { callback(); } else { - callback(new Error(this.$t('map.sectionWidthInputPrompt'))); + callback(new Error(this.$t('rules.sectionWidthInputPrompt'))); } }, trigger: 'blur' } ], watermarkShow: [ - { required: true, message: this.$t('map.selectShowWatermark'), trigger: 'change' } + { required: true, message: this.$t('rules.selectShowWatermark'), trigger: 'change' } ] }; @@ -189,7 +189,7 @@ export default { this.$messageBox(this.$t('tip.creatingFailed')); }); }).catch(() => { - this.$messageBox(this.$t('map.skinCodingExist')); + this.$messageBox(this.$t('tip.skinCodingExist')); }); }); }, diff --git a/src/views/map/skinStyle/index.vue b/src/views/map/skinStyle/index.vue index 8fdf371cd..0c82090ae 100644 --- a/src/views/map/skinStyle/index.vue +++ b/src/views/map/skinStyle/index.vue @@ -120,7 +120,7 @@ export default { this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`); }, handleDelete(index, row) { - this.$confirm(this.$t('map.skinDeleteConfirmation'), this.$t('tip.hint'), { + this.$confirm(this.$t('tip.skinDeleteConfirmation'), this.$t('tip.hint'), { confirmButtonText: this.$t('tip.confirm'), cancelButtonText: this.$t('tip.cancel'), type: 'warning' diff --git a/src/views/orderauthor/author/detail.vue b/src/views/orderauthor/author/detail.vue index b57a668fd..046a09d35 100644 --- a/src/views/orderauthor/author/detail.vue +++ b/src/views/orderauthor/author/detail.vue @@ -35,7 +35,7 @@ export default { computed: { form() { const form = { - labelWidth: '100px', + labelWidth: '130px', items: [ { prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true }, { prop: 'name', label: this.$t('orderAuthor.distributionUser'), type: 'text', disabled: true }, @@ -46,7 +46,7 @@ export default { }, formOrder() { const form = { - labelWidth: '100px', + labelWidth: '130px', items: [ { prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true }, { prop: 'order', label: this.$t('orderAuthor.orderNumber'), type: 'text', disabled: true } diff --git a/src/views/orderauthor/author/draft.vue b/src/views/orderauthor/author/draft.vue index 23cc20b9e..ad45eb187 100644 --- a/src/views/orderauthor/author/draft.vue +++ b/src/views/orderauthor/author/draft.vue @@ -11,8 +11,8 @@
- {{$t('global.create')}} - {{$t('global.return')}} + {{ $t('global.create') }} + {{ $t('global.back') }}
@@ -63,7 +63,7 @@ export default { }, rules() { - const _this = this; + const _this = this; const baseRules = { userId: [ { required: true, message: this.$t('rules.userNameInput'), trigger: 'blur' } diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue index 30db034cf..625ae7341 100644 --- a/src/views/orderauthor/author/index.vue +++ b/src/views/orderauthor/author/index.vue @@ -1,244 +1,241 @@ diff --git a/src/views/orderauthor/commodity/draft.vue b/src/views/orderauthor/commodity/draft.vue index 739a0209e..bf3ca955a 100644 --- a/src/views/orderauthor/commodity/draft.vue +++ b/src/views/orderauthor/commodity/draft.vue @@ -19,7 +19,7 @@ {{ $t('global.create') }} {{ $t('global.update') }} - {{ $t('global.return') }} + {{ $t('global.back') }} @@ -105,7 +105,7 @@ export default { form() { const form = { - labelWidth: '135px', + labelWidth: '140px', items: [ { prop: 'name', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false }, { prop: 'productType', label: this.$t('orderAuthor.productType'), type: 'select', required: false, disabled: this.isDisabled, options: this.productTypeList, change: true, onChange: this.typeChange }, diff --git a/src/views/orderauthor/commodity/index.vue b/src/views/orderauthor/commodity/index.vue index d271e66e4..1476c970f 100644 --- a/src/views/orderauthor/commodity/index.vue +++ b/src/views/orderauthor/commodity/index.vue @@ -1,221 +1,220 @@ diff --git a/src/views/orderauthor/order/addGoods.vue b/src/views/orderauthor/order/addGoods.vue index 67bd4b220..dab334ff8 100644 --- a/src/views/orderauthor/order/addGoods.vue +++ b/src/views/orderauthor/order/addGoods.vue @@ -1,189 +1,195 @@ diff --git a/src/views/orderauthor/order/canDistribute.vue b/src/views/orderauthor/order/canDistribute.vue index e8e25941a..8f9a721d4 100644 --- a/src/views/orderauthor/order/canDistribute.vue +++ b/src/views/orderauthor/order/canDistribute.vue @@ -1,54 +1,62 @@ diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue index d593daf3d..d6be9ea6b 100644 --- a/src/views/orderauthor/order/draft.vue +++ b/src/views/orderauthor/order/draft.vue @@ -1,511 +1,508 @@ diff --git a/src/views/orderauthor/order/list.vue b/src/views/orderauthor/order/list.vue index e22a440aa..2ca09548b 100644 --- a/src/views/orderauthor/order/list.vue +++ b/src/views/orderauthor/order/list.vue @@ -1,312 +1,310 @@ diff --git a/src/views/orderauthor/permission/detail.vue b/src/views/orderauthor/permission/detail.vue index d66b66188..e0616a9dd 100644 --- a/src/views/orderauthor/permission/detail.vue +++ b/src/views/orderauthor/permission/detail.vue @@ -1,174 +1,169 @@