diff --git a/src/components/webReleaseActive/index.vue b/src/components/webReleaseActive/index.vue
index 73e31a7..c504646 100644
--- a/src/components/webReleaseActive/index.vue
+++ b/src/components/webReleaseActive/index.vue
@@ -131,7 +131,7 @@ const rules = ref({
{ required: true, message: "联系电话不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
- message: "请输入正确的手机号码",
+ message: computed(()=>t("admin.validation.pleaseEnterTheCorrectFormatOfThePhoneNumber")),
trigger: "blur",
},
],
diff --git a/src/i18n/message.js b/src/i18n/message.js
index 413f39c..b8d5325 100644
--- a/src/i18n/message.js
+++ b/src/i18n/message.js
@@ -25,14 +25,11 @@ const messages = {
activity: "活动报名",
aboutUs: "关于我们",
loginRegister: "登录注册",
- // 个人中心
personalCenter: "个人中心",
- // 退出登录
logout: "退出登录",
- // 切换系统
switchSystem: "切换系统",
- // 布局设置
layoutSettings: "布局设置",
+ changeAvatar: "更换头像",
},
footer: {
copyRight: "中科云 版权所有",
@@ -146,14 +143,11 @@ const messages = {
activity: "Регистрация на мероприятие",
aboutUs: "О нас",
loginRegister: "Войти в систему",
- // 个人中心
personalCenter: "Личный кабинет",
- // 退出登录
logout: "Выйти из системы",
- // 切换系统
switchSystem: "Переключить систему",
- // 布局设置
layoutSettings: "Настройки макета",
+ changeAvatar: "Сменить аватар",
},
footer: {
copyRight: "Все права защищены",
diff --git a/src/i18n/message/admin/form/ru.js b/src/i18n/message/admin/form/ru.js
index 6088215..9347427 100644
--- a/src/i18n/message/admin/form/ru.js
+++ b/src/i18n/message/admin/form/ru.js
@@ -47,5 +47,17 @@ const form = {
contactPhone: "Номер мобильного телефона контактного лица",
// 申请日期
applicationDate: "Дата подачи заявки",
+ // 新增{type}
+ add: "Добавить {type}",
+ // 修改{type}
+ edit: "Изменить {type}",
+ // 添加数据
+ addData: "Добавить данные",
+ // 修改数据
+ editData: "Изменить данные",
+ // 所属院所或单位
+ institute: "Институт или организация",
+ // 从业时间
+ workingTime: "Время работы",
};
export default form;
diff --git a/src/i18n/message/admin/form/zh.js b/src/i18n/message/admin/form/zh.js
index 82cd1e5..871dd47 100644
--- a/src/i18n/message/admin/form/zh.js
+++ b/src/i18n/message/admin/form/zh.js
@@ -46,6 +46,18 @@ const form = {
contactPhone: "联系人手机号",
// 申请日期
applicationDate: "申请日期",
+ // 新增{type}
+ add: "新增{type}",
+ // 修改{type}
+ edit: "修改{type}",
+ // 添加数据
+ addData: "添加数据",
+ // 修改数据
+ editData: "修改数据",
+ // 所属院所或单位
+ institute: "所属院所或单位",
+ // 从业时间
+ workingTime: "从业时间",
};
export default form;
diff --git a/src/i18n/message/admin/index.js b/src/i18n/message/admin/index.js
index 7c75080..84ed0cb 100644
--- a/src/i18n/message/admin/index.js
+++ b/src/i18n/message/admin/index.js
@@ -8,6 +8,8 @@ import broker_zh from "./broker/zh";
import broker_ru from "./broker/ru";
import table_zh from "./table/zh";
import table_ru from "./table/ru";
+import validation_zh from "./validation/zh";
+import validation_ru from "./validation/ru";
export const admin_zh = {
identity: {
@@ -17,7 +19,9 @@ export const admin_zh = {
form: form_zh,
broker: broker_zh,
table: table_zh,
+ validation: validation_zh,
};
+
export const admin_ru = {
identity: {
entrance: entrance_ru,
@@ -26,4 +30,5 @@ export const admin_ru = {
form: form_ru,
broker: broker_ru,
table: table_ru,
+ validation: validation_ru,
};
diff --git a/src/i18n/message/admin/table/ru.js b/src/i18n/message/admin/table/ru.js
index 118d8dc..13a2b0a 100644
--- a/src/i18n/message/admin/table/ru.js
+++ b/src/i18n/message/admin/table/ru.js
@@ -13,8 +13,20 @@ const table = {
achievementIndustry: "Область достижений",
// 取消关联
cancelRelation: "Отменить связь",
- // 取消发布
- cancelPublish: "Отменить публикацию",
+ // 取消发布
+ cancelPublish: "Отменить публикацию",
+ // 浏览单位信息
+ viewUnitInfo: "Просмотреть информацию об учреждении",
+ // 浏览次数
+ viewCount: "Количество просмотров",
+ // 浏览时间
+ viewTime: "Время просмотра",
+ // 浏览类别
+ viewCategory: "Категория просмотра",
+ // 实验室网址
+ labWebsite: "Веб-сайт лаборатории",
+ // 添加日期
+ addDate: "Дата добавления",
};
export default table;
diff --git a/src/i18n/message/admin/table/zh.js b/src/i18n/message/admin/table/zh.js
index 65be94d..2f288a9 100644
--- a/src/i18n/message/admin/table/zh.js
+++ b/src/i18n/message/admin/table/zh.js
@@ -14,6 +14,18 @@ const table = {
// 取消关联
cancelRelation: "取消关联",
// 取消发布
- cancelPublish: "取消发布",
+ cancelPublish: "取消发布",
+ // 浏览单位信息
+ viewUnitInfo: "浏览单位信息",
+ // 浏览次数
+ viewCount: "浏览次数",
+ // 浏览时间
+ viewTime: "浏览时间",
+ // 浏览类别
+ viewCategory: "浏览类别",
+ // 实验室网址
+ labWebsite: "实验室网址",
+ // 添加日期
+ addDate: "添加日期",
};
export default table;
diff --git a/src/i18n/message/admin/validation/ru.js b/src/i18n/message/admin/validation/ru.js
new file mode 100644
index 0000000..21a8e7b
--- /dev/null
+++ b/src/i18n/message/admin/validation/ru.js
@@ -0,0 +1,10 @@
+const validation = {
+ // {type}不能为空
+ required: "{type} не может быть пустым",
+ // 请上传
+ pleaseUpload: "Пожалуйста, загрузите",
+ // 请输入正确格式的手机号码
+ pleaseEnterTheCorrectFormatOfThePhoneNumber:
+ "Пожалуйста, введите правильный формат номера телефона",
+};
+export default validation;
diff --git a/src/i18n/message/admin/validation/zh.js b/src/i18n/message/admin/validation/zh.js
new file mode 100644
index 0000000..20a34f6
--- /dev/null
+++ b/src/i18n/message/admin/validation/zh.js
@@ -0,0 +1,10 @@
+const validation = {
+ // {type}不能为空
+ required: "{type}不能为空",
+ // 请上传
+ pleaseUpload: "请上传",
+ // 请输入正确格式的手机号码
+ pleaseEnterTheCorrectFormatOfThePhoneNumber: "请输入正确格式的手机号码",
+};
+
+export default validation;
diff --git a/src/i18n/message/common/ru.js b/src/i18n/message/common/ru.js
index 58714dc..bcfaafe 100644
--- a/src/i18n/message/common/ru.js
+++ b/src/i18n/message/common/ru.js
@@ -14,5 +14,9 @@ const common = {
congratulations: "Поздравляем",
title: "Цифровой мозг науки и технологий",
status: "{type} статус",
+ // 选择
+ select: "Выбрать",
+ // 提交
+ submit: "Представить",
};
export default common;
diff --git a/src/i18n/message/common/zh.js b/src/i18n/message/common/zh.js
index a3321ae..4ddf8b0 100644
--- a/src/i18n/message/common/zh.js
+++ b/src/i18n/message/common/zh.js
@@ -14,6 +14,10 @@ export const common = {
congratulations: "恭喜你",
title: "数字科创大脑",
status: "{type}状态",
+ // 选择
+ select: "选择",
+ // 提交
+ submit: "提交",
};
export default common;
diff --git a/src/i18n/message/routes/lab/ru.js b/src/i18n/message/routes/lab/ru.js
index 8aa025d..e98e983 100644
--- a/src/i18n/message/routes/lab/ru.js
+++ b/src/i18n/message/routes/lab/ru.js
@@ -25,6 +25,7 @@ const lab = {
browseInformation: "Информация о просмотре",
// 实验设备
experimentalEquipment: "Экспериментальное оборудование",
+ viewUnitInformation: "Информация о просмотре",
};
export default lab;
diff --git a/src/i18n/message/routes/lab/zh.js b/src/i18n/message/routes/lab/zh.js
index 927cc89..d2dcb7b 100644
--- a/src/i18n/message/routes/lab/zh.js
+++ b/src/i18n/message/routes/lab/zh.js
@@ -25,6 +25,7 @@ const lab = {
browseInformation: "浏览单位信息",
// 实验设备
experimentalEquipment: "实验设备",
+ viewUnitInformation: "浏览单位信息",
};
export default lab;
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 1517189..aa071aa 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -58,7 +58,7 @@
- 修改头像
+ {{ t("headerMenu.changeAvatar") }}
{{
diff --git a/src/views/admin/agent/bill/bill-list/index.vue b/src/views/admin/agent/bill/bill-list/index.vue
index 76763fa..e666e2f 100644
--- a/src/views/admin/agent/bill/bill-list/index.vue
+++ b/src/views/admin/agent/bill/bill-list/index.vue
@@ -154,7 +154,9 @@ getList();
/>
- 查询
+ {{
+ t("admin.common.search")
+ }}
{{ t("admin.common.reset") }}
diff --git a/src/views/admin/agent/bill/commission/index.vue b/src/views/admin/agent/bill/commission/index.vue
index 6425db2..3a64096 100644
--- a/src/views/admin/agent/bill/commission/index.vue
+++ b/src/views/admin/agent/bill/commission/index.vue
@@ -90,7 +90,9 @@ const getById = (id) => {};
- 查询
+ {{
+ t("admin.common.search")
+ }}
{{ t("admin.common.reset") }} {
>
- 查询
+ {{
+ t("admin.common.search")
+ }}
{{ t("admin.common.reset") }}
diff --git a/src/views/admin/agent/bill/exchange-record/index.vue b/src/views/admin/agent/bill/exchange-record/index.vue
index e63e394..041bb52 100644
--- a/src/views/admin/agent/bill/exchange-record/index.vue
+++ b/src/views/admin/agent/bill/exchange-record/index.vue
@@ -49,7 +49,9 @@ const handleDelete = (id) => {};
- 查询
+ {{
+ t("admin.common.search")
+ }}
{{ t("admin.common.reset") }}
diff --git a/src/views/admin/agent/service/enterprise/index.vue b/src/views/admin/agent/service/enterprise/index.vue
index 134e7b3..162d85a 100644
--- a/src/views/admin/agent/service/enterprise/index.vue
+++ b/src/views/admin/agent/service/enterprise/index.vue
@@ -241,7 +241,7 @@ getList();
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
diff --git a/src/views/admin/agent/service/matching-demand/index.vue b/src/views/admin/agent/service/matching-demand/index.vue
index e5e55e0..0b1dce2 100644
--- a/src/views/admin/agent/service/matching-demand/index.vue
+++ b/src/views/admin/agent/service/matching-demand/index.vue
@@ -181,7 +181,7 @@ const cancel = () => {
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
diff --git a/src/views/admin/enterprise/account/bill.vue b/src/views/admin/enterprise/account/bill.vue
index 262e5a9..7358e20 100644
--- a/src/views/admin/enterprise/account/bill.vue
+++ b/src/views/admin/enterprise/account/bill.vue
@@ -187,7 +187,7 @@
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
diff --git a/src/views/admin/enterprise/extension/product.vue b/src/views/admin/enterprise/extension/product.vue
index 101827d..a2152e3 100644
--- a/src/views/admin/enterprise/extension/product.vue
+++ b/src/views/admin/enterprise/extension/product.vue
@@ -147,7 +147,8 @@ const getList = async () => {
// 处理删除
const handleDelete = (id) => {
- modal.confirm('是否确认删除数据编号为"' + id + '"的产品项？')
+ modal
+ .confirm('是否确认删除数据编号为"' + id + '"的产品项？')
.then(async () => {
await deleteEnterpriseProduct(id);
ElMessage.success("删除成功");
@@ -165,7 +166,8 @@ function handleQuery() {
}
// 取消发布
const releaseCancel = (id) => {
- modal.confirm('确认要取消发布id为"' + id + '"的产品吗?')
+ modal
+ .confirm('确认要取消发布id为"' + id + '"的产品吗?')
.then(async () => {
await updateEnterpriseProduct({ id, status: 3 });
ElMessage.success("取消发布成功");
@@ -178,7 +180,8 @@ const releaseCancel = (id) => {
// 下架和上架
const handleShelf = (row) => {
let text = row.shelfStatus == 2 ? "上架" : "下架";
- modal.confirm('确认要"' + text + '""' + row.id + '"的产品吗?')
+ modal
+ .confirm('确认要"' + text + '""' + row.id + '"的产品吗?')
.then(function () {
let status = row.shelfStatus == 1 ? 2 : 1;
return updateEnterpriseProduct({ id: row.id, shelfStatus: status });
diff --git a/src/views/admin/expert/demand/already.vue b/src/views/admin/expert/demand/already.vue
index a87113d..84bc99a 100644
--- a/src/views/admin/expert/demand/already.vue
+++ b/src/views/admin/expert/demand/already.vue
@@ -165,7 +165,7 @@
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
@@ -308,7 +308,8 @@ const changePattent = (val) => {
// }
/** 删除按钮操作 */
function handleDelete(id) {
- modal.confirm('是否确认删除数据编号为"' + id + '"的数据项?')
+ modal
+ .confirm('是否确认删除数据编号为"' + id + '"的数据项?')
.then(function () {
return deleteExpertCooperateEnterpriseByIds(id);
})
@@ -336,7 +337,7 @@ function reset() {
function handleAdd() {
reset();
open.value = true;
- title.value = "添加数据";
+ title.value = t("admin.form.addData");
}
/** 修改数据 */
function handleUpdate(row) {
@@ -379,7 +380,7 @@ function handleUpdate(row) {
patentOptions.value = patents;
form.value = formData;
open.value = true;
- title.value = "修改数据";
+ title.value = t("admin.form.editData");
nextTick(() => {
// console.log(proxy.$refs["selectDom"]); // .cachedOptions
diff --git a/src/views/admin/expert/demand/serviceDemand.vue b/src/views/admin/expert/demand/serviceDemand.vue
index 9e09ac9..5b508ea 100644
--- a/src/views/admin/expert/demand/serviceDemand.vue
+++ b/src/views/admin/expert/demand/serviceDemand.vue
@@ -203,7 +203,8 @@ function handleEdit(id) {
// 修改为完成状态
const complete = (id) => {
- modal.confirm(`是否确认结束编号为${id}的数据项？`)
+ modal
+ .confirm(`是否确认结束编号为${id}的数据项？`)
.then(async () => {
await updateCasDemand({ id, status: 4 });
getList();
diff --git a/src/views/admin/expert/demand/think.vue b/src/views/admin/expert/demand/think.vue
index 8c035de..57f35fe 100644
--- a/src/views/admin/expert/demand/think.vue
+++ b/src/views/admin/expert/demand/think.vue
@@ -146,7 +146,7 @@
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
@@ -222,13 +222,11 @@ function handleQuery() {
// }
/** 删除按钮操作 */
function handleDelete(id) {
- modal.confirm(`是否确认删除数据编号为"${id}"的数据项?`).then(
- async () => {
- await deleteExpertWantEnterpriseByIds({ ids: [id] });
- getList();
- ElMessage.success("删除成功");
- }
- );
+ modal.confirm(`是否确认删除数据编号为"${id}"的数据项?`).then(async () => {
+ await deleteExpertWantEnterpriseByIds({ ids: [id] });
+ getList();
+ ElMessage.success("删除成功");
+ });
}
/** 重置新增的表单以及其他数据 */
@@ -250,7 +248,7 @@ function reset() {
function handleAdd() {
reset();
showEditDialog.value = true;
- title.value = "添加数据";
+ title.value = t("admin.form.addData");
}
/** 修改数据 */
function handleUpdate(row) {
@@ -262,7 +260,7 @@ function handleUpdate(row) {
.filter((el) => el != "")
.map((el) => parseInt(el)) ?? [];
showEditDialog.value = true;
- title.value = "修改数据";
+ title.value = t("admin.form.editData");
}
/** 提交按钮 */
diff --git a/src/views/admin/expert/technology/achievement.vue b/src/views/admin/expert/technology/achievement.vue
index 0c08062..e940997 100644
--- a/src/views/admin/expert/technology/achievement.vue
+++ b/src/views/admin/expert/technology/achievement.vue
@@ -25,7 +25,10 @@
:label="t('admin.form.name', { type: t('admin.common.achievement') })"
prop="title"
/>
-
+
{
// }
/** 删除按钮操作 */
const handleDelete = (id) => {
- modal.confirm('是否确认删除数据编号为"' + id + '"的成果项？').then(
- async () => {
+ modal
+ .confirm('是否确认删除数据编号为"' + id + '"的成果项？')
+ .then(async () => {
await deleteAchievementByIds({ ids: [id] });
getList();
ElMessage.success("删除成功");
- }
- );
+ });
};
// 上架和下架
function handleShelf(row) {
let text = row.shelfStatus == 2 ? "上架" : "下架";
- modal.confirm('确认要"' + text + '""' + row.id + '"的成果吗?').then(
- async () => {
+ modal
+ .confirm('确认要"' + text + '""' + row.id + '"的成果吗?')
+ .then(async () => {
const shelfStatus = row.shelfStatus == 1 ? 2 : 1;
await updateExpertAchievement({ id: row.id, shelfStatus });
getList();
ElMessage.success(text + "成功");
- }
- );
+ });
}
// 取消发布
const handleCancelPublish = (id) => {
- modal.confirm(`确认要取消发布编号为"${id}"的成果吗?`).then(
- async () => {
- await updateExpertAchievement({ id, status: "3" });
- ElMessage.success("取消发布成功");
- getList();
- }
- );
+ modal.confirm(`确认要取消发布编号为"${id}"的成果吗?`).then(async () => {
+ await updateExpertAchievement({ id, status: "3" });
+ ElMessage.success("取消发布成功");
+ getList();
+ });
// queryParams.value.status = "3";
// handleQuery();
};
diff --git a/src/views/admin/expert/technology/paper.vue b/src/views/admin/expert/technology/paper.vue
index 7401a29..b6cb468 100644
--- a/src/views/admin/expert/technology/paper.vue
+++ b/src/views/admin/expert/technology/paper.vue
@@ -160,7 +160,7 @@
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
@@ -245,13 +245,13 @@ function resetQuery() {
}
/** 删除按钮操作 */
function handleDelete(id) {
- modal.confirm('是否确认删除数据编号为"' + id + '"的数据项?').then(
- async () => {
+ modal
+ .confirm('是否确认删除数据编号为"' + id + '"的数据项?')
+ .then(async () => {
await deleteCasPaper(id);
getList();
ElMessage.success("删除成功");
- }
- );
+ });
}
/** 重置新增的表单以及其他数据 */
diff --git a/src/views/admin/expert/technology/patent.vue b/src/views/admin/expert/technology/patent.vue
index b9d01ed..1d0dec6 100644
--- a/src/views/admin/expert/technology/patent.vue
+++ b/src/views/admin/expert/technology/patent.vue
@@ -255,7 +255,7 @@
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
@@ -356,7 +356,8 @@ function resetQuery() {
}
/** 删除按钮操作 */
function handleDelete(id) {
- modal.confirm('是否确认删除数据编号为"' + id + '"的专利项?')
+ modal
+ .confirm('是否确认删除数据编号为"' + id + '"的专利项?')
.then(function () {
return deleteCasPatentByIds(id);
})
@@ -392,7 +393,7 @@ function reset() {
const handleAdd = () => {
reset();
open.value = true;
- title.value = "添加数据";
+ title.value = t("admin.form.addData");
};
/** 修改数据 */
const handleUpdate = (row) => {
@@ -401,7 +402,7 @@ const handleUpdate = (row) => {
// patentDetail({ id }).then((res) => {
form.value = data;
open.value = true;
- title.value = "修改数据";
+ title.value = t("admin.form.editData");
// });
};
diff --git a/src/views/admin/expert/technology/research.vue b/src/views/admin/expert/technology/research.vue
index e668786..bbe7530 100644
--- a/src/views/admin/expert/technology/research.vue
+++ b/src/views/admin/expert/technology/research.vue
@@ -223,7 +223,7 @@
{{
t("admin.common.confirm")
}}
- 取 消
+ {{ t("admin.common.cancel") }}
@@ -315,7 +315,8 @@ function resetQuery() {
}
function handleShelf(row) {
const text = row.shelfStatus == 2 ? "上架" : "下架";
- modal.confirm(`确认要${text}"${row.id}"的数据吗?`)
+ modal
+ .confirm(`确认要${text}"${row.id}"的数据吗?`)
.then(() => {
const shelfStatus = row.shelfStatus == 1 ? 2 : 1;
return updateTechnologyProject({ id: row.id, shelfStatus });
@@ -330,13 +331,11 @@ function handleShelf(row) {
}
/** 删除按钮操作 */
function handleDelete(id) {
- modal.confirm(`是否确认删除数据编号为"${id}"的数据项?`).then(
- async () => {
- await deleteTechnologyProjectByIds({ ids: [id] });
- getList();
- ElMessage.success("删除成功");
- }
- );
+ modal.confirm(`是否确认删除数据编号为"${id}"的数据项?`).then(async () => {
+ await deleteTechnologyProjectByIds({ ids: [id] });
+ getList();
+ ElMessage.success("删除成功");
+ });
}
/** 重置新增的表单以及其他数据 */
@@ -360,14 +359,14 @@ function reset() {
function handleAdd() {
reset();
showEditDialog.value = true;
- title.value = "添加数据";
+ title.value = t("admin.form.addData");
}
/** 修改数据 */
function handleUpdate(row) {
reset();
form.value = cloneDeep(row);
showEditDialog.value = true;
- title.value = "修改数据";
+ title.value = t("admin.form.editData");
}
/** 提交按钮 */
function submitForm() {
diff --git a/src/views/admin/laboratory/research/expert/index.vue b/src/views/admin/laboratory/research/expert/index.vue
index b1a197c..1709755 100644
--- a/src/views/admin/laboratory/research/expert/index.vue
+++ b/src/views/admin/laboratory/research/expert/index.vue
@@ -131,7 +131,7 @@
{{ t("admin.common.confirm") }}
- 取 消
+ {{ t("admin.common.cancel") }}
diff --git a/src/views/admin/laboratory/research/laboratory-equipment/index.vue b/src/views/admin/laboratory/research/laboratory-equipment/index.vue
index d2d8f17..468d3d4 100644
--- a/src/views/admin/laboratory/research/laboratory-equipment/index.vue
+++ b/src/views/admin/laboratory/research/laboratory-equipment/index.vue
@@ -122,7 +122,10 @@
:rules="rules"
label-width="100px"
>
-
+
-
+
@@ -145,7 +157,14 @@
:label="t('admin.form.achievementParameter')"
prop="param"
>
-
+
@@ -176,7 +195,7 @@