From 2ba5ff9439c3662cf9edf3ee054fc5db501ed21f Mon Sep 17 00:00:00 2001 From: ailanyin Date: Wed, 26 Jul 2023 17:24:49 +0800 Subject: [PATCH] bugfix and performance improvements --- package.json | 3 + src/api/admin/laboratory/achievement.js | 9 + src/api/admin/research/achievement.js | 8 + src/assets/achievement_import_description.txt | 22 ++ src/assets/achievement_import_template.xlsx | Bin 0 -> 4654 bytes src/components/DictTag/index.vue | 9 +- src/constant/dict.js | 17 ++ src/i18n/message.js | 4 + src/i18n/message/activity/ru.js | 4 + src/i18n/message/activity/zh.js | 4 + src/i18n/message/admin/common/ru.js | 2 + src/i18n/message/admin/common/zh.js | 2 + src/i18n/message/admin/dict/ru.js | 9 + src/i18n/message/admin/dict/zh.js | 11 + src/i18n/message/admin/form/ru.js | 25 ++ src/i18n/message/admin/form/zh.js | 25 ++ src/i18n/message/admin/index.js | 4 + src/i18n/message/admin/table/ru.js | 28 +- src/i18n/message/admin/table/zh.js | 28 +- src/i18n/message/common/ru.js | 1 + src/i18n/message/common/zh.js | 1 + src/i18n/message/dict/ru.js | 15 ++ src/i18n/message/dict/zh.js | 15 ++ src/i18n/message/routes/lab/ru.js | 4 + src/i18n/message/routes/lab/zh.js | 4 + src/i18n/message/routes/research/ru.js | 5 + src/i18n/message/routes/research/zh.js | 4 + src/i18n/message/webSearch/ru.js | 2 + src/i18n/message/webSearch/zh.js | 1 + src/router/index.js | 78 ++++-- src/utils/request.js | 14 +- src/views/admin/agent/account/basic-info.vue | 57 +--- .../admin/agent/bill/bill-list/index.vue | 2 +- .../admin/agent/bill/commission/index.vue | 4 +- .../agent/bill/commission/withdraw-record.vue | 4 +- .../agent/bill/exchange-record/index.vue | 2 + .../admin/agent/bill/trade-auth/index.vue | 5 +- .../admin/agent/service/enterprise/index.vue | 2 +- .../enterprise/technology-demand-release.vue | 2 +- .../agent/service/matching-demand/detail.vue | 3 +- src/views/admin/enterprise/account/bill.vue | 43 ++- .../admin/enterprise/activity/active.vue | 2 +- .../enterprise/demand/releaseTechnology.vue | 2 +- .../admin/enterprise/demand/serviceDemand.vue | 37 ++- .../admin/enterprise/demand/technology.vue | 77 +++--- .../admin/enterprise/extension/product.vue | 16 +- src/views/admin/enterprise/index.vue | 4 +- src/views/admin/expert/activity/active.vue | 67 +++-- .../expert/components/ReleaseForm/index.vue | 209 +++++++++++---- src/views/admin/expert/demand/already.vue | 109 ++++---- src/views/admin/expert/demand/release.vue | 10 +- .../admin/expert/demand/serviceDemand.vue | 39 +-- src/views/admin/expert/demand/think.vue | 54 ++-- src/views/admin/expert/index.vue | 42 ++- .../admin/expert/technology/achievement.vue | 75 +++--- src/views/admin/expert/technology/paper.vue | 131 ++++++--- src/views/admin/expert/technology/patent.vue | 138 +++++++--- src/views/admin/expert/technology/release.vue | 16 +- .../admin/expert/technology/research.vue | 251 ++++++++++++++---- .../laboratory/research/achievement/index.vue | 173 +++++++++--- .../laboratory/research/expert/index.vue | 140 +++++++--- .../admin/laboratory/research/paper/index.vue | 35 ++- .../laboratory/research/patent/index.vue | 8 +- .../research/research/achievement/index.vue | 165 ++++++++++-- .../admin/research/research/expert/index.vue | 2 +- .../admin/research/research/paper/index.vue | 35 ++- src/views/components/AgentForm/index.vue | 17 +- src/views/components/ExpertForm/index.vue | 108 ++++---- src/views/components/FieldOptions/index.vue | 30 ++- src/views/components/FieldSingle/index.vue | 6 +- src/views/components/LaboratoryForm/index.vue | 206 ++++---------- src/views/components/ReleaseForm/index.vue | 4 +- src/views/monitor/cache/list.vue | 4 +- src/views/monitor/job/index.vue | 4 +- src/views/monitor/job/log.vue | 2 +- src/views/monitor/online/index.vue | 2 +- src/views/monitor/operlog/index.vue | 2 +- src/views/system/config/index.vue | 2 +- src/views/system/dept/index.vue | 2 +- src/views/system/dict/data.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/system/menu/index.vue | 2 +- src/views/system/notice/index.vue | 4 +- src/views/system/post/index.vue | 2 +- src/views/system/role/authUser.vue | 2 +- src/views/system/role/index.vue | 2 +- src/views/system/user/index.vue | 8 +- src/views/system/user/profile/userInfo.vue | 2 +- src/views/test.jsx | 31 --- src/views/test.vue | 11 - src/views/tool/gen/basicInfoForm.vue | 2 +- src/views/tool/gen/editTable.vue | 2 +- src/views/tool/gen/genInfoForm.vue | 10 +- src/views/tool/gen/index.vue | 2 +- src/views/website/home/comp/index1.vue | 173 +++--------- .../website/searchList/achievementDetail.vue | 2 +- .../searchList/components/industrySelect.vue | 6 +- vite.config.js | 4 +- 98 files changed, 1900 insertions(+), 1077 deletions(-) create mode 100644 src/assets/achievement_import_description.txt create mode 100644 src/assets/achievement_import_template.xlsx create mode 100644 src/i18n/message/admin/dict/ru.js create mode 100644 src/i18n/message/admin/dict/zh.js create mode 100644 src/i18n/message/dict/ru.js create mode 100644 src/i18n/message/dict/zh.js delete mode 100644 src/views/test.jsx delete mode 100644 src/views/test.vue diff --git a/package.json b/package.json index c07e210..bc5f245 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,9 @@ "@vueuse/core": "8.5.0", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", + "animejs": "^3.2.1", "axios": "0.26.1", + "dayjs": "^1.11.0", "echarts": "^5.4.0", "echarts-extension-amap": "^1.10.1", "element-plus": "2.1.8", @@ -30,6 +32,7 @@ "js-md5": "^0.7.3", "jsencrypt": "3.2.1", "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "nprogress": "0.2.0", "pinia": "2.0.14", "pinia-plugin-persistedstate": "^3.1.0", diff --git a/src/api/admin/laboratory/achievement.js b/src/api/admin/laboratory/achievement.js index 03445d3..f24b27c 100644 --- a/src/api/admin/laboratory/achievement.js +++ b/src/api/admin/laboratory/achievement.js @@ -9,6 +9,15 @@ export const achievementList = (params) => { }); }; +// 实验室成果 +export const laboratoryAchievementList = (params) => { + return request({ + url: `/app/laboratory/laboratoryAchievementList`, + method: "GET", + params, + }); +}; + export const deleteAchievements = (ids) => { return request({ url: `/app/laboratory/deleteAchievements/${ids}`, diff --git a/src/api/admin/research/achievement.js b/src/api/admin/research/achievement.js index 10d08e5..dabc726 100644 --- a/src/api/admin/research/achievement.js +++ b/src/api/admin/research/achievement.js @@ -8,6 +8,14 @@ export const achievementList = (params) => { params, }); }; +// 科研成果 +export const researchAchievementList = (params) => { + return request({ + url: `/app/research/researchAchievementList`, + method: "GET", + params, + }); +}; export const deleteAchievements = (ids) => { return request({ diff --git a/src/assets/achievement_import_description.txt b/src/assets/achievement_import_description.txt new file mode 100644 index 0000000..b59608e --- /dev/null +++ b/src/assets/achievement_import_description.txt @@ -0,0 +1,22 @@ +1. ʡͺ̨Ӧ(: ,дɰʡ, ϷвдɺϷ) + +2. + a. ͨ > + ҽҩ>ҩȻҩ>ҩз + b. ͨ / + ҽҩ>ҩȻҩ>ҩз/߼>֪ʶȨɹת + +3. Ӧÿͻ + ͨ , (ӢĶ) + +4. ؼ + ͨ , (ӢĶ) + +5. ɹ: + з СԽ׶ ͨС Խ׶ ͨ ɹģ + +6. ɹ: + Ƚ Ƚ + +7. ģʽ: + ת ˾ гƹ \ No newline at end of file diff --git a/src/assets/achievement_import_template.xlsx b/src/assets/achievement_import_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d151d8935a29c62620fc410911e75689e71d9966 GIT binary patch literal 4654 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 C^Gl%s literal 0 HcmV?d00001 diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index a02568d..a62a671 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -7,7 +7,7 @@ :key="item.value" :index="index" :class="item.elTagClass" - >{{ item.label }}{{ item.i18n ? t(`dict.${item.i18n}`) : item.label }} {{ item.label }} + >{{ item.i18n ? t(`dict.${item.i18n}`) : item.label }} + @@ -61,11 +41,13 @@ const flag = ref(true); :deep(el-card__header) { padding-top: 0; padding-bottom: 0; + div { height: 40px; line-height: 40px; } } + .surplus-currency { background-image: url("@/assets/index_banner.png"); margin-bottom: 20px; @@ -73,27 +55,33 @@ const flag = ref(true); color: white; background-color: #f2f2f2; padding: 20px 50px; + ._tit { font-size: 24px; font-weight: 700; color: #bebebe; + div { font-size: 18px; // color: #000; } } } + .vip-box { height: auto; // background-color: yellow; } + .menu-item { display: flex; flex-direction: column; align-items: center; + :deep(.el-avatar--icon) { background-color: #409eff; } + .title { margin-top: 20px; } diff --git a/src/views/admin/expert/technology/achievement.vue b/src/views/admin/expert/technology/achievement.vue index 64d99dc..03654d8 100644 --- a/src/views/admin/expert/technology/achievement.vue +++ b/src/views/admin/expert/technology/achievement.vue @@ -3,7 +3,9 @@ - 发布成果 + {{ t("admin.table.publishAchievement") }} + @@ -13,10 +15,18 @@ size="small" @change="handleQuery" > - 待审核 - 已发布 - 已驳回 - 草稿箱 + {{ t("admin.table.pendingReview") }} + + {{ t("admin.table.published") }} + + {{ t("admin.table.rejected") }} + + {{ t("admin.table.draftBox") }} + @@ -25,10 +35,7 @@ :label="t('admin.form.name', { type: t('admin.common.achievement') })" prop="title" /> - + - diff --git a/src/views/admin/laboratory/research/expert/index.vue b/src/views/admin/laboratory/research/expert/index.vue index fb93d4c..d014896 100644 --- a/src/views/admin/laboratory/research/expert/index.vue +++ b/src/views/admin/laboratory/research/expert/index.vue @@ -7,11 +7,20 @@ :model="queryParams" @submit.prevent > - + 搜索 + > + {{ t("common.search") }} 重置 + >{{ t("admin.common.reset") }} @@ -37,8 +47,8 @@ size="small" type="primary" @click="handleAddBind" - >关联专家 + >{{ t("admin.table.relatedExperts") }} + - + - + 搜索 + > + {{ t("common.search") }} 重置 + >{{ t("admin.common.reset") }} - + - - + + - + - + @@ -103,20 +116,81 @@ :total="total" @pagination="getList" /> + + + + + + + +
将文件拖到此处，或点击上传
+ + + + diff --git a/src/views/admin/research/research/expert/index.vue b/src/views/admin/research/research/expert/index.vue index b58254c..2de8c9d 100644 --- a/src/views/admin/research/research/expert/index.vue +++ b/src/views/admin/research/research/expert/index.vue @@ -109,7 +109,7 @@ - + diff --git a/src/views/admin/research/research/paper/index.vue b/src/views/admin/research/research/paper/index.vue index 6f62101..6080d80 100644 --- a/src/views/admin/research/research/paper/index.vue +++ b/src/views/admin/research/research/paper/index.vue @@ -109,19 +109,28 @@ - - + + - + - + @@ -132,9 +141,9 @@ :labelWidth="100" fieldKey="keywords" :placeholder="t('admin.form.inputKeywords')" - title="关键词" + :title="t('admin.form.keywords')" /> - + + t("admin.validation.required", { type: t("admin.form.paperTitle") }) + ), + trigger: "blur", + }, + ], ext: [{ required: true, message: "刊物不能为空", trigger: "blur" }], author: [{ required: true, message: "作者不能为空", trigger: "blur" }], publish_at: [ diff --git a/src/views/components/AgentForm/index.vue b/src/views/components/AgentForm/index.vue index 9c04da3..fdb35be 100644 --- a/src/views/components/AgentForm/index.vue +++ b/src/views/components/AgentForm/index.vue @@ -5,12 +5,9 @@ :model="modelValue" :rules="rules" > -
- - {{ t("admin.form.basicInfo") }} -
+
基本信息
- + @@ -18,10 +15,10 @@ - + - - + + @@ -62,7 +59,7 @@ :labelWidth="labelWidth" fieldKey="keywords" placeholder="应用场景关键词+技术产品关键词" - title="关键词" + :title="t('admin.form.keywords')" /> @@ -124,9 +121,7 @@ import InputBoxAdd from "../InputBoxAdd"; import FieldOptions from "../FieldOptions"; import { ref } from "vue"; -import { useI18n } from "vue-i18n"; -const { t } = useI18n(); const formRef = ref(); const researchsFormRef = ref(); const keywordsFormRef = ref(); diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue index f2b03e5..acda650 100644 --- a/src/views/components/ExpertForm/index.vue +++ b/src/views/components/ExpertForm/index.vue @@ -1,17 +1,17 @@ - diff --git a/src/views/tool/gen/basicInfoForm.vue b/src/views/tool/gen/basicInfoForm.vue index 789983b..ed83deb 100644 --- a/src/views/tool/gen/basicInfoForm.vue +++ b/src/views/tool/gen/basicInfoForm.vue @@ -17,7 +17,7 @@ - + diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue index 7a9e1ed..872fa6a 100644 --- a/src/views/tool/gen/editTable.vue +++ b/src/views/tool/gen/editTable.vue @@ -123,7 +123,7 @@ v-model="scope.row.dictType" clearable filterable - :placeholder="t('admin.pleaseSelect')" + :placeholder="t('admin.form.pleaseSelect')" >
- + +
- - + + + + + + + + + + + + + + + + @@ -72,7 +64,7 @@ >{{ t("webSearch.search") }}
{{ state.data.company_count }}
@@ -122,32 +110,19 @@
-
-
@@ -354,7 +252,7 @@ onMounted(() => { .val { font-size: 36px; - font-family: DIN; + font-family: DIN, sans-serif; font-weight: 400; color: #333333; margin-bottom: 10px; @@ -362,19 +260,20 @@ onMounted(() => { .des { font-size: 16px; - font-family: Source Han Sans CN; + font-family: Source Han Sans CN, sans-serif; font-weight: 400; color: #333333; } } .tab { - width: 630px; + //width: 630px; height: 42px; overflow: hidden; & > div { - width: 90px; + //width: 90px; + padding: 0 12px; height: 42px; line-height: 42px; text-align: center; diff --git a/src/views/website/searchList/achievementDetail.vue b/src/views/website/searchList/achievementDetail.vue index 2a88edd..760cf88 100644 --- a/src/views/website/searchList/achievementDetail.vue +++ b/src/views/website/searchList/achievementDetail.vue @@ -57,7 +57,7 @@
-
合作模式
+
{{ t("webSearch.cooperationMode") }}
diff --git a/src/views/website/searchList/components/industrySelect.vue b/src/views/website/searchList/components/industrySelect.vue index 192e1bf..f1fc363 100644 --- a/src/views/website/searchList/components/industrySelect.vue +++ b/src/views/website/searchList/components/industrySelect.vue @@ -10,7 +10,7 @@ { proxy: { // https://cn.vitejs.dev/config/#server-proxy "/dev-api": { - target: "http://101.34.131.16:1618", // target: "http://101.34.131.16:1618", - // target: "http://192.168.0.201:1618", + // target: "http://101.34.131.16:1618", + target: "http://192.168.0.201:1618", // target: 'http://172.18.3.127:1618', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, ""),