From 3b2fed2967b4c81672e9e5fa931d8283d8b22409 Mon Sep 17 00:00:00 2001 From: ailanyin Date: Wed, 19 Jul 2023 09:22:11 +0800 Subject: [PATCH] fix --- .env.development | 9 +- .env.production | 11 +- .env.staging | 5 +- src/components/FileUpload/index.vue | 41 +++++-- src/components/WangEditor/index.vue | 15 ++- src/i18n/message/admin/common/ru.js | 6 +- src/i18n/message/admin/common/zh.js | 5 +- src/i18n/message/admin/form/ru.js | 110 ++++++++--------- src/i18n/message/admin/form/zh.js | 90 +++++++------- src/i18n/message/admin/table/ru.js | 42 ++++--- src/i18n/message/admin/table/zh.js | 42 ++++--- src/i18n/message/admin/validation/ru.js | 24 +++- src/i18n/message/admin/validation/zh.js | 20 +++- src/i18n/message/common/ru.js | 11 +- src/i18n/message/common/zh.js | 10 +- src/i18n/message/webSearch/ru.js | 2 +- src/utils/request.js | 6 +- src/views/admin/agent/account/basic-info.vue | 4 +- .../admin/agent/bill/bill-list/index.vue | 42 ++++--- .../admin/agent/bill/commission/index.vue | 8 +- .../agent/bill/exchange-record/index.vue | 2 +- .../admin/agent/bill/trade-auth/index.vue | 4 +- .../admin/agent/service/enterprise/index.vue | 47 +++++--- .../enterprise/technology-demand-release.vue | 2 +- .../service/enterprise/technology-demand.vue | 27 +++-- .../service/enterprise/update-status.vue | 48 ++++---- .../agent/service/matching-demand/detail.vue | 4 +- .../agent/service/matching-demand/index.vue | 44 +++++-- src/views/admin/enterprise/account/bill.vue | 36 ++++-- .../admin/enterprise/activity/active.vue | 28 +++-- .../enterprise/demand/releaseService.vue | 2 +- .../enterprise/demand/releaseTechnology.vue | 4 +- .../admin/enterprise/demand/serviceDemand.vue | 4 +- .../admin/enterprise/demand/technology.vue | 10 +- .../admin/enterprise/extension/product.vue | 2 +- .../admin/enterprise/extension/results.vue | 2 +- src/views/admin/expert/account/basicInfo.vue | 4 +- src/views/admin/expert/activity/active.vue | 14 ++- .../expert/components/ReleaseForm/index.vue | 2 +- src/views/admin/expert/demand/already.vue | 4 +- src/views/admin/expert/demand/release.vue | 2 +- .../admin/expert/demand/serviceDemand.vue | 4 +- src/views/admin/expert/demand/think.vue | 10 +- .../admin/expert/technology/achievement.vue | 2 +- .../admin/expert/technology/claimPatent.vue | 6 +- src/views/admin/expert/technology/paper.vue | 6 +- src/views/admin/expert/technology/patent.vue | 6 +- .../admin/expert/technology/research.vue | 4 +- .../admin/laboratory/account/basic-info.vue | 4 +- .../laboratory/research/achievement/index.vue | 2 +- .../laboratory/research/expert/index.vue | 6 +- .../research/laboratory-equipment/index.vue | 2 +- .../admin/laboratory/research/paper/index.vue | 6 +- .../laboratory/research/patent/index.vue | 4 +- .../research/research-project/index.vue | 2 +- .../research/service-demand/detail.vue | 2 +- .../research/service-demand/index.vue | 2 +- .../admin/research/account/basic-info.vue | 4 +- .../research/research/achievement/index.vue | 2 +- .../admin/research/research/expert/index.vue | 6 +- .../research/laboratory-equipment/index.vue | 4 +- .../research/research/laboratory/index.vue | 4 +- .../admin/research/research/paper/index.vue | 6 +- .../admin/research/research/patent/index.vue | 2 +- .../research/research-project/index.vue | 2 +- .../research/service-demand/detail.vue | 2 +- .../research/service-demand/index.vue | 2 +- src/views/components/AgentForm/index.vue | 44 ++++--- src/views/components/EnterpriseForm/index.vue | 84 ++++++++++--- src/views/components/ExpertForm/index.vue | 70 +++++++---- src/views/components/FieldOptions/index.vue | 5 +- src/views/components/FieldSingle/index.vue | 11 +- src/views/components/InputBoxAdd/index.vue | 3 +- src/views/components/ReleaseForm/index.vue | 112 ++++++++++++++---- src/views/components/ResearchForm/index.vue | 16 ++- src/views/identity/agent.vue | 15 ++- src/views/identity/expert.vue | 3 +- src/views/identity/research.vue | 14 ++- src/views/index.vue | 2 +- src/views/monitor/job/index.vue | 9 +- src/views/monitor/job/log.vue | 6 +- src/views/monitor/logininfor/index.vue | 2 +- src/views/monitor/online/index.vue | 2 +- src/views/monitor/operlog/index.vue | 2 +- src/views/system/config/index.vue | 4 +- src/views/system/dept/index.vue | 4 +- src/views/system/dict/data.vue | 8 +- src/views/system/dict/index.vue | 4 +- src/views/system/menu/index.vue | 4 +- src/views/system/notice/index.vue | 9 +- src/views/system/post/index.vue | 4 +- src/views/system/role/authUser.vue | 6 +- src/views/system/role/index.vue | 6 +- src/views/system/role/selectUser.vue | 2 +- src/views/system/user/index.vue | 27 +++-- src/views/system/user/profile/resetPwd.vue | 7 +- src/views/system/user/profile/userAvatar.vue | 2 +- src/views/system/user/profile/userInfo.vue | 10 +- src/views/tool/gen/editTable.vue | 2 +- src/views/tool/gen/genInfoForm.vue | 22 +++- src/views/tool/gen/index.vue | 2 +- src/views/website/home/comp/index4.vue | 13 +- .../website/searchList/achievementDetail.vue | 2 +- .../website/searchList/components/docking.vue | 4 +- .../searchList/components/industrySelect.vue | 6 +- src/views/website/searchList/expertDetail.vue | 36 +++--- 106 files changed, 959 insertions(+), 522 deletions(-) diff --git a/.env.development b/.env.development index 92d720b..598ea52 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,11 @@ # 页面标题 -VITE_APP_TITLE = 中科云 +VITE_APP_TITLE=中科云 # 开发环境配置 -VITE_APP_ENV = 'development' +VITE_APP_ENV='development' # 若依管理系统/开发环境 -VITE_APP_BASE_API = '/dev-api' +VITE_APP_BASE_API='/dev-api' + +# i18n语言 +VITE_APP_I18N_LOCALE='zh_CN' diff --git a/.env.production b/.env.production index 9c0294d..571cf69 100644 --- a/.env.production +++ b/.env.production @@ -1,11 +1,14 @@ # 页面标题 -VITE_APP_TITLE = 中科云 +VITE_APP_TITLE=中科云 # 生产环境配置 -VITE_APP_ENV = 'production' +VITE_APP_ENV='production' # 若依管理系统/生产环境 -VITE_APP_BASE_API = '/api' +VITE_APP_BASE_API='/api' # 是否在打包时开启压缩,支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip \ No newline at end of file +VITE_BUILD_COMPRESS=gzip + +# i18n +VITE_APP_I18N_LOCALE=zh_CN \ No newline at end of file diff --git a/.env.staging b/.env.staging index f911064..8c8736c 100644 --- a/.env.staging +++ b/.env.staging @@ -8,4 +8,7 @@ VITE_APP_ENV = 'staging' VITE_APP_BASE_API = '/stage-api' # 是否在打包时开启压缩,支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip \ No newline at end of file +VITE_BUILD_COMPRESS = gzip + +# i18n语言 +VITE_APP_I18N_LOCALE='zh_CN' \ No newline at end of file diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 618cae6..56a7e4e 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -15,18 +15,22 @@ ref="upload" > - 选取文件 + + {{ t("common.selectFile") }} +
- 请上传 + {{ t("admin.validation.pleaseUpload") }} - 的文件 + {{ t("admin.validation.file") }}
{{ getFileName(file.name) }}
- 删除 + {{ t("common.delete") }} +
@@ -55,7 +63,9 @@