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 0000000..d151d89 Binary files /dev/null and b/src/assets/achievement_import_template.xlsx differ 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/, ""),