From 1f5d58558b0c55c9e67e7e81d01414f1d3896677 Mon Sep 17 00:00:00 2001 From: quantulr <35954003+quantulr@users.noreply.github.com> Date: Mon, 31 Jul 2023 17:27:13 +0800 Subject: [PATCH] bugfix and performance improvements --- src/constant/dict.js | 24 ++++++++ src/i18n/message/admin/form/ru.js | 2 + src/i18n/message/admin/form/zh.js | 2 + src/i18n/message/dict/ru.js | 7 +++ src/i18n/message/dict/zh.js | 6 ++ src/i18n/message/webSearch/ru.js | 2 + src/i18n/message/webSearch/zh.js | 2 + .../enterprise/technology-demand-release.vue | 56 ++++++++++--------- .../service/enterprise/technology-demand.vue | 3 +- .../agent/service/matching-demand/detail.vue | 4 +- src/views/admin/components/enterpriseItem.vue | 6 +- .../enterprise/demand/releaseTechnology.vue | 4 +- .../admin/enterprise/extension/product.vue | 15 ++++- .../admin/enterprise/extension/results.vue | 2 +- src/views/admin/enterprise/index.vue | 2 +- .../expert/components/ReleaseForm/index.vue | 2 +- .../admin/expert/technology/achievement.vue | 47 +++++++++++----- src/views/admin/expert/technology/release.vue | 6 +- .../admin/research/account/basic-info.vue | 2 +- src/views/components/ResearchForm/index.vue | 17 +++--- 20 files changed, 146 insertions(+), 65 deletions(-) diff --git a/src/constant/dict.js b/src/constant/dict.js index 79f62e7..de1654c 100644 --- a/src/constant/dict.js +++ b/src/constant/dict.js @@ -209,3 +209,27 @@ export const achievementPromotionDict = [ i18n: "listingGuidance", }, ]; + +// 成果难题解决 成果储备/项目投资 新成果开发 检验检测 +export const techinicalDemandTypeDict = [ + { + value: 1, + label: "成果难题解决", + i18n: "achievementProblemSolution", + }, + { + value: 2, + label: "成果储备/项目投资", + i18n: "achievementReserveProjectInvestment", + }, + { + value: 3, + label: "新成果开发", + i18n: "newAchievementDevelopment", + }, + { + value: 4, + label: "检验检测", + i18n: "inspectionAndTesting", + }, +]; diff --git a/src/i18n/message/admin/form/ru.js b/src/i18n/message/admin/form/ru.js index 0ef89ce..0419cb3 100644 --- a/src/i18n/message/admin/form/ru.js +++ b/src/i18n/message/admin/form/ru.js @@ -113,5 +113,7 @@ const form = { leadership: "Лидерство", // 成果图片 achievementPicture: "Изображение достижений", + // 产品领域 + productField: "Область продукта", }; export default form; diff --git a/src/i18n/message/admin/form/zh.js b/src/i18n/message/admin/form/zh.js index b96f256..cc04b0c 100644 --- a/src/i18n/message/admin/form/zh.js +++ b/src/i18n/message/admin/form/zh.js @@ -111,6 +111,8 @@ const form = { leadership: "领先情况", // 成果图片 achievementPicture: "成果图片", + // 产品领域 + productField: "产品领域", }; export default form; diff --git a/src/i18n/message/dict/ru.js b/src/i18n/message/dict/ru.js index 7d98aae..13cd6f7 100644 --- a/src/i18n/message/dict/ru.js +++ b/src/i18n/message/dict/ru.js @@ -26,6 +26,13 @@ const dict = { keyAchievementSolution: "Ключевое решение достижений", dockingExpertsAcademicians: "Док-ин экспертов и академиков", listingGuidance: "Руководство по листингу", + + // 成果难题解决 成果储备/项目投资 新成果开发 检验检测 + achievementProblemSolution: "Решение проблем достижений", + achievementReserveProjectInvestment: + "Резервирование достижений/инвестиции в проекты", + newAchievementDevelopment: "Разработка новых достижений", + inspectionAndTesting: "Инспекция и тестирование", }; export default dict; diff --git a/src/i18n/message/dict/zh.js b/src/i18n/message/dict/zh.js index 98b7b8d..c0b262a 100644 --- a/src/i18n/message/dict/zh.js +++ b/src/i18n/message/dict/zh.js @@ -27,6 +27,12 @@ const dict = { keyAchievementSolution: "重点成果解决方案", dockingExpertsAcademicians: "对接专家院士", listingGuidance: "上市指导", + + // 成果难题解决 成果储备/项目投资 新成果开发 检验检测 + achievementProblemSolution: "成果难题解决", + achievementReserveProjectInvestment: "成果储备/项目投资", + newAchievementDevelopment: "新成果开发", + inspectionAndTesting: "检验检测", }; export default dict; diff --git a/src/i18n/message/webSearch/ru.js b/src/i18n/message/webSearch/ru.js index 8068f58..1a68e73 100644 --- a/src/i18n/message/webSearch/ru.js +++ b/src/i18n/message/webSearch/ru.js @@ -110,6 +110,8 @@ const webSearch = { viewMatchingResults: "Просмотр результатов сопоставления", // 专利状态 patentStatus: "Статус патента", + // 后台暂未提供 + noDataFromBackground: "Нет данных из фона", }; export default webSearch; diff --git a/src/i18n/message/webSearch/zh.js b/src/i18n/message/webSearch/zh.js index 86ca3b1..15a2dbe 100644 --- a/src/i18n/message/webSearch/zh.js +++ b/src/i18n/message/webSearch/zh.js @@ -110,5 +110,7 @@ const webSearch = { viewMatchingResults: "查看匹配结果", // 专利状态 patentStatus: "专利状态", + // 后台暂未提供 + noDataFromBackground: "后台暂未提供", }; export default webSearch; diff --git a/src/views/admin/agent/service/enterprise/technology-demand-release.vue b/src/views/admin/agent/service/enterprise/technology-demand-release.vue index bdf98f1..49136ed 100644 --- a/src/views/admin/agent/service/enterprise/technology-demand-release.vue +++ b/src/views/admin/agent/service/enterprise/technology-demand-release.vue @@ -98,11 +98,11 @@ v-model="form" :labelWidth="labelWidth" /> - + + + + + @@ -236,8 +236,9 @@ // import { expert } from "@/api/identity/index"; // import { insertTechnologyDemand } from "@/api/admin/enterprise"; +// import { expert } from "@/api/identity/index"; +// import { insertTechnologyDemand } from "@/api/admin/enterprise"; import tab from "@/plugins/tab"; -import CityOptions from "@/views/components/CityOptions"; import FieldOptions from "@/views/components/FieldOptions"; import InputBoxAdd from "@/views/components/InputBoxAdd"; import { ElMessage } from "element-plus"; @@ -255,6 +256,7 @@ import { updateCount } from "@/api/admin/count"; import { insertDemand } from "@/api/admin/agent/service/technology-demand"; import { useI18n } from "vue-i18n"; import modal from "@/plugins/modal"; +import { techinicalDemandTypeDict } from "@/constant/dict"; const { t } = useI18n(); const router = useRouter(); @@ -374,28 +376,32 @@ const { proxy } = getCurrentInstance(); const labelWidth = 160; // const isContainOther = ref(false); const checkList = reactive([ - { - id: 1, - name: "成果难题解决", - }, - { - id: 2, - name: "成果储备/项目投资", - }, - { - id: 3, - name: "新成果开发", - }, - { - id: 4, - name: "检验检测", - }, + techinicalDemandTypeDict.map((el) => ({ + id: el.value, + name: t(`dict.${el.i18n}`), + })), + // { + // id: 1, + // name: "成果难题解决", + // }, + // { + // id: 2, + // name: "成果储备/项目投资", + // }, + // { + // id: 3, + // name: "新成果开发", + // }, + // { + // id: 4, + // name: "检验检测", + // }, ]); const formRef = ref(null); const fieldFormRef = ref(null); const directionsFormRef = ref(null); -const cityFormRef = ref(null); +// const cityFormRef = ref(null); const checkInput = ref(""); const submitForm = async (status) => { let formValid; @@ -407,8 +413,8 @@ const submitForm = async (status) => { form.value.status = status; const fieldFormValid = await fieldFormRef.value.validateForm(); const directionsFormValid = await directionsFormRef.value.validateForm(); - const cityFormValid = await cityFormRef.value.validateForm(); - if (formValid && fieldFormValid && directionsFormValid && cityFormValid) { + // const cityFormValid = await cityFormRef.value.validateForm(); + if (formValid && fieldFormValid && directionsFormValid) { if (route.query.id) { /*TODO*/ /*await updateTechnologyDemand(form.value); diff --git a/src/views/admin/agent/service/enterprise/technology-demand.vue b/src/views/admin/agent/service/enterprise/technology-demand.vue index 27f15b8..a7e2bfc 100644 --- a/src/views/admin/agent/service/enterprise/technology-demand.vue +++ b/src/views/admin/agent/service/enterprise/technology-demand.vue @@ -131,8 +131,7 @@ if (route.query.id) { {{ t("admin.common.delete") }} {{ t("webSearch.viewMatchResults") }} - }} + >{{ t("webSearch.viewMatchingResults") }} diff --git a/src/views/admin/agent/service/matching-demand/detail.vue b/src/views/admin/agent/service/matching-demand/detail.vue index 976ee23..b41bf39 100644 --- a/src/views/admin/agent/service/matching-demand/detail.vue +++ b/src/views/admin/agent/service/matching-demand/detail.vue @@ -179,7 +179,6 @@ const checkList = reactive([ const formRef = ref(null); const fieldFormRef = ref(null); const directionsFormRef = ref(null); -const cityFormRef = ref(null); const checkInput = ref(""); const submitForm = async (status) => { let formValid; @@ -191,8 +190,7 @@ const submitForm = async (status) => { form.value.status = status; const fieldFormValid = await fieldFormRef.value.validateForm(); const directionsFormValid = await directionsFormRef.value.validateForm(); - const cityFormValid = await cityFormRef.value.validateForm(); - if (formValid && fieldFormValid && directionsFormValid && cityFormValid) { + if (formValid && fieldFormValid && directionsFormValid) { if (route.query.id) { await updateTechnologyDemand(form.value); ElMessage.success(t("admin.common.EditSuccess")); diff --git a/src/views/admin/components/enterpriseItem.vue b/src/views/admin/components/enterpriseItem.vue index 15b169c..c90c96d 100644 --- a/src/views/admin/components/enterpriseItem.vue +++ b/src/views/admin/components/enterpriseItem.vue @@ -9,7 +9,9 @@
{{ "webSearch.companySize" }}： - {{ data.kind_title || "后台暂没提供" }} + {{ + data.kind_title || t("webSearch.noDataFromBackground") + }}
{{ t("webSearch.coreProducts") }}： {{ data.product }} @@ -17,7 +19,7 @@
{{ t("webSearch.companyWebsite") }}： {{ data.url || "后台暂没提供" }}{{ data.url || t("webSearch.noDataFromBackground") }}
diff --git a/src/views/admin/enterprise/demand/releaseTechnology.vue b/src/views/admin/enterprise/demand/releaseTechnology.vue index 7cd819a..ffe38e3 100644 --- a/src/views/admin/enterprise/demand/releaseTechnology.vue +++ b/src/views/admin/enterprise/demand/releaseTechnology.vue @@ -299,7 +299,7 @@ const data = reactive({ /*"联系人手机号不能为空"*/ message: computed(() => t("admin.validation.required", { - type: t("webContact.demandPhone"), + type: t("admin.form.demandContact"), }) ), trigger: "blur", @@ -402,7 +402,7 @@ const submitForm = async (status) => { const fieldFormValid = await fieldFormRef.value.validateForm(); const directionsFormValid = await directionsFormRef.value.validateForm(); // const cityFormValid = await cityFormRef.value.validateForm(); - if (formValid && fieldFormValid && directionsFormValid && cityFormValid) { + if (formValid && fieldFormValid && directionsFormValid) { if (route.query.id) { await updateTechnologyDemand(form.value); ElMessage.success(t("admin.common.EditSuccess")); diff --git a/src/views/admin/enterprise/extension/product.vue b/src/views/admin/enterprise/extension/product.vue index 3176ddc..4a16280 100644 --- a/src/views/admin/enterprise/extension/product.vue +++ b/src/views/admin/enterprise/extension/product.vue @@ -35,7 +35,10 @@ :label="t('admin.form.name', { type: t('admin.form.product') })" prop="title" /> - + {{ row.shelfStatus == 2 ? "上架" : "下架" }} + >{{ + row.shelfStatus == 2 + ? t("admin.table.putOn") + : t("admin.table.putOff") + }} + ) }} { }; // 下架和上架 const handleShelf = (row) => { - let text = row.shelfStatus == 2 ? "上架" : "下架"; + let text = + row.shelfStatus == 2 ? t("admin.table.putOn") : t("admin.table.putOff"); modal .confirm('确认要"' + text + '""' + row.id + '"的产品吗?') .then(function () { diff --git a/src/views/admin/enterprise/extension/results.vue b/src/views/admin/enterprise/extension/results.vue index 84114f8..44ad385 100644 --- a/src/views/admin/enterprise/extension/results.vue +++ b/src/views/admin/enterprise/extension/results.vue @@ -29,7 +29,7 @@ {{ t("admin.common.lab") }} {{ t("routes.common.technicalDemand") }} + >{{ t("routes.company.technicalDemand") }} diff --git a/src/views/admin/enterprise/index.vue b/src/views/admin/enterprise/index.vue index 8fba0cd..554f11b 100644 --- a/src/views/admin/enterprise/index.vue +++ b/src/views/admin/enterprise/index.vue @@ -2,7 +2,7 @@
- 会员banner图 + banner
+ + + + @@ -110,14 +110,13 @@