From c91a4efdcce4c0a6fc779620fff6a1aec27335c6 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 19 Aug 2019 16:35:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/map.js | 31 ------------------- src/i18n/langs/en/orderAuthor.js | 1 - src/i18n/langs/en/rules.js | 29 ++++++++++++++++- src/i18n/langs/en/tip.js | 8 ++++- src/i18n/langs/zh/map.js | 31 ------------------- src/i18n/langs/zh/orderAuthor.js | 1 - src/i18n/langs/zh/rules.js | 29 ++++++++++++++++- src/i18n/langs/zh/tip.js | 8 ++++- src/views/map/product/draft.vue | 8 ++--- src/views/map/product/list.vue | 2 +- src/views/map/runplan/draft/setting.vue | 2 +- src/views/map/runplan/manage/create.vue | 20 ++++++------ src/views/map/runplan/manage/import.vue | 4 +-- src/views/map/runplan/manage/operateMenu.vue | 2 +- src/views/map/skinCode/draft.vue | 14 ++++----- src/views/map/skinCode/index.vue | 2 +- src/views/map/skinStyle/draft.vue | 24 +++++++------- src/views/map/skinStyle/index.vue | 2 +- .../orderauthor/permission/draft/ruleForm.vue | 2 +- 19 files changed, 111 insertions(+), 109 deletions(-) diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index 8eb07da80..29394076a 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -322,16 +322,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', @@ -340,10 +332,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', @@ -356,29 +346,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', @@ -387,20 +365,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..9d00c6281 100644 --- a/src/i18n/langs/en/orderAuthor.js +++ b/src/i18n/langs/en/orderAuthor.js @@ -70,7 +70,6 @@ export default { addRecords: 'AddRecords', totalNumber: 'TotalNumber', permissionToDistributeQRCode: 'Permission to distribute qr code', - selectPackagingRecord: 'Please select the packaging record', editPermissionRules: 'Edit permission rules', addGoods: 'AddGoods', updateGoods: 'UpdateGoods', diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index 325d415fa..1e4034c54 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -176,5 +176,32 @@ 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', + + 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/tip.js b/src/i18n/langs/en/tip.js index 42700b811..902f0206a 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/map.js b/src/i18n/langs/zh/map.js index d3c9b47cf..11188aa78 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -442,16 +442,8 @@ export default { skinDesignation: '皮肤名称', skinCoding: '皮肤编码', coordinatesOrigin: '坐标原点', - skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?', addMapSkin: '添加地图皮肤', updateMapSkin: '更新地图皮肤', - maxScaling: '(缩放比例最大为8级)', - skinCodingInput: '请输入皮肤编码', - skinDesignationInput: '请输入皮肤名称', - coordinatesOriginInput: '请输入原点坐标', - scalingInput: '请输入缩放比例', - scalingInputPrompt: '请输入有效的缩放比例', - skinCodingExist: '地图皮肤编码已存在', stationKilometerMark: '车站公里标', arrivalTime: '到站时间', operationGraphPublished: '运行图发布为', @@ -460,10 +452,8 @@ export default { importOperationGraph: '导入运行图', publishOperationGraph: '发布运行图', deleteOperationGraph: '删除运行图', - underImport: '正在导入中...', mapList: '地图列表', import: '导入', - selectImportFiles: '请选择需要导入的文件', createNewOperationGraph: '新建运行图', setOperatingSpeed: '设置运行速度', speedClass1: '速度等级1', @@ -476,29 +466,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: '产品编码', @@ -507,20 +485,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..37983e4ad 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: '修改商品', diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 2528adb4f..1ee8c33a1 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -176,5 +176,32 @@ export default { unitOfTimeRadio: '请选择时间单位', goodsDescribtionInput: '请输入商品描述', userNameInput: '请输入用户名称', - permissionTypeInput: '请选择权限类型' + permissionTypeInput: '请选择权限类型', + + 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/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/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/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/permission/draft/ruleForm.vue b/src/views/orderauthor/permission/draft/ruleForm.vue index fa7ec9450..103c5319e 100644 --- a/src/views/orderauthor/permission/draft/ruleForm.vue +++ b/src/views/orderauthor/permission/draft/ruleForm.vue @@ -171,7 +171,7 @@ export default { this.$messageBox(this.$t('tip.packagingFailed')); }); } else { - this.$messageBox(this.$t('orderAuthor.selectPackagingRecord')); + this.$messageBox(this.$t('tip.selectPackagingRecord')); } }, qrCodeShow() {