From 4bc57953bc0d6e3c0e42194d21f27f354e7027e6 Mon Sep 17 00:00:00 2001 From: shuiluo Date: Fri, 30 Jul 2021 12:13:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BA=BF=E8=B7=AF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/local/basic.js | 19 +++++ src/local/index.js | 2 + src/local/select.js | 3 + src/local/table.js | 10 +++ src/pages/ranger/basic/line/Schedule/add.vue | 43 ++++++----- .../ranger/basic/line/Schedule/index.vue | 22 +++--- src/pages/ranger/basic/line/add_edit.vue | 71 +++++++++++++------ src/pages/ranger/basic/line/importFlie.vue | 10 +-- src/pages/ranger/basic/line/index.vue | 67 +++++++++-------- src/pages/ranger/basic/line/uploadList.vue | 5 +- 10 files changed, 163 insertions(+), 89 deletions(-) create mode 100644 src/local/basic.js diff --git a/src/local/basic.js b/src/local/basic.js new file mode 100644 index 0000000..f8502d7 --- /dev/null +++ b/src/local/basic.js @@ -0,0 +1,19 @@ +export default { + 'basic.layout': ['编排', 'Layout'], + 'basic.dispatch': ['调度', 'Dispatch'], + 'basic.personalDistribution': ['按人分配', 'Personal Distribution'], + 'basic.distributionBySpecialty': ['按专业分配', 'Distribution By Specialty'], + 'basic.expirationMethod': ['过期方式', 'Expiration Method'], + 'basic.expirationMethodError': ['请选择过期方式', 'Please Select Expiration Method'], + 'basic.nextTaskBegins': ['下次任务开始过期', 'The Next Task Begins To Expire'], + 'basic.oneDay': ['一天后过期', 'Expires In One Day'], + 'basic.sevenDay': ['七天后过期', 'Expires In Seven Days'], + 'basic.moreDay': ['十五天后过期', 'Expires In 15 Days'], + 'basic.notExpired': ['不过期', 'Not Expired'], + 'basic.day': ['白班', 'DAY'], + 'basic.middle': ['中班', 'MIDDLE'], + 'basic.night': ['晚班', 'NIGHT'], + 'basic.generateNext': ['生成第二天线路', 'Generate Next Day Line'], + 'basic.generateNextError': ['请选择', 'Please Select'], + 'basic.executeOnce': ['执行一次', 'Execute Once'], +}; diff --git a/src/local/index.js b/src/local/index.js index 622d150..6ae6b5c 100644 --- a/src/local/index.js +++ b/src/local/index.js @@ -5,6 +5,7 @@ import systemLang from './system'; import InputLang from './input'; import OtherLang from './other'; import acronLang from './acron'; +import basicLang from './basic'; const zh_CN = {}; const en_US = {}; @@ -27,5 +28,6 @@ formatLang(systemLang); formatLang(InputLang); formatLang(OtherLang); formatLang(acronLang); +formatLang(basicLang); export { en_US, zh_CN }; diff --git a/src/local/select.js b/src/local/select.js index cd06cad..6535a31 100644 --- a/src/local/select.js +++ b/src/local/select.js @@ -4,14 +4,17 @@ export default { 'select.startTime': ['开始时间', 'Start Time'], 'select.endTime': ['结束时间', 'End Time'], 'select.region': ['地区', 'Region'], + 'select.regionError': ['请选择地区', 'Please Select Region'], 'select.speciality': ['专业', 'Speciality'], 'select.shiftTypeName': ['班组', 'ShiftTypeName'], + 'select.shiftTypeNameError': ['请输入班组名称', 'Pleas Enter ShiftTypeName'], export: ['导出', 'Export'], 'select.routes': ['线路', 'Routes'], 'select.examine': ['巡检状态', 'Examine Status'], 'select.taskType': ['任务类型', 'Task Type'], 'select.examiner': ['巡检人', 'Examiner'], 'select.routeName': ['线路名称', 'Route Name'], + 'select.routeNameError': ['请输入@:select.routeName', 'Please Enter @:select.routeName'], 'select.option.place': ['地点免检', 'Place Exemption'], 'select.option.unit': ['单元免检', 'Unit Exemption'], }; diff --git a/src/local/table.js b/src/local/table.js index 5dcae47..ed65757 100644 --- a/src/local/table.js +++ b/src/local/table.js @@ -49,6 +49,7 @@ export default { 'table.dataType': ['数据类型', 'Data Type'], 'table.majorName': ['专业名称', 'Major Name'], 'table.major': ['专业', 'Major'], + 'table.majorError': ['请选择@:table.major', 'Please Select @:table.major'], 'table.personnel': ['人员', 'Personnel'], 'table.department': ['部门', 'Department'], 'table.exemptionType': ['免检类型', 'Exemption Type'], @@ -59,4 +60,13 @@ export default { 'table.time.end': ['结束时间', 'Start End'], 'table.reason': ['原因', 'Reason'], 'table.state': ['状态', 'State'], + 'table.import': ['导入', 'Import'], + 'table.takeEffect': ['生效', 'Take Effect'], + 'table.operationSucceeded': ['操作成功', 'Operation Succeeded'], + 'table.uploadFile': ['上传文件', 'Upload File'], + 'table.downloadTemplate': ['下载模板', 'Download Template'], + 'table.distributionMode': ['分配方式', 'Distribution Mode'], + 'table.distributionModeError': ['请选择分配方式', 'Please Select Distribution Mode'], + 'table.yes': ['是', 'YES'], + 'table.no': ['否', 'NO'], }; diff --git a/src/pages/ranger/basic/line/Schedule/add.vue b/src/pages/ranger/basic/line/Schedule/add.vue index b195591..4b9b7eb 100644 --- a/src/pages/ranger/basic/line/Schedule/add.vue +++ b/src/pages/ranger/basic/line/Schedule/add.vue @@ -1,24 +1,33 @@