diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 0000000..3186f3f --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/cas_web.7z b/cas_web.7z deleted file mode 100644 index 051bd04..0000000 Binary files a/cas_web.7z and /dev/null differ diff --git a/cas_web_1107.7z b/cas_web_1107.7z new file mode 100644 index 0000000..73a60ab Binary files /dev/null and b/cas_web_1107.7z differ diff --git a/src/api/admin/count.js b/src/api/admin/count.js new file mode 100644 index 0000000..bfb6a3f --- /dev/null +++ b/src/api/admin/count.js @@ -0,0 +1,11 @@ +import request from "@/utils/request"; + +export const updateCount = (name) => + request({ + url: "/app/map/handleReadCount", + method: "GET", + params: { + name, + type: "2", + }, + }); diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 0048b64..ac4ba7f 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -39,11 +39,8 @@ class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList" > - + + {{ getFileName(file.name) }}
diff --git a/src/router/index.js b/src/router/index.js index 14768ed..c588566 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -73,6 +73,14 @@ export const constantRoutes = [ searchType: 2, }, }, + { + path: "searchList/product/detail/:id", + component: () => + import("../views/website/searchList/productDetail.vue"), + meta: { + searchType: 2, + }, + }, { path: "searchList/lab", component: () => import("../views/website/searchList/lab.vue"), @@ -373,7 +381,7 @@ export const enterpriseRoutes = [ component: () => import("@/views/admin/enterprise/extension/results"), hidden: true, name: "Results", - meta: { title: "匹配结果", icon: "list" }, + meta: { title: "匹配结果", icon: "list", isMatch: true }, }, { path: "business", @@ -425,7 +433,7 @@ export const enterpriseRoutes = [ component: () => import("@/views/admin/enterprise/extension/results"), hidden: true, name: "results", - meta: { title: "匹配结果", icon: "list" }, + meta: { title: "匹配结果", icon: "list", isMatch: true }, }, ], }, @@ -534,7 +542,7 @@ export const expertRoutes = [ component: () => import("@/views/admin/enterprise/extension/results"), hidden: true, name: "Results", - meta: { title: "匹配结果", icon: "list" }, + meta: { title: "匹配结果", icon: "list", isMatch: false }, }, { path: "patent", diff --git a/src/views/admin/enterprise/demand/releaseService.vue b/src/views/admin/enterprise/demand/releaseService.vue index 0685c0b..7fca61b 100644 --- a/src/views/admin/enterprise/demand/releaseService.vue +++ b/src/views/admin/enterprise/demand/releaseService.vue @@ -123,13 +123,14 @@ import { onActivated } from "vue"; import { demandCategoryList } from "@/utils/parameter"; // import { onActivated } from "vue"; import { useRoute, useRouter } from "vue-router"; +import { updateCount } from "../../../../api/admin/count"; const router = useRouter(); const route = useRoute(); const data = reactive({ form: { check: [], - status: 0, + status: 1, }, queryParams: { pageNum: 1, @@ -171,7 +172,9 @@ const submitForm = () => { await insertDemand(form.value); ElMessage.success("新增服务需求成功"); // router.back(); + updateCount("service"); } + backToList(); } }); diff --git a/src/views/admin/enterprise/demand/releaseTechnology.vue b/src/views/admin/enterprise/demand/releaseTechnology.vue index 24157d5..e74b5ca 100644 --- a/src/views/admin/enterprise/demand/releaseTechnology.vue +++ b/src/views/admin/enterprise/demand/releaseTechnology.vue @@ -190,6 +190,7 @@ import { insertTechnologyDemand, } from "@/api/admin/enterprise/demand"; import { onMounted } from "vue"; +import { updateCount } from "../../../../api/admin/count"; const router = useRouter(); const route = useRoute(); const data = reactive({ @@ -283,6 +284,7 @@ const submitForm = async (status) => { await insertTechnologyDemand(form.value); ElMessage.success("新增企业需求成功"); } + updateCount("technology"); backToList(); } else { console.log("校验未通过"); diff --git a/src/views/admin/enterprise/extension/release.vue b/src/views/admin/enterprise/extension/release.vue index 7e9a156..8020449 100644 --- a/src/views/admin/enterprise/extension/release.vue +++ b/src/views/admin/enterprise/extension/release.vue @@ -25,6 +25,7 @@ import { updateEnterpriseProduct, } from "@/api/admin/enterprise/product"; import { reactive, toRefs } from "vue"; +import { updateCount } from "@/api/admin/count"; const route = useRoute(); // const router = useRouter(); const labelWidth = 140; @@ -47,6 +48,9 @@ const submitForm = async (is_submit) => { await insertEnterpriseProduct(form.value); ElMessage.success("新增产品成功"); } + if (is_submit == "1") { + updateCount("product"); + } // router.go(-1); tab.closeOpenPage({ path: "/extension/product" }); } else { diff --git a/src/views/admin/enterprise/extension/results.vue b/src/views/admin/enterprise/extension/results.vue index 176d7c3..bb58ab2 100644 --- a/src/views/admin/enterprise/extension/results.vue +++ b/src/views/admin/enterprise/extension/results.vue @@ -111,33 +111,33 @@ import TechnologyDemandItem from "@/views/website/searchList/components/technolo import AchievementItem from "@/views/website/searchList/components/achievementItem.vue"; import { useRoute, useRouter } from "vue-router"; -import useUserStore from "@/store/modules/user"; +// import useUserStore from "@/store/modules/user"; import LaboratoryItem from "@/views/website/searchList/components/laboratoryItem.vue"; const route = useRoute(); -const router = useRouter(); +// const router = useRouter(); const dataList = ref([]); const loading = ref(true); const total = ref(0); -const userStore = useUserStore(); -const queryType = computed(() => { - console.log(queryParams.value.searchType); - if (queryParams.value.searchType == 1) { - return 2; - } else if (queryParams.value.searchType == 2) { - return 1; - } else if (queryParams.value.searchType == 4) { - return 2; - } else if (queryParams.value.searchType == 5) { - return 2; - } else if (queryParams.value.searchType == 6) { - return 1; - } else if (queryParams.value.searchType == 7) { - return 1; - } else if (queryParams.value.searchType == 8) { - return 2; - } -}); +// const userStore = useUserStore(); +// const queryType = computed(() => { +// console.log(queryParams.value.searchType); +// if (queryParams.value.searchType == 1) { +// return 2; +// } else if (queryParams.value.searchType == 2) { +// return 2; +// } else if (queryParams.value.searchType == 4) { +// return 2; +// } else if (queryParams.value.searchType == 5) { +// return 2; +// } else if (queryParams.value.searchType == 6) { +// return 2; +// } else if (queryParams.value.searchType == 7) { +// return 2; +// } else if (queryParams.value.searchType == 8) { +// return 2; +// } +// }); const data = reactive({ queryParams: { @@ -145,26 +145,26 @@ const data = reactive({ pageSize: 10, query: route.query.keyword, searchType: "1", - queryType: queryType, - isMatch: true, + queryType: "2", + isMatch: route.meta.isMatch, }, }); const { queryParams } = toRefs(data); -watch( - queryType, - (val) => { - router.replace({ - path: route.path, - query: { - keyword: route.query.keyword, - queryType: val, - }, - }); - }, - { immediate: true } -); +// watch( +// queryType, +// (val) => { +// router.replace({ +// path: route.path, +// query: { +// keyword: route.query.keyword, +// queryType: val, +// }, +// }); +// }, +// { immediate: true } +// ); /** 查询列表 */ async function getList() { const resp = await search(queryParams.value); diff --git a/src/views/admin/expert/demand/release.vue b/src/views/admin/expert/demand/release.vue index f4fbfea..5aa01c9 100644 --- a/src/views/admin/expert/demand/release.vue +++ b/src/views/admin/expert/demand/release.vue @@ -123,11 +123,12 @@ import tab from "@/plugins/tab"; // import CityOptions from "@/views/components/CityOptions"; import { ElMessage } from "element-plus"; import { useRoute, useRouter } from "vue-router"; +import { updateCount } from "@/api/admin/count.js"; const data = reactive({ formData: { check: [], - status: 0, + status: 1, }, queryParams: { pageNum: 1, @@ -190,6 +191,8 @@ async function submitForm() { await insertDemand(formData.value); ElMessage.success("新增成功"); } + updateCount("service"); + tab.closeOpenPage({ path: "/demand/serviceDemand" }); } function addCheck() { diff --git a/src/views/admin/expert/demand/think.vue b/src/views/admin/expert/demand/think.vue index f784b28..48178b0 100644 --- a/src/views/admin/expert/demand/think.vue +++ b/src/views/admin/expert/demand/think.vue @@ -148,7 +148,7 @@ diff --git a/src/views/website/searchList/components/achievementItem.vue b/src/views/website/searchList/components/achievementItem.vue index 9f77064..378d69a 100644 --- a/src/views/website/searchList/components/achievementItem.vue +++ b/src/views/website/searchList/components/achievementItem.vue @@ -4,16 +4,22 @@
-
成果
+
产品
+
成果
-
{{ data.title }}
+
+ {{ + data.type == 2 ? "成果名称：" : data.type == 1 ? "产品名称：" : "" + }} + {{ data.title }} +
所属领域： {{ data.industryStr }}
-
+
联系人 中科云平台 @@ -58,6 +64,7 @@ import wordcloud from "./wordcloud.vue"; // import collectAndVisit from "./collectAndVisit.vue"; import { maturityOptions } from "@/utils/parameter.js"; import { useRoute, useRouter } from "vue-router"; +import { toRefs } from "vue"; const route = useRoute(); const router = useRouter(); @@ -67,10 +74,19 @@ const props = defineProps({ required: true, }, }); - +const { data } = toRefs(props); function handleDetail(id) { + console.log(data.value); + let path; + if (data.value.type == 1) { + path = `/searchList/product/detail/${id}`; + } else if (data.value.type == 2) { + path = `/searchList/achievement/detail/${id}`; + } else { + return; + } let routeData = router.resolve({ - path: `/searchList/achievement/detail/${id}`, + path, query: { keyword: route.query.keyword, queryType: route.query.queryType, diff --git a/src/views/website/searchList/productDetail.vue b/src/views/website/searchList/productDetail.vue new file mode 100644 index 0000000..543b5a6 --- /dev/null +++ b/src/views/website/searchList/productDetail.vue @@ -0,0 +1,367 @@ + + + + +