From 3d8153fa47dc5feaad1423b4c4a930ba29416ce8 Mon Sep 17 00:00:00 2001 From: icewint Date: Wed, 25 Feb 2026 09:38:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/page/app/UserSetting.vue | 22 ++--- .../StockComposeTaskDetailComponent.vue | 84 ++++++++++--------- wcs_web/src/locale/en.ts | 15 +++- wcs_web/src/locale/zh-cn.ts | 9 ++ 4 files changed, 75 insertions(+), 55 deletions(-) diff --git a/wcs_web/src/components/page/app/UserSetting.vue b/wcs_web/src/components/page/app/UserSetting.vue index 8b45d98..e2b1562 100644 --- a/wcs_web/src/components/page/app/UserSetting.vue +++ b/wcs_web/src/components/page/app/UserSetting.vue @@ -8,18 +8,19 @@ import router from "@/router"; import AppDeveloper from "@/components/manage/AppDeveloper.vue"; import DevApi from "@/api/dev.ts"; + import {useI18n} from "vue-i18n"; const modelValue = defineModel('modelValue', {required: true, default: false}) - + const { t } = useI18n(); const userStoreInstance = userStore(); // 登出用户 const loginOut = () => { - MessageUtils.confirmMessageBox(`确定退出账号：${userStoreInstance.getUserInfo().userId}?`, "登出确认").then(() => { + MessageUtils.confirmMessageBox(t('baseTip.confirmTip') + `${userStoreInstance.getUserInfo().userId}?`, t('baseTip.warning')).then(() => { UserApi.logout().then((res) => { const response = JSON.parse(JSON.stringify(res.data)) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { - MessageUtils.successMessage("登出成功"); + MessageUtils.successMessage(t('baseTip.success')); router.push({name:'login'}); } else { MessageUtils.warningMessageBox(response.msg); @@ -29,11 +30,11 @@ }; // 重启服务器 const restart = () => { - MessageUtils.confirmMessageBox(`确定重启服务?`, "重启确认").then(() => { + MessageUtils.confirmMessageBox(t('baseTip.confirmTip'), t('baseTip.warning')).then(() => { DevApi.restartApplication().then((res) => { const response = JSON.parse(JSON.stringify(res.data)) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { - MessageUtils.successMessage("重启成功"); + MessageUtils.successMessage(t('baseTip.success')); } else { MessageUtils.warningMessageBox(response.msg); } @@ -45,27 +46,26 @@ diff --git a/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue b/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue index 58bcf15..8001e28 100644 --- a/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue +++ b/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue @@ -13,7 +13,9 @@ import type {ReporterTaskStatusReq} from "@/interface/page/stockTask/IReporterTa import type {AppServeDataResponse} from "@/interface/api/AppServeDataResponse.ts"; import type {ICourseCalculateResult} from "@/interface/page/stockTask/ICourseCalculateResult.ts"; import AppPermission from "@/components/manage/AppPermission.vue"; +import {useI18n} from "vue-i18n"; +const { t } = useI18n(); const modelValue = defineModel('modelValue', {required: true, default: false}); const props = defineProps(['formData']); const emit = defineEmits(['reLoadingTableData']); @@ -25,24 +27,24 @@ const stockComposeTaskStatusFormatter = new StockComposeTaskStatusFormatter(); const stockComposeTaskTypeFormatter = new StockComposeTaskTypeFormatter(); const stockComposeStepStatusFormatter = new StockComposeStepStatusFormatter(); const trueFalseTagStyleFormatter = new TrueFalseTagStyleFormatter(); -const uploadString = ref("手动上报"); // 上报信息 +const uploadString = ref("-"); // 上报信息 const uploadDestination = ref(""); // 上报的终点 const course = ref([]); // 完成任务 const completeTask = () => { - MessageUtils.confirmMessageBox('确定完成任务？', '风险提示').then(() => { + MessageUtils.confirmMessageBox(t('customMessage.confirmExecute'), t('baseTip.confirmTip')).then(() => { const loadingInstance = MessageUtils.loading(); StockComposeTaskApi.completeTask(formData.value.taskId).then((res) => { const responseString = JSON.stringify(res.data); const response = JSON.parse(responseString) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { - MessageUtils.successMessage('完成成功'); + MessageUtils.successMessage(t('baseTip.success')); emit('reLoadingTableData'); close(); return; } - MessageUtils.errMessageBox(response.msg, '服务器信息'); + MessageUtils.errMessageBox(response.msg, t('baseTip.warning')); }).catch(() => {}).finally(() => { loadingInstance.close(); }) @@ -50,18 +52,18 @@ const completeTask = () => { }; // 重做任务 const resetTask = () => { - MessageUtils.confirmMessageBox('确定重做任务？', '风险提示').then(() => { + MessageUtils.confirmMessageBox(t('customMessage.confirmExecute'), t('baseTip.confirmTip')).then(() => { const loadingInstance = MessageUtils.loading(); StockComposeTaskApi.resetTask(formData.value.taskId).then((res) => { const responseString = JSON.stringify(res.data); const response = JSON.parse(responseString) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { - MessageUtils.successMessage('重做成功'); + MessageUtils.successMessage(t('baseTip.success')); emit('reLoadingTableData'); close(); return; } - MessageUtils.errMessageBox(response.msg, '服务器信息'); + MessageUtils.errMessageBox(response.msg, t('baseTip.warning')); }).catch(() => {}).finally(() => { loadingInstance.close(); }) @@ -69,18 +71,18 @@ const resetTask = () => { }; // 取消任务 const cancelTask = () => { - MessageUtils.confirmMessageBox('确定取消任务？', '风险提示').then(() => { + MessageUtils.confirmMessageBox(t('customMessage.confirmExecute'), t('baseTip.confirmTip')).then(() => { const loadingInstance = MessageUtils.loading(); StockComposeTaskApi.cancelTask(formData.value.taskId).then((res) => { const responseString = JSON.stringify(res.data); const response = JSON.parse(responseString) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { - MessageUtils.successMessage('取消成功'); + MessageUtils.successMessage(t('baseTip.success')); emit('reLoadingTableData'); close(); return; } - MessageUtils.errMessageBox(response.msg, '服务器信息'); + MessageUtils.errMessageBox(response.msg, t('baseTip.warning')); }).catch(() => {}).finally(() => { loadingInstance.close(); }) @@ -88,7 +90,7 @@ const cancelTask = () => { }; // 上报任务完成 const reportTaskComplete = () => { - MessageUtils.confirmMessageBox('确定上报任务完成？', '风险提示').then(() => { + MessageUtils.confirmMessageBox(t('customMessage.confirmExecute'), t('baseTip.confirmTip')).then(() => { const loadingInstance = MessageUtils.loading(); const reportData: ReporterTaskStatusReq = { taskId: formData.value.taskId, @@ -99,10 +101,10 @@ const reportTaskComplete = () => { const responseString = JSON.stringify(res.data); const response = JSON.parse(responseString) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { - MessageUtils.successMessage('上报成功'); + MessageUtils.successMessage(t('baseTip.success')); return; } - MessageUtils.errMessageBox(response.msg, '服务器信息'); + MessageUtils.errMessageBox(response.msg, t('baseTip.warning')); }).catch(() => {}).finally(() => { loadingInstance.close(); }) @@ -110,7 +112,7 @@ const reportTaskComplete = () => { }; // 上报任务取消 const reportTaskCancel = () => { - MessageUtils.confirmMessageBox('确定上报任务取消？', '风险提示').then(() => { + MessageUtils.confirmMessageBox(t('customMessage.confirmExecute'), t('baseTip.confirmTip')).then(() => { const loadingInstance = MessageUtils.loading(); const reportData: ReporterTaskStatusReq = { taskId: formData.value.taskId, @@ -121,10 +123,10 @@ const reportTaskCancel = () => { const responseString = JSON.stringify(res.data); const response = JSON.parse(responseString) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { - MessageUtils.successMessage('上报成功'); + MessageUtils.successMessage(t('baseTip.success')); return; } - MessageUtils.errMessageBox(response.msg, '服务器信息'); + MessageUtils.errMessageBox(response.msg, t('baseTip.warning')); }).catch(() => {}).finally(() => { loadingInstance.close(); }) @@ -140,10 +142,10 @@ const calculateCourse = () => { if (response && response.code == AppServeResponseCodeEnum.SUCCESS && response.data != null) { const calculateResults = response.data; course.value = calculateResults.map(item => item.location + '(' + item.locationType + ')'); - MessageUtils.successMessage('查询成功'); + MessageUtils.successMessage(t('baseTip.success')); return; } - MessageUtils.errMessageBox(response.msg, '操作失败'); + MessageUtils.errMessageBox(response.msg, t('baseTip.warning')); }).catch(() => {}).finally(() => { loadingInstance.close(); }) @@ -158,80 +160,80 @@ const open = () => {