From 8259b24f6c1c0e8ef44cf430a84a67251a481b50 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Tue, 20 Aug 2019 17:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/error.js | 7 +- src/i18n/langs/en/global.js | 13 +- src/i18n/langs/en/index.js | 4 +- src/i18n/langs/en/permission.js | 6 + src/i18n/langs/en/publish.js | 14 +- src/i18n/langs/en/system.js | 2 - src/i18n/langs/zh/error.js | 6 +- src/i18n/langs/zh/global.js | 12 +- src/i18n/langs/zh/index.js | 4 +- src/i18n/langs/zh/permission.js | 6 + src/i18n/langs/zh/publish.js | 15 +- src/i18n/langs/zh/system.js | 2 - .../management/existingSimulation/index.vue | 4 +- src/views/management/userControl/index.vue | 4 +- src/views/management/userExam/index.vue | 2 +- src/views/management/userSimulation/index.vue | 2 +- src/views/management/userTraining/index.vue | 2 +- src/views/map/runplan/manage/create.vue | 2 +- src/views/package/draft/canDistribute.vue | 4 +- src/views/package/draft/editRule.vue | 4 +- src/views/package/draft/ruleForm.vue | 2 +- src/views/package/index.vue | 6 +- src/views/package/selectRole/list.vue | 202 +++++++++--------- src/views/publish/examRule/draft/editRule.vue | 4 +- src/views/publish/examRule/draft/examFrom.vue | 6 +- src/views/publish/examRule/draft/index.vue | 12 +- src/views/publish/examRule/draft/rule.vue | 12 +- src/views/publish/examRule/index.vue | 74 +++---- src/views/publish/productStatus/index.vue | 2 +- src/views/publish/runPlanTemplate/index.vue | 22 +- src/views/publish/simulationScript/index.vue | 15 +- 31 files changed, 267 insertions(+), 205 deletions(-) create mode 100644 src/i18n/langs/en/permission.js create mode 100644 src/i18n/langs/zh/permission.js diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js index f74af8122..9f0ed67dd 100644 --- a/src/i18n/langs/en/error.js +++ b/src/i18n/langs/en/error.js @@ -47,6 +47,9 @@ export default { updateFailed: 'Failure to update', exportException: 'Export exception', operationFailure: 'Operation Failure', - createCommonRunPlanFailed: 'Failed to create a common run plan' - + createCommonRunPlanFailed: 'Failed to create a common run plan', + templateHasBeUse: 'The template has been used by the load plan and cannot be deleted', + setFailed: 'Setup failed', + deleteException: 'To remove exceptions, contact your administrator', + paperHasUseNotDel: 'The paper has been used and cannot be deleted' }; diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js index 53f2aec8f..c29098897 100644 --- a/src/i18n/langs/en/global.js +++ b/src/i18n/langs/en/global.js @@ -34,6 +34,9 @@ export default { distributeExamPermission: 'Distribution of Examination Authority', distributeSimulationPermission: 'Distribution of simulation privileges', distributeScreenPermission: 'Large Screen Privilege Distribution', + email: 'Email', + nickName: 'nickname', + mobile: 'mobile', name: 'Name', code: 'Code', status: 'Status', @@ -64,7 +67,8 @@ export default { toBeDeveloped: 'Functions to be developed', yuan: '￥', filteringKeywords: 'Enter keywords for filtering', - previousStep: 'PreviousStep', + lastStep: 'Last Step', + nextStep: 'Next Step ', skip: 'Skip', modify: 'Modify', language: 'Language', @@ -83,6 +87,9 @@ export default { putaway: 'Putaway', soldOut: 'Sold out', exportMap: 'Export Map', - preview: 'Preview' - + preview: 'Preview', + notBeUse: 'This function is not enabled for the time being', + fastCreate: 'Quickly Create', + duration: 'duration', + isTry: 'Try' }; diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js index f1a31378a..a07a08e0d 100644 --- a/src/i18n/langs/en/index.js +++ b/src/i18n/langs/en/index.js @@ -10,6 +10,7 @@ import tip from './tip'; import system from './system'; import orderAuthor from './orderAuthor'; import publish from './publish'; +import permission from './permission'; export default { ...enLocale, @@ -23,5 +24,6 @@ export default { tip, system, orderAuthor, - publish + publish, + permission }; diff --git a/src/i18n/langs/en/permission.js b/src/i18n/langs/en/permission.js new file mode 100644 index 000000000..3b653e8fc --- /dev/null +++ b/src/i18n/langs/en/permission.js @@ -0,0 +1,6 @@ +export default { + permissionPack: 'Package', + setSuccess: 'Set successfully', + isSureSetBelonger: 'Are you sure to set {name} to be the owner of the permission?', + belonger: 'Set Owner' +}; diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js index ae26e92fb..5ef50045f 100644 --- a/src/i18n/langs/en/publish.js +++ b/src/i18n/langs/en/publish.js @@ -2,6 +2,7 @@ export default { city: 'City', skinType: 'Skin Type', mapName: 'Map Name', + lessonName: 'Lesson Name', updateMapName: 'Update Map Name', updateTime: 'Update Time', operationSuccess: 'Operate successfully', @@ -30,6 +31,17 @@ export default { pleaseSelectTemplate: 'Please Select Template Run Plan', selectMap: 'Select Map', createCommonRunPlan: 'Create Common Run Plan', - createCommonSuccess: 'Creation of a common run plan was successful' + createCommonSuccess: 'Creation of a common run plan was successful', + wellGenerateEveryRunPlan: 'This operation generates a daily running diagram. Do you want to continue?', + wellDelTemplate: 'This action deletes the diagram template. Do you want to continue?', + fullMark: 'Full Mark', + passScore: 'Passing Score', + examTime: 'Exam Time', + creator: 'Creator', + paperName: 'Name Of Test Paper', + setSuccess: 'Set successfully', + wellPutawayPaper: 'This operation puts the paper on the shelf. Do you want to continue?', + wellSoldOutPaper: 'This operation removes the paper from the shelf. Do you want to continue?', + wellDelPaper: 'This operation will delete the paper. Do you want to continue?' }; diff --git a/src/i18n/langs/en/system.js b/src/i18n/langs/en/system.js index eeb86c0a7..15456ff92 100644 --- a/src/i18n/langs/en/system.js +++ b/src/i18n/langs/en/system.js @@ -12,7 +12,6 @@ export default { destory: 'Destory', simulationGroup: 'Simulation Group', userName: 'User Name', - mobile: 'Cell-phone Number', skinCode: 'Skin Code', prdType: 'Product Type', simulationType: 'Simulation Type', @@ -40,7 +39,6 @@ export default { 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', diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js index b34dde2a2..cae2dd1d4 100644 --- a/src/i18n/langs/zh/error.js +++ b/src/i18n/langs/zh/error.js @@ -47,6 +47,10 @@ export default { updateFailed: '更新失败', exportException: '导出异常', operationFailure: '操作失败', - createCommonRunPlanFailed: '创建通用运行图失败' + createCommonRunPlanFailed: '创建通用运行图失败', + templateHasBeUse: '该模板已被加载计划使用，无法删除', + setFailed: '设置失败', + deleteException: '删除异常，请联系管理员', + paperHasUseNotDel: '该试卷已被使用，不能删除' }; diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js index 8a29c925c..9ff16980c 100644 --- a/src/i18n/langs/zh/global.js +++ b/src/i18n/langs/zh/global.js @@ -34,6 +34,9 @@ export default { distributeExamPermission: '考试权限分发', distributeSimulationPermission: '仿真权限分发', distributeScreenPermission: '大屏权限分发', + email: '邮箱', + nickName: '昵称', + mobile: '手机号', name: '名称', code: '编码', status: '状态', @@ -65,7 +68,8 @@ export default { choose: '选 择', yuan: '元', filteringKeywords: '输入关键字进行过滤', - previousStep: '上一步', + lastStep: '上一步', + nextStep: '下一步', skip: '跳过', modify: '修改', language: '语言', @@ -84,6 +88,10 @@ export default { putaway: '上 架', soldOut: '下 架', exportMap: '导出地图', - preview: '预览' + preview: '预览', + notBeUse: '该功能暂时未开启', + fastCreate: '快速创建', + duration: '时长', + isTry: '是否试用' }; diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js index 05e8d3d8f..c009ef004 100644 --- a/src/i18n/langs/zh/index.js +++ b/src/i18n/langs/zh/index.js @@ -10,6 +10,7 @@ import tip from './tip'; import system from './system'; import orderAuthor from './orderAuthor'; import publish from './publish'; +import permission from './permission'; export default { ...cnLocale, @@ -23,5 +24,6 @@ export default { tip, system, orderAuthor, - publish + publish, + permission }; diff --git a/src/i18n/langs/zh/permission.js b/src/i18n/langs/zh/permission.js new file mode 100644 index 000000000..cc986cf52 --- /dev/null +++ b/src/i18n/langs/zh/permission.js @@ -0,0 +1,6 @@ +export default { + permissionPack: '权限打包', + setSuccess: '设置成功', + isSureSetBelonger: '是否确定设置{name}为权限所属人?', + belonger: '设置归属人' +}; diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js index 78f45e63c..eb2aa3f49 100644 --- a/src/i18n/langs/zh/publish.js +++ b/src/i18n/langs/zh/publish.js @@ -2,6 +2,7 @@ export default { city: '所属城市', skinType: '皮肤类型', mapName: '地图名称', + lessonName: '课程名称', updateMapName: '更新地图名称', updateTime: '更新时间', operationSuccess: '操作成功', @@ -30,5 +31,17 @@ export default { pleaseSelectTemplate: '请选择模板运行图', selectMap: '选择地图', createCommonRunPlan: '创建通用运行图', - createCommonSuccess: '创建通用运行图成功' + createCommonSuccess: '创建通用运行图成功', + wellGenerateEveryRunPlan: '此操作将生成每日运行图, 是否继续?', + wellDelTemplate: '此操作将删除此运行图模板, 是否继续?', + fullMark: '满分', + passScore: '及格分', + examTime: '考试时间', + creator: '创建人', + paperName: '试卷名称', + setSuccess: '设置成功', + wellPutawayPaper: '此操作将此试卷上架, 是否继续?', + wellSoldOutPaper: '此操作将此试卷下架, 是否继续?', + wellDelPaper: '此操作将删除该试卷, 是否继续?' + }; diff --git a/src/i18n/langs/zh/system.js b/src/i18n/langs/zh/system.js index ac2ef3ca0..50f88d6f4 100644 --- a/src/i18n/langs/zh/system.js +++ b/src/i18n/langs/zh/system.js @@ -12,7 +12,6 @@ export default { destory: '销 毁', simulationGroup: '仿真Group', userName: '用户名', - mobile: '手机号', skinCode: '皮肤编号', prdType: '产品类型', simulationType: '仿真类型', @@ -40,7 +39,6 @@ export default { editExamDetail: '编辑考试详情', subscribeMap: '订阅地图', roles: '角色', - email: '邮箱', nickname: '昵称', delTypeIsContinue: '此操作将删除该类型, 是否继续?', permission: '权限', diff --git a/src/views/management/existingSimulation/index.vue b/src/views/management/existingSimulation/index.vue index 34c5fbd50..2b5c0b3cb 100644 --- a/src/views/management/existingSimulation/index.vue +++ b/src/views/management/existingSimulation/index.vue @@ -32,7 +32,7 @@ export default { }, mobile: { type: 'text', - label: this.$t('system.mobile') + label: this.$t('global.mobile') }, skinCode: { type: 'select', @@ -68,7 +68,7 @@ export default { prop: 'creator.name' }, { - title: this.$t('system.mobile'), + title: this.$t('global.mobile'), prop: 'creator.mobile' }, { diff --git a/src/views/management/userControl/index.vue b/src/views/management/userControl/index.vue index eafbbbe37..3f366cfa6 100644 --- a/src/views/management/userControl/index.vue +++ b/src/views/management/userControl/index.vue @@ -55,11 +55,11 @@ export default { prop: 'nickname' }, { - title: this.$t('system.mobile'), + title: this.$t('global.mobile'), prop: 'mobile' }, { - title: this.$t('system.email'), + title: this.$t('system.global.email'), prop: 'email' }, { diff --git a/src/views/management/userExam/index.vue b/src/views/management/userExam/index.vue index 95efae1af..3349e0412 100644 --- a/src/views/management/userExam/index.vue +++ b/src/views/management/userExam/index.vue @@ -75,7 +75,7 @@ export default { prop: 'userName' }, { - title: this.$t('system.mobile'), + title: this.$t('global.mobile'), prop: 'userMobile' }, { diff --git a/src/views/management/userSimulation/index.vue b/src/views/management/userSimulation/index.vue index 1251f9b9f..8522c4340 100644 --- a/src/views/management/userSimulation/index.vue +++ b/src/views/management/userSimulation/index.vue @@ -53,7 +53,7 @@ export default { prop: 'userName' }, { - title: this.$t('system.mobile'), + title: this.$t('global.mobile'), prop: 'userMobile' }, { diff --git a/src/views/management/userTraining/index.vue b/src/views/management/userTraining/index.vue index f69b186d6..e7205c416 100644 --- a/src/views/management/userTraining/index.vue +++ b/src/views/management/userTraining/index.vue @@ -48,7 +48,7 @@ export default { prop: 'userName' }, { - title: this.$t('system.mobile'), + title: this.$t('global.mobile'), prop: 'userMobile' }, { diff --git a/src/views/map/runplan/manage/create.vue b/src/views/map/runplan/manage/create.vue index 4f2917a74..4028ce95e 100644 --- a/src/views/map/runplan/manage/create.vue +++ b/src/views/map/runplan/manage/create.vue @@ -98,7 +98,7 @@ - {{$t('global.previousStep')}} + {{$t('global.lastStep')}} {{$t('global.skip')}} {{$t('global.create')}} diff --git a/src/views/package/draft/canDistribute.vue b/src/views/package/draft/canDistribute.vue index f0d003267..8dfec5c53 100644 --- a/src/views/package/draft/canDistribute.vue +++ b/src/views/package/draft/canDistribute.vue @@ -8,8 +8,8 @@ - 取 消 - 确 定 + {{ $t('global.cancel') }} + {{ $t('global.confirm') }} diff --git a/src/views/package/draft/editRule.vue b/src/views/package/draft/editRule.vue index 26958a747..32c0f61ad 100644 --- a/src/views/package/draft/editRule.vue +++ b/src/views/package/draft/editRule.vue @@ -2,9 +2,9 @@ - {{ isAdd? '添加': '修改' }} + {{ isAdd? $t('global.add'): $t('global.edit') }} - 取 消 + {{ $t('global.cancel') }} diff --git a/src/views/package/draft/ruleForm.vue b/src/views/package/draft/ruleForm.vue index 1c2fc5324..6968f6a9d 100644 --- a/src/views/package/draft/ruleForm.vue +++ b/src/views/package/draft/ruleForm.vue @@ -51,7 +51,7 @@ 打包 获取二维码 - 返回 + {{ $t('global.back') }} { return this.$store.state.user.roles.indexOf(superAdmin) < 0; }, buttons: [ { - name: '设置归属人', + name: this.$t('permission.belonger'), handleClick: this.handleRoleVest, type: '' } @@ -155,7 +155,7 @@ export default { } ], actions: [ - { text: '打包权限', btnCode: 'employee_insert', handler: this.handlePermissionPack } + { text: this.$t('permission.permissionPack'), btnCode: 'employee_insert', handler: this.handlePermissionPack } ] } }; diff --git a/src/views/package/selectRole/list.vue b/src/views/package/selectRole/list.vue index 22968e4ce..66fc8de76 100644 --- a/src/views/package/selectRole/list.vue +++ b/src/views/package/selectRole/list.vue @@ -1,107 +1,111 @@ \ No newline at end of file + reloadTable() { + this.queryList.reload(); + } + } +}; + diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue index 085e82cd9..c162c6a4c 100644 --- a/src/views/publish/examRule/draft/editRule.vue +++ b/src/views/publish/examRule/draft/editRule.vue @@ -47,8 +47,8 @@
- 取 消 - 确 定 + {{ $t('global.cancel') }} + {{ $t('global.confirm') }}
diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue index e338c6f61..151bdd23c 100644 --- a/src/views/publish/examRule/draft/examFrom.vue +++ b/src/views/publish/examRule/draft/examFrom.vue @@ -67,9 +67,9 @@ + {{ $t('error.edit') }} + {{ $t('error.nextStep') }} + --> diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue index 155c71140..93e1c07d6 100644 --- a/src/views/publish/examRule/draft/index.vue +++ b/src/views/publish/examRule/draft/index.vue @@ -1,7 +1,7 @@