From e3bbf6d18ff182856d76f807ef9f40b821dc249f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?= <9463626+zhou-junjiezjj@user.noreply.gitee.com> Date: Thu, 30 Nov 2023 15:07:13 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-ui/src/i18n/langs/auto/en.js | 2 +- acs/nladmin-ui/src/i18n/langs/chinese.js | 35 ++++++++-------- acs/nladmin-ui/src/i18n/langs/english.js | 35 ++++++++-------- acs/nladmin-ui/src/i18n/langs/indonesian.js | 35 ++++++++-------- acs/nladmin-ui/src/i18n/langs/timing/en.js | 25 ++++++++++++ acs/nladmin-ui/src/i18n/langs/timing/in.js | 25 ++++++++++++ acs/nladmin-ui/src/i18n/langs/timing/zh.js | 25 ++++++++++++ .../src/views/system/timing/index.vue | 40 +++++++++---------- 8 files changed, 150 insertions(+), 72 deletions(-) create mode 100644 acs/nladmin-ui/src/i18n/langs/timing/en.js create mode 100644 acs/nladmin-ui/src/i18n/langs/timing/in.js create mode 100644 acs/nladmin-ui/src/i18n/langs/timing/zh.js diff --git a/acs/nladmin-ui/src/i18n/langs/auto/en.js b/acs/nladmin-ui/src/i18n/langs/auto/en.js index 5332409..1b09168 100644 --- a/acs/nladmin-ui/src/i18n/langs/auto/en.js +++ b/acs/nladmin-ui/src/i18n/langs/auto/en.js @@ -11,7 +11,7 @@ export default { 'operate': 'operate', }, 'msg': { - 'stop_msg': 'Are you sure to stop this thread?' + 'select_msg': 'Are you sure to stop this thread?' } } } \ No newline at end of file diff --git a/acs/nladmin-ui/src/i18n/langs/chinese.js b/acs/nladmin-ui/src/i18n/langs/chinese.js index a05c81f..a1015d4 100644 --- a/acs/nladmin-ui/src/i18n/langs/chinese.js +++ b/acs/nladmin-ui/src/i18n/langs/chinese.js @@ -13,21 +13,22 @@ import storageCell from './storageCell/zh' import route from './route/zh' import auto from './auto/zh' import monitor from './monitor/zh' - +import timing from './timing/zh' export default { - ...zhLocale, - ...zh, - ...menu, - ...param, - ...device, - ...opc, - ...protocol, - ...address, - ...storageCell, - ...route, - ...instruction, - ...task, - ...history, - ...auto, - ...monitor -} + ...zhLocale, + ...zh, + ...menu, + ...param, + ...device, + ...opc, + ...protocol, + ...address, + ...storageCell, + ...route, + ...instruction, + ...task, + ...history, + ...auto, + ...monitor, + ...timing +} \ No newline at end of file diff --git a/acs/nladmin-ui/src/i18n/langs/english.js b/acs/nladmin-ui/src/i18n/langs/english.js index 8ede2c8..0cfcf86 100644 --- a/acs/nladmin-ui/src/i18n/langs/english.js +++ b/acs/nladmin-ui/src/i18n/langs/english.js @@ -13,21 +13,22 @@ import storageCell from './storageCell/en' import route from './route/en' import auto from './auto/en' import monitor from './monitor/en' - +import timing from './timing/en' export default { - ...enLocale, - ...en, - ...menu, - ...param, - ...instruction, - ...task, - ...history, - ...device, - ...opc, - ...protocol, - ...address, - ...storageCell, - ...route, - ...auto, - ...monitor -} + ...enLocale, + ...en, + ...menu, + ...param, + ...instruction, + ...task, + ...history, + ...device, + ...opc, + ...protocol, + ...address, + ...storageCell, + ...route, + ...auto, + ...monitor, + ...timing +} \ No newline at end of file diff --git a/acs/nladmin-ui/src/i18n/langs/indonesian.js b/acs/nladmin-ui/src/i18n/langs/indonesian.js index f7431e4..3095dd7 100644 --- a/acs/nladmin-ui/src/i18n/langs/indonesian.js +++ b/acs/nladmin-ui/src/i18n/langs/indonesian.js @@ -13,21 +13,22 @@ import storageCell from './storageCell/in' import route from './route/in' import auto from './auto/in' import monitor from './monitor/in' - +import timing from './timing/in' export default { - ...idLocale, - ...id, - ...menu, - ...param, - ...instruction, - ...task, - ...history, - ...device, - ...opc, - ...protocol, - ...address, - ...storageCell, - ...route, - ...auto, - ...monitor -} + ...idLocale, + ...id, + ...menu, + ...param, + ...instruction, + ...task, + ...history, + ...device, + ...opc, + ...protocol, + ...address, + ...storageCell, + ...route, + ...auto, + ...monitor, + ...timing +} \ No newline at end of file diff --git a/acs/nladmin-ui/src/i18n/langs/timing/en.js b/acs/nladmin-ui/src/i18n/langs/timing/en.js new file mode 100644 index 0000000..731a994 --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/timing/en.js @@ -0,0 +1,25 @@ +export default { + 'Timing': { + 'DB': { + 'job_id': 'job_id', + 'job_name': 'job_name', + 'bean_name': 'bean_name', + 'method_name': 'method_name', + 'thread_state': 'thread_state', + 'params': 'params', + 'cron_expression': 'cron_expression', + 'is_pause': 'is_pause', + 'description': 'description', + 'create_time': 'create_time', + 'log': 'log', + 'edit': 'edit', + 'execute': 'execute', + 'restore': 'restore', + 'suspend': 'suspend', + }, + 'msg': { + 'select_msg': 'Enter task name to search for', + 'delete_msg': 'Are you sure to stop and delete this task?', + } + } +} \ No newline at end of file diff --git a/acs/nladmin-ui/src/i18n/langs/timing/in.js b/acs/nladmin-ui/src/i18n/langs/timing/in.js new file mode 100644 index 0000000..dc910cd --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/timing/in.js @@ -0,0 +1,25 @@ +export default { + 'Timing': { + 'DB': { + 'job_id': 'ID Tugas', + 'job_name': 'Tugas Nama', + 'bean_name': 'Nama kacang', + 'method_name': 'Metode eksekusi', + 'thread_state': 'Status benang', + 'params': 'parameter', + 'cron_expression': 'ekspresi cron', + 'is_pause': 'keadaan', + 'description': 'deskripsikan', + 'create_time': 'Tarikh penciptaan', + 'log': 'jurnal', + 'edit': 'edit', + 'execute': 'implementasi', + 'restore': 'Kembalikan', + 'suspend': 'suspend', + }, + 'msg': { + 'select_msg': 'Masukkan nama tugas untuk dicari', + 'delete_msg': 'Apakah Anda yakin untuk menghentikan dan menghapus tugas ini?', + } + } +} \ No newline at end of file diff --git a/acs/nladmin-ui/src/i18n/langs/timing/zh.js b/acs/nladmin-ui/src/i18n/langs/timing/zh.js new file mode 100644 index 0000000..a672e05 --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/timing/zh.js @@ -0,0 +1,25 @@ +export default { + 'Timing': { + 'DB': { + 'job_id': '任务ID', + 'job_name': '任务名称', + 'bean_name': 'Bean名称', + 'method_name': '执行方法', + 'thread_state': '线程状态', + 'params': '参数', + 'cron_expression': 'cron表达式', + 'is_pause': '状态', + 'description': '描述', + 'create_time': '创建日期', + 'log': '日志', + 'edit': '编辑', + 'execute': '执行', + 'restore': '恢复', + 'suspend': '暂停', + }, + 'msg': { + 'select_msg': '输入任务名称搜索', + 'delete_msg': '确定停止并删除该任务吗?', + } + } +} \ No newline at end of file diff --git a/acs/nladmin-ui/src/views/system/timing/index.vue b/acs/nladmin-ui/src/views/system/timing/index.vue index fd7f430..fe7dcd2 100644 --- a/acs/nladmin-ui/src/views/system/timing/index.vue +++ b/acs/nladmin-ui/src/views/system/timing/index.vue @@ -8,7 +8,7 @@ v-model="query.job_name" clearable size="mini" - placeholder="输入任务名称搜索" + :placeholder="$t('Timing.msg.select_msg')" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" @@ -24,7 +24,7 @@ type="info" icon="el-icon-tickets" @click="doLog" - >日志 + >{{ $t('Timing.DB.log') }} @@ -101,19 +101,19 @@ @selection-change="crud.selectionChangeHandler" > - - - - - + + + + + - + {{ scope.row.is_pause ? '已暂停' : '运行中' @@ -121,15 +121,15 @@ - - + + {{ parseTime(scope.row.create_time) }} 编辑 + >{{ $t('Timing.DB.edit') }} 执行 + >{{ $t('Timing.DB.execute') }} - {{ scope.row.is_pause ? '恢复' : '暂停' }} + {{ scope.row.is_pause ? $t('Timing.DB.restore') : $t('Timing.DB.suspend') }} - 确定停止并删除该任务吗? + {{ $t('Timing.msg.delete_msg') }} - 取消 - 确定 + {{ $t('common.Cancel') }} + {{ $t('common.determine') }} - 删除 + {{ $t('common.Cancel') }}
确定停止并删除该任务吗?