diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue index 9de9ce32..564c5ee4 100644 --- a/src/components/UploadFile/index.vue +++ b/src/components/UploadFile/index.vue @@ -129,7 +129,7 @@ export default { this.fileList = [] this.$emit('getFileList', '', '') this.$message({ - message: 'Deleted successfully!', + message: this.$t('common:message:deletedSuccessfully'), type: 'success' }) } diff --git a/src/components/UploadFiles/index.vue b/src/components/UploadFiles/index.vue index 0c8c4e59..475be8ef 100644 --- a/src/components/UploadFiles/index.vue +++ b/src/components/UploadFiles/index.vue @@ -9,7 +9,7 @@ :file-list="fileList" :accept="accept" > - Upload + {{ $t('common:button:upload') }} @@ -143,8 +143,7 @@ export default { this.$confirm('Sure to remove?', { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }).then(() => { deleteAttachment(file.Id, file.Path) .then(res => { @@ -152,7 +151,7 @@ export default { this.fileList.splice(this.fileList.findIndex(item => item.Id === file.Id), 1) this.$emit('getFileList', this.fileList) this.$message({ - message: 'Deleted successfully!', + message: this.$t('common:message:deletedSuccessfully'), type: 'success' }) } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b07a3ad2..4229b463 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -31,9 +31,6 @@ Edit Info - - Account - Log Out @@ -93,9 +90,6 @@ export default { editInfo() { this.$router.push({ name: 'BaiscInfo' }) }, - account() { - this.$router.push({ name: 'Account' }) - } } } diff --git a/src/router/index.js b/src/router/index.js index fdaaae06..804e033e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -255,12 +255,7 @@ export const constantRoutes = [ children: [{ path: 'baiscInfo', name: 'BaiscInfo', - component: () => import('@/views/user/editInfo') - }, - { - path: 'account', - name: 'Account', - component: () => import('@/views/user/account') + component: () => import('@/views/user/myInfo') } ] } diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue index fe5387e1..10a648c5 100644 --- a/src/views/admin/menu/index.vue +++ b/src/views/admin/menu/index.vue @@ -1,137 +1,136 @@ - - - - - {{ node.label }} --------------------(Function) - {{ node.label }} - - append(data)">Append - edit(data)" - >Edit - remove(data)">Delete - - - - - - - - + + + + + {{ node.label }} --------------------(Function) + {{ node.label }} + + append(data)">Append + edit(data)" + >Edit + remove(data)">Delete + + + + + + + + diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue index 96fc5c79..69272c1f 100644 --- a/src/views/admin/role/index.vue +++ b/src/views/admin/role/index.vue @@ -89,16 +89,15 @@ export default { }) }, handleDeleteRole(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }).then(() => { deleteUserTypeRole(row.Id).then((res) => { if (res.IsSuccess) { this.list.splice(this.list.findIndex((item) => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }) }) diff --git a/src/views/admin/user/components/Account.vue b/src/views/admin/user/components/Account.vue index 4deb34e4..4ee4bfeb 100644 --- a/src/views/admin/user/components/Account.vue +++ b/src/views/admin/user/components/Account.vue @@ -1,39 +1,38 @@ - - - - - Reset Password - - - - + + + + + Reset Password + + + + diff --git a/src/views/admin/user/list/index.vue b/src/views/admin/user/list/index.vue index e1baab23..5adadd1c 100644 --- a/src/views/admin/user/list/index.vue +++ b/src/views/admin/user/list/index.vue @@ -113,18 +113,17 @@ export default { }, // 删除用户 handleDeleteUser(data) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { deleteSysUser(data.Id) .then(res => { if (res.IsSuccess) { this.users.splice(this.users.findIndex(item => item.Id === data.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }) }) diff --git a/src/views/dashboard/bigdata.vue b/src/views/dashboard/bigdata.vue index f4cb4bd8..e551f087 100644 --- a/src/views/dashboard/bigdata.vue +++ b/src/views/dashboard/bigdata.vue @@ -126,8 +126,7 @@ export default { this.$confirm('Sure to sign out', { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.$store.dispatch('user/logout').then(res => { diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue index 2494d0a5..3a09238c 100644 --- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue +++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue @@ -244,8 +244,7 @@ export default { this.$confirm('是否确认废除此文件?', { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true diff --git a/src/views/dictionary/dictionary/index.vue b/src/views/dictionary/dictionary/index.vue index a09eeb2c..8545735d 100644 --- a/src/views/dictionary/dictionary/index.vue +++ b/src/views/dictionary/dictionary/index.vue @@ -125,18 +125,17 @@ export default { }, // 删除字典表配置信息 handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { deleteDictionary(row.Id) .then(res => { if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) this.$store.dispatch('global/setDictionary', {}) } }) diff --git a/src/views/dictionary/email/index.vue b/src/views/dictionary/email/index.vue index fc4396f4..39e068ae 100644 --- a/src/views/dictionary/email/index.vue +++ b/src/views/dictionary/email/index.vue @@ -239,18 +239,17 @@ export default { }, // 删除 handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { deleteEmailNoticeConfig(row.Id) .then(res => { if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }) }) diff --git a/src/views/dictionary/institutions/components/CROs.vue b/src/views/dictionary/institutions/components/CROs.vue index 711d1f73..cdb145d0 100644 --- a/src/views/dictionary/institutions/components/CROs.vue +++ b/src/views/dictionary/institutions/components/CROs.vue @@ -139,11 +139,10 @@ export default { }, // 删除CRO handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -152,7 +151,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false diff --git a/src/views/dictionary/institutions/components/Hospitals.vue b/src/views/dictionary/institutions/components/Hospitals.vue index fde25635..06235ea0 100644 --- a/src/views/dictionary/institutions/components/Hospitals.vue +++ b/src/views/dictionary/institutions/components/Hospitals.vue @@ -1,256 +1,255 @@ - - - - - - - - - - - - - - - Search - Reset - - - - New - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Search + Reset + + + + New + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/dictionary/institutions/components/Sites.vue b/src/views/dictionary/institutions/components/Sites.vue index 09daef6e..cadc28d2 100644 --- a/src/views/dictionary/institutions/components/Sites.vue +++ b/src/views/dictionary/institutions/components/Sites.vue @@ -213,11 +213,10 @@ export default { }, // 删除Site handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -227,7 +226,7 @@ export default { if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) this.$store.dispatch('global/setSite', {}) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false diff --git a/src/views/dictionary/institutions/components/Sponsors.vue b/src/views/dictionary/institutions/components/Sponsors.vue index db31ad96..f1292653 100644 --- a/src/views/dictionary/institutions/components/Sponsors.vue +++ b/src/views/dictionary/institutions/components/Sponsors.vue @@ -139,11 +139,10 @@ export default { }, // 删除Sponsor handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -152,7 +151,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false diff --git a/src/views/dictionary/newdictionary/bool/index.vue b/src/views/dictionary/newdictionary/bool/index.vue index 31a6fd70..bf3ca8d3 100644 --- a/src/views/dictionary/newdictionary/bool/index.vue +++ b/src/views/dictionary/newdictionary/bool/index.vue @@ -182,11 +182,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -195,7 +194,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/newdictionary/components/DictionaryChild.vue b/src/views/dictionary/newdictionary/components/DictionaryChild.vue index 93b39132..5e9a7493 100644 --- a/src/views/dictionary/newdictionary/components/DictionaryChild.vue +++ b/src/views/dictionary/newdictionary/components/DictionaryChild.vue @@ -154,11 +154,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -167,7 +166,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/newdictionary/config/index.vue b/src/views/dictionary/newdictionary/config/index.vue index 0355d9ce..c1a0dcf3 100644 --- a/src/views/dictionary/newdictionary/config/index.vue +++ b/src/views/dictionary/newdictionary/config/index.vue @@ -183,11 +183,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -196,7 +195,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/newdictionary/enum/index.vue b/src/views/dictionary/newdictionary/enum/index.vue index fc0f0a3c..a4683819 100644 --- a/src/views/dictionary/newdictionary/enum/index.vue +++ b/src/views/dictionary/newdictionary/enum/index.vue @@ -182,11 +182,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -195,7 +194,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue b/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue index 68e4be05..f843d92c 100644 --- a/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue +++ b/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue @@ -153,11 +153,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -166,7 +165,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/newdictionary/list/index.vue b/src/views/dictionary/newdictionary/list/index.vue index 1d99476e..4c45bb6f 100644 --- a/src/views/dictionary/newdictionary/list/index.vue +++ b/src/views/dictionary/newdictionary/list/index.vue @@ -206,11 +206,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -219,7 +218,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/newdictionary/select/index.vue b/src/views/dictionary/newdictionary/select/index.vue index 3ab7d358..acca8552 100644 --- a/src/views/dictionary/newdictionary/select/index.vue +++ b/src/views/dictionary/newdictionary/select/index.vue @@ -183,11 +183,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -196,7 +195,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/newdictionary/setting/index.vue b/src/views/dictionary/newdictionary/setting/index.vue index b50f5803..be1d6fb5 100644 --- a/src/views/dictionary/newdictionary/setting/index.vue +++ b/src/views/dictionary/newdictionary/setting/index.vue @@ -122,11 +122,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -135,7 +134,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/sign/components/SceneList.vue b/src/views/dictionary/sign/components/SceneList.vue index c5892828..eb67bce5 100644 --- a/src/views/dictionary/sign/components/SceneList.vue +++ b/src/views/dictionary/sign/components/SceneList.vue @@ -1,162 +1,161 @@ - - - - - - - Add - - - - - - - - - - - - - - - - - - - - Edit - - Delete - - - - - - - - - - - - + + + + + + + Add + + + + + + + + + + + + + + + + + + + + Edit + + Delete + + + + + + + + + + + + diff --git a/src/views/dictionary/sign/index.vue b/src/views/dictionary/sign/index.vue index 07236d35..7e84582b 100644 --- a/src/views/dictionary/sign/index.vue +++ b/src/views/dictionary/sign/index.vue @@ -1,229 +1,228 @@ - - - - - - - - - - - - - Reset - Search - - - - - New - - - - - - - - - - - - - - - - - - - - Edit - - - 场景配置 - - - Delete - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + Reset + Search + + + + + New + + + + + + + + + + + + + + + + + + + + Edit + + + 场景配置 + + + Delete + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/dictionary/template/components/Anonymization.vue b/src/views/dictionary/template/components/Anonymization.vue index d976aca0..d202154b 100644 --- a/src/views/dictionary/template/components/Anonymization.vue +++ b/src/views/dictionary/template/components/Anonymization.vue @@ -162,11 +162,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -175,7 +174,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/template/components/DictionaryTypeConfig.vue b/src/views/dictionary/template/components/DictionaryTypeConfig.vue index 3bf49d6d..676cba40 100644 --- a/src/views/dictionary/template/components/DictionaryTypeConfig.vue +++ b/src/views/dictionary/template/components/DictionaryTypeConfig.vue @@ -137,11 +137,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -150,7 +149,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/template/components/IncreaseFields.vue b/src/views/dictionary/template/components/IncreaseFields.vue index 2a52609c..c653fafb 100644 --- a/src/views/dictionary/template/components/IncreaseFields.vue +++ b/src/views/dictionary/template/components/IncreaseFields.vue @@ -170,11 +170,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -183,7 +182,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/template/components/QcQuestions.vue b/src/views/dictionary/template/components/QcQuestions.vue index d2e4d574..9e16395e 100644 --- a/src/views/dictionary/template/components/QcQuestions.vue +++ b/src/views/dictionary/template/components/QcQuestions.vue @@ -217,11 +217,10 @@ export default { }, // 删除受试者 handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -230,7 +229,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/dictionary/template/list.vue b/src/views/dictionary/template/list.vue index e75d8c16..6a49fe98 100644 --- a/src/views/dictionary/template/list.vue +++ b/src/views/dictionary/template/list.vue @@ -1,188 +1,187 @@ - - - - - - - - New - Setting - - - - - - - - Name: - - - - - - - - - - - - - - + + + + + + + + New + Setting + + + + + + + + Name: + + + + + + + + + + + + + + diff --git a/src/views/dictionary/template/setting.vue b/src/views/dictionary/template/setting.vue index e5dec22a..c4ee732f 100644 --- a/src/views/dictionary/template/setting.vue +++ b/src/views/dictionary/template/setting.vue @@ -1,182 +1,181 @@ - - - - - - New - - - - - - {{ scope.row.ModalityList && scope.row.ModalityList.length>0?scope.row.ModalityList.join(', '):'' }} - - - - - - - + + + + + + New + + + + + + {{ scope.row.ModalityList && scope.row.ModalityList.length>0?scope.row.ModalityList.join(', '):'' }} + + + + + + + diff --git a/src/views/dictionary/template/sign/components/SceneList.vue b/src/views/dictionary/template/sign/components/SceneList.vue index c5892828..eb67bce5 100644 --- a/src/views/dictionary/template/sign/components/SceneList.vue +++ b/src/views/dictionary/template/sign/components/SceneList.vue @@ -1,162 +1,161 @@ - - - - - - - Add - - - - - - - - - - - - - - - - - - - - Edit - - Delete - - - - - - - - - - - - + + + + + + + Add + + + + + + + + + + + + + + + + + + + + Edit + + Delete + + + + + + + + + + + + diff --git a/src/views/dictionary/template/sign/index.vue b/src/views/dictionary/template/sign/index.vue index 07236d35..7e84582b 100644 --- a/src/views/dictionary/template/sign/index.vue +++ b/src/views/dictionary/template/sign/index.vue @@ -1,229 +1,228 @@ - - - - - - - - - - - - - Reset - Search - - - - - New - - - - - - - - - - - - - - - - - - - - Edit - - - 场景配置 - - - Delete - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + Reset + Search + + + + + New + + + + + + + + + + + + + + + + + + + + Edit + + + 场景配置 + + + Delete + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/financials/monthlyPayment/adjustment.vue b/src/views/financials/monthlyPayment/adjustment.vue index d62af939..e6f1f9b0 100644 --- a/src/views/financials/monthlyPayment/adjustment.vue +++ b/src/views/financials/monthlyPayment/adjustment.vue @@ -1,242 +1,241 @@ - - - - - - Reset - Search - New - - - - - - {{ scope.row.LastName + ' / ' + scope.row.FirstName }} - - - - - {{ scope.row.AdjustPaymentUSD | rounding }} - - - - {{ scope.row.AdjustPaymentCNY | rounding }} - - - - - - - Edit - Delete - - - - - - - - - - - - - - - + + + + + + Reset + Search + New + + + + + + {{ scope.row.LastName + ' / ' + scope.row.FirstName }} + + + + + {{ scope.row.AdjustPaymentUSD | rounding }} + + + + {{ scope.row.AdjustPaymentCNY | rounding }} + + + + + + + Edit + Delete + + + + + + + + + + + + + + + diff --git a/src/views/financials/monthlyPayment/components/ExchangeRate.vue b/src/views/financials/monthlyPayment/components/ExchangeRate.vue index e21c515d..c2da9188 100644 --- a/src/views/financials/monthlyPayment/components/ExchangeRate.vue +++ b/src/views/financials/monthlyPayment/components/ExchangeRate.vue @@ -1,198 +1,198 @@ - - - - - Reset - Search - New - - - - - - - - - - - - Edit - Delete - - - - - - - - - - - - - - - - - - Cancel - Ok - - - - - - + + + + + Reset + Search + New + + + + + + + + + + + + Edit + Delete + + + + + + + + + + + + + + + + + + Cancel + Ok + + + + + + diff --git a/src/views/financials/monthlyPayment/components/RankBasedRates.vue b/src/views/financials/monthlyPayment/components/RankBasedRates.vue index 18063b63..3fa65d11 100644 --- a/src/views/financials/monthlyPayment/components/RankBasedRates.vue +++ b/src/views/financials/monthlyPayment/components/RankBasedRates.vue @@ -1,324 +1,323 @@ - - - - Rank-Based Rates - New - - - - - - - {{ scope.row.Training | rounding }} - - - - - {{ scope.row.RefresherTraining | rounding }} - - - - - - {{ scope.row.Timepoint | rounding }} - - - - - - {{ scope.row.TimepointIn48H | rounding }} - - - - - {{ scope.row.TimepointIn24H | rounding }} - - - - - - - {{ scope.row.Adjudication | rounding }} - - - - - - {{ scope.row.AdjudicationIn48H | rounding }} - - - - - {{ scope.row.AdjudicationIn24H | rounding }} - - - - - - {{ scope.row.Global | rounding }} - - - - - - {{ scope.row.Downtime | rounding }} - - - - - - Edit - Delete - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cancel - Ok - - - - - - + + + + Rank-Based Rates + New + + + + + + + {{ scope.row.Training | rounding }} + + + + + {{ scope.row.RefresherTraining | rounding }} + + + + + + {{ scope.row.Timepoint | rounding }} + + + + + + {{ scope.row.TimepointIn48H | rounding }} + + + + + {{ scope.row.TimepointIn24H | rounding }} + + + + + + + {{ scope.row.Adjudication | rounding }} + + + + + + {{ scope.row.AdjudicationIn48H | rounding }} + + + + + {{ scope.row.AdjudicationIn24H | rounding }} + + + + + + {{ scope.row.Global | rounding }} + + + + + + {{ scope.row.Downtime | rounding }} + + + + + + Edit + Delete + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cancel + Ok + + + + + + diff --git a/src/views/financials/monthlyPayment/components/TrialsData.vue b/src/views/financials/monthlyPayment/components/TrialsData.vue index 61853543..f87b9ddb 100644 --- a/src/views/financials/monthlyPayment/components/TrialsData.vue +++ b/src/views/financials/monthlyPayment/components/TrialsData.vue @@ -340,11 +340,10 @@ export default { }, handleView(row) { row.SowFullPath ? window.open(row.SowFullPath, '_blank') : '' }, handleDeleteSOW(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'OK', - cancelButtonText: 'Cancel' + }) .then(() => { const param = { SowPath: row.SowPath, TrialId: row.TrialId } diff --git a/src/views/financials/monthlyPayment/components/UploadSow.vue b/src/views/financials/monthlyPayment/components/UploadSow.vue index f24d6a2c..be7c3083 100644 --- a/src/views/financials/monthlyPayment/components/UploadSow.vue +++ b/src/views/financials/monthlyPayment/components/UploadSow.vue @@ -92,7 +92,7 @@ export default { if (res.IsSuccess) { this.fileList = [] this.$message({ - message: 'Deleted successfully!', + message: this.$t('common:message:deletedSuccessfully'), type: 'success' }) this.$emit('getFileList', this.fileList) diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue index 7366de55..476ab668 100644 --- a/src/views/reviewers/components/EducationTraining.vue +++ b/src/views/reviewers/components/EducationTraining.vue @@ -567,8 +567,7 @@ export default { this.$confirm('Confirm to delete?', { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'OK', - cancelButtonText: 'Cancel' + }) .then(() => { deleteEducationInfo(row.Id) @@ -636,8 +635,7 @@ export default { this.$confirm('Confirm to delete?', { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'OK', - cancelButtonText: 'Cancel' + }) .then(() => { deletePostgraduateInfo(row.Id) diff --git a/src/views/reviewers/components/GcpCertificate.vue b/src/views/reviewers/components/GcpCertificate.vue index 5eba776d..e4dd1d85 100644 --- a/src/views/reviewers/components/GcpCertificate.vue +++ b/src/views/reviewers/components/GcpCertificate.vue @@ -181,7 +181,7 @@ export default { this.fileList = [] this.GCPID = '' this.$message({ - message: 'Deleted successfully!', + message: this.$t('common:message:deletedSuccessfully'), type: 'success' }) } diff --git a/src/views/reviewers/components/Resumes.vue b/src/views/reviewers/components/Resumes.vue index 269bc3e0..f2d1f199 100644 --- a/src/views/reviewers/components/Resumes.vue +++ b/src/views/reviewers/components/Resumes.vue @@ -266,11 +266,10 @@ export default { } }, handleRemoveFile(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }).then(() => { deleteAttachment(row.Id, row.Path) .then(res => { @@ -278,7 +277,7 @@ export default { this.resumeList.splice(this.resumeList.findIndex(item => item.Id === row.Id), 1) this.filterByLanguage() this.$message({ - message: 'Deleted successfully!', + message: this.$t('common:message:deletedSuccessfully'), type: 'success' }) } diff --git a/src/views/reviewers/components/Setting.vue b/src/views/reviewers/components/Setting.vue index 52f1ce15..c252232e 100644 --- a/src/views/reviewers/components/Setting.vue +++ b/src/views/reviewers/components/Setting.vue @@ -78,7 +78,7 @@ - + {{$t('system:TrialExperience:title:Clinical Trial Experience')}} - Add + {{$t('common:button:add')}} - + @@ -267,8 +266,7 @@ export default { this.$confirm('Confirm to delete?', { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'OK', - cancelButtonText: 'Cancel' + }) .then(() => { deleteTrialExperience(row.Id) diff --git a/src/views/reviewers/index.vue b/src/views/reviewers/index.vue index d2294d89..2c0b329d 100644 --- a/src/views/reviewers/index.vue +++ b/src/views/reviewers/index.vue @@ -69,13 +69,13 @@ - + + + + + + + {{$t('common:button:new')}} @@ -367,17 +367,20 @@ export default { }, tokenKey: getToken(), share_model: { visible: false, title: '', width: '500px' }, - shareLink: null + shareLink: null, + isEnglish: false } }, dicts: ['ReadingType', 'Subspeciality', 'Department', 'Rank', 'Position', 'ReadingStandard'], computed: { - ...mapGetters(['hospitalList', 'reviewersQuery', 'isEnglish']) + ...mapGetters(['hospitalList', 'reviewersQuery']) }, created() { - this.isEN = this.isEnglish this.reviewersQuery ? this.listQuery = this.reviewersQuery : '' this.initPage() + // this.isEnglish = !!((this.$route.query.isEnglish === true || this.$route.query.isEnglish === 'true')) + this.isEnglish = this.$i18n.locale === 'zh' ? false : true + this.isEN = this.isEnglish }, methods: { copyCode() { diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue index 2e577714..bf3a21db 100644 --- a/src/views/system/login-log/index.vue +++ b/src/views/system/login-log/index.vue @@ -43,9 +43,6 @@ @@ -88,28 +85,28 @@ @@ -120,14 +117,14 @@ @@ -138,7 +135,7 @@ diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index b2fb5ee5..e2ff6b68 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -136,16 +136,15 @@ export default { // }) }, handleDeleteRole(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }).then(() => { deleteUserTypeRole(row.Id).then((res) => { if (res.IsSuccess) { this.list.splice(this.list.findIndex((item) => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }) }) diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue index 6d4b96bb..fa36de65 100644 --- a/src/views/system/user/components/Account.vue +++ b/src/views/system/user/components/Account.vue @@ -13,23 +13,20 @@ import { resetPassword } from '@/api/admin' export default { name: 'Account', props: { - userId: { type: String, default: '' } + userId: { type: String, default: '' }, }, methods: { handleReset() { - this.$confirm('Sure to reset password?', { + this.$confirm(this.$t('system:userlist:message:ResetPassword'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' }) .then(() => { resetPassword(this.userId).then(res => { if (res.IsSuccess) { - this.$message({ - message: 'Reset password successfully', - type: 'success' - }) + let msg = this.$t('system:userlist:message:ResetPassword2') + msg = msg.replace('xxx', this.$route.query.userName) + this.$alert(msg) } }) }) diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index 6ddc7df5..950dab35 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -9,13 +9,14 @@ :search-handle="searchHandle" @search="handleSearch" @reset="handleReset" + @new="handleAddUser" /> - {{$t('common:button:new')}} + + + + + + '', @@ -218,8 +219,8 @@ export default { prop: 'IsTestUser', width: '100px', options: [ - { label: 'Yes', value: true }, - { label: 'No', value: false } + { label: this.$t('system:userlist:label:IsTestUser:Yes'), value: true }, + { label: this.$t('system:userlist:label:IsTestUser:No'), value: false } ], props: { label: 'label', value: 'value' }, change: scope => '', @@ -231,8 +232,8 @@ export default { prop: 'UserState', width: '100px', options: [ - { label: 'Enable', value: 1 }, - { label: 'Disable', value: 0 } + { label: this.$t('system:userlist:label:Status:Enable'), value: 1 }, + { label: this.$t('system:userlist:label:Status:Disable'), value: 0 } ], props: { label: 'label', value: 'value' }, change: scope => '', @@ -250,7 +251,8 @@ export default { ], searchHandle: [ { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset' }, - { label: this.$t('common:button:search'), type: 'primary', emitKey: 'search' } + { label: this.$t('common:button:search'), type: 'primary', emitKey: 'search' }, + { label: this.$t('common:button:new'), type: 'primary', emitKey: 'new' } ], userTypeOptions: [], loading: false, @@ -289,22 +291,21 @@ export default { }, // 编辑用户 handleEditUser(data) { - this.$router.push({ path: '/system/user/edit', query: { Id: data.Id }}) + this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName }}) }, // 删除用户 handleDeleteUser(data) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { deleteSysUser(data.Id) .then(res => { if (res.IsSuccess) { this.users.splice(this.users.findIndex(item => item.Id === data.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }) }) diff --git a/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue b/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue index 2e640e82..36e2e063 100644 --- a/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue +++ b/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue @@ -94,7 +94,7 @@ export default { if (res.IsSuccess) { this.fileList = [] this.$message({ - message: 'Deleted successfully!', + message: this.$t('common:message:deletedSuccessfully'), type: 'success' }) this.$emit('getFileList', this.fileList) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue b/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue index 3bf49d6d..676cba40 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue @@ -137,11 +137,10 @@ export default { }) }, handleDelete(row) { - this.$confirm('Sure to delete?', { + this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - confirmButtonText: 'Ok', - cancelButtonText: 'Cancel' + }) .then(() => { this.loading = true @@ -150,7 +149,7 @@ export default { this.loading = false if (res.IsSuccess) { this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1) - this.$message.success('Deleted successfully!') + this.$message.success(this.$t('common:message:deletedSuccessfully')) } }).catch(() => { this.loading = false }) }) diff --git a/src/views/user/account.vue b/src/views/user/account.vue index bea9261c..69c8d5e9 100644 --- a/src/views/user/account.vue +++ b/src/views/user/account.vue @@ -1,30 +1,30 @@ - - - Security - - - - - - - - - - - - - save - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Security + + + + + + + + + + + + + + + + + + Male + Female + + + + + + + + + + + + + + + + + + + + + + + + Internal + External + + + + + + + + + + + + + + + Save + + + + + + Security + + + + + + + + + + + + + save + + + + + + diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue index 13d4993b..4496b4a5 100644 --- a/src/views/user/myInfo.vue +++ b/src/views/user/myInfo.vue @@ -1,11 +1,392 @@ - + + + + + + {{ $t('trials:trials-myinfo:title:avater') }} + + + + {{ user.LastName }} + + + + + + + {{ $t('trials:trials-myinfo:title:basicInfo') }} + + + + + + + + + + + + + + + + + Male + Female + + + + + + + + + + + + + + + + + + {{ $t('trials:trials-myinfo:button:save') }} + + + + + + + + {{ $t('trials:trials-myinfo:title:accountInfo') }} + + + + + {{ user.UserName }} + + + + + + {{ $t('trials:trials-myinfo:button:update') }} + + + + + {{ user.Phone }} + + + + + + {{ $t('trials:trials-myinfo:button:update') }} + + + + + {{ user.EMail }} + + + + {{ sendTitle }} + + + + + + {{ $t('trials:trials-myinfo:button:update') }} + + + + + + + + {{ $t('trials:trials-myinfo:title:updatePaasord') }} + + + + + + + + + + + + + + + + + {{ $t('trials:trials-myinfo:button:save') }} + + + + - +
Rank-Based Rates
{{$t('system:TrialExperience:title:Clinical Trial Experience')}}