diff --git a/cas_web_03.zip b/cas_web_03.zip new file mode 100644 index 0000000..46c88ca Binary files /dev/null and b/cas_web_03.zip differ diff --git a/src/api/admin/enterprise/demand.js b/src/api/admin/enterprise/demand.js index 1b14bd7..1afd28d 100644 --- a/src/api/admin/enterprise/demand.js +++ b/src/api/admin/enterprise/demand.js @@ -8,6 +8,7 @@ export const demandList = (params) => { params, }); }; + // 新增企业服务需求 export const insertDemand = (data) => { return request({ @@ -35,6 +36,24 @@ export const insertTechnologyDemand = (data) => { }); }; +// 企业服务需求详情 +export const getDemand = (params) => { + return request({ + url: `/app/getDemand`, + method: "GET", + params, + }); +}; + +// 企业服务需求详情 +export const updateDemand = (data) => { + return request({ + url: `/app/updateDemand`, + method: "POST", + data, + }); +}; + // 企业技术需求详情 export const getTechnologyDemand = (params) => { return request({ @@ -43,6 +62,7 @@ export const getTechnologyDemand = (params) => { params, }); }; + // 修改企业技术需求详情 export const updateTechnologyDemand = (data) => { return request({ @@ -51,6 +71,7 @@ export const updateTechnologyDemand = (data) => { data, }); }; + // 删除企业技术需求 export const deleteTechnologyDemand = (ids) => { return request({ diff --git a/src/api/login.js b/src/api/login.js index 6e6cd1c..7e399c0 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -49,7 +49,7 @@ export function logout() { // 获取验证码 export function getCodeImg() { return request({ - url: "/captchaImage", + url: "/app/captchaImage", headers: { isToken: false, }, diff --git a/src/api/website/home/index.js b/src/api/website/home/index.js index e44f690..7c740c2 100644 --- a/src/api/website/home/index.js +++ b/src/api/website/home/index.js @@ -77,13 +77,35 @@ export function searchPatentDetail(id) { method: "get", }); } -// 客户端专利搜索结果详情 +// 客户端企业搜索结果详情 export function searchEnterpriseDetail(id) { return request({ url: `/search/enterprise/${id}`, method: "get", }); } +// 客户端专家搜索结果详情 +export function searchExpertDetail(id) { + return request({ + url: `/search/expert/${id}`, + method: "get", + }); +} +// 客户端服务需求搜索结果详情 +export function searchServiceDemandDetail(id) { + return request({ + url: `/search/casDemand/${id}`, + method: "get", + }); +} + +// 客户端服务需求搜索结果详情 +export function searchTechnologyDemandDetail(id) { + return request({ + url: `/search/technologyDemand/${id}`, + method: "get", + }); +} // 获取[省]专家分布 export function countExpertByProvince() { diff --git a/src/assets/index_banner.png b/src/assets/index_banner.png new file mode 100644 index 0000000..61854ac Binary files /dev/null and b/src/assets/index_banner.png differ diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 83f9808..0048b64 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -164,7 +164,8 @@ function handleUploadError(err) { // 上传成功回调 function handleUploadSuccess(res, file) { - uploadList.value.push({ name: res.fileName, url: res.fileName }); + // uploadList.value.push({ name: res.fileName, url: res.fileName }); + uploadList.value.push({ name: res.fileName, url: res.url }); if (uploadList.value.length === number.value) { fileList.value = fileList.value .filter((f) => f.url !== undefined) diff --git a/src/components/webFooter/index.vue b/src/components/webFooter/index.vue index e3d6ce5..604b614 100644 --- a/src/components/webFooter/index.vue +++ b/src/components/webFooter/index.vue @@ -11,10 +11,10 @@
联系我们

- 客服电话:{{ state.mobile }} + 客服电话:{{ state.mobile }}

- 邮箱:{{ state.email }} + 邮箱:{{ state.email }}

地址:{{ state.address }} diff --git a/src/permission.js b/src/permission.js index bf85221..9e42ae6 100644 --- a/src/permission.js +++ b/src/permission.js @@ -24,16 +24,12 @@ const whiteList = [ "/innovate", "/activity", "/about", - "/searchList/enterprise", - "/searchList/patent", - "/searchList/expert", - // "/solution/detail/", ]; const whiteListReg = [ /\/solution\/detail\/[0-9]+/, /\/innovate\/detail\/[0-9]+/, - /\/searchList\/patent\/detail\/[0-9]+/, - /\/searchList\/enterprise\/detail\/[0-9]+/, + /\/searchList\/[\S]+/, + /\/searchList\/[\S]+\/detail\/[0-9]+/, ]; router.beforeEach((to, from, next) => { NProgress.start(); diff --git a/src/router/index.js b/src/router/index.js index b0efc05..dee35b2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,6 +52,14 @@ export const constantRoutes = [ component: () => import("../views/website/searchList/enterpriseDetail.vue"), }, + { + path: "searchList/achievement", + component: () => import("../views/website/searchList/achievement.vue"), + }, + { + path: "searchList/achievement/detail/:id", + component: () => import("../views/website/searchList/achievementDetail.vue"), + }, { path: "searchList/patent", component: () => import("../views/website/searchList/patent.vue"), @@ -64,6 +72,26 @@ export const constantRoutes = [ path: "searchList/expert", component: () => import("../views/website/searchList/expert.vue"), }, + { + path: "searchList/expert/detail/:id", + component: () => import("../views/website/searchList/expertDetail.vue"), + }, + { + path: "searchList/serviceDemand", + component: () => import("../views/website/searchList/serviceDemand.vue"), + }, + { + path: "searchList/serviceDemand/detail/:id", + component: () => import("../views/website/searchList/serviceDemandDetail.vue"), + }, + { + path: "searchList/technologyDemand", + component: () => import("../views/website/searchList/technologyDemand.vue"), + }, + { + path: "searchList/technologyDemand/detail/:id", + component: () => import("../views/website/searchList/technologyDemandDetail.vue"), + }, { path: "solution/:name", name: "solution", diff --git a/src/views/admin/components/collectAndVisit.vue b/src/views/admin/components/collectAndVisit.vue new file mode 100644 index 0000000..6ea4f7e --- /dev/null +++ b/src/views/admin/components/collectAndVisit.vue @@ -0,0 +1,109 @@ + + + + + + + diff --git a/src/views/admin/components/enterpriseItem.vue b/src/views/admin/components/enterpriseItem.vue new file mode 100644 index 0000000..d30c528 --- /dev/null +++ b/src/views/admin/components/enterpriseItem.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/views/admin/components/wordcloud.vue b/src/views/admin/components/wordcloud.vue new file mode 100644 index 0000000..2160fa7 --- /dev/null +++ b/src/views/admin/components/wordcloud.vue @@ -0,0 +1,209 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/admin/enterprise/demand/releaseService.vue b/src/views/admin/enterprise/demand/releaseService.vue index 6d4a9e0..eace8f6 100644 --- a/src/views/admin/enterprise/demand/releaseService.vue +++ b/src/views/admin/enterprise/demand/releaseService.vue @@ -109,13 +109,19 @@ diff --git a/src/views/admin/enterprise/demand/technology.vue b/src/views/admin/enterprise/demand/technology.vue index 091b676..1103143 100644 --- a/src/views/admin/enterprise/demand/technology.vue +++ b/src/views/admin/enterprise/demand/technology.vue @@ -16,7 +16,7 @@ 已发布 待审核 已驳回 - 草稿箱 + diff --git a/src/views/admin/enterprise/extension/product.vue b/src/views/admin/enterprise/extension/product.vue index 1564190..07fac87 100644 --- a/src/views/admin/enterprise/extension/product.vue +++ b/src/views/admin/enterprise/extension/product.vue @@ -59,11 +59,12 @@ size="small" type="text" icon="View" - @click="handleResults(row.id)" + @click="handleResults(row)" >查看匹配结果 取消发布移到草稿箱 @@ -173,8 +174,8 @@ const handleShelf = (row) => { }) .catch(() => {}); }; -const handleResults = (id) => { - router.push({ path: "./results" }); +const handleResults = (row) => { + router.push({ path: "./results", query: { keyword: row.title } }); }; const checkEnterpriseInfo = (id) => { router.push({ path: "./business" }); diff --git a/src/views/admin/enterprise/extension/results.vue b/src/views/admin/enterprise/extension/results.vue index 9466ff5..5b038c9 100644 --- a/src/views/admin/enterprise/extension/results.vue +++ b/src/views/admin/enterprise/extension/results.vue @@ -1 +1,178 @@ - + + + + diff --git a/src/views/admin/index.vue b/src/views/admin/index.vue index fc2511b..d6a48df 100644 --- a/src/views/admin/index.vue +++ b/src/views/admin/index.vue @@ -2,7 +2,7 @@

- 会员banner图 + 会员banner图
续期
升级VIP
@@ -16,13 +16,13 @@

开通VIP

- + - - + - + + @@ -91,8 +96,8 @@ \ No newline at end of file + diff --git a/src/views/website/searchList/index1Detail.vue b/src/views/website/searchList/achievementDetail.vue similarity index 86% rename from src/views/website/searchList/index1Detail.vue rename to src/views/website/searchList/achievementDetail.vue index 6ac4fb0..3c6e138 100644 --- a/src/views/website/searchList/index1Detail.vue +++ b/src/views/website/searchList/achievementDetail.vue @@ -18,11 +18,11 @@
- + - +
预约对接
@@ -49,7 +49,7 @@ diff --git a/src/views/website/searchList/components/achievementItem.vue b/src/views/website/searchList/components/achievementItem.vue new file mode 100644 index 0000000..c7dbfa9 --- /dev/null +++ b/src/views/website/searchList/components/achievementItem.vue @@ -0,0 +1,171 @@ + + + + + diff --git a/src/views/website/searchList/components/expertItem.vue b/src/views/website/searchList/components/expertItem.vue index 999f1a7..6c5e61a 100644 --- a/src/views/website/searchList/components/expertItem.vue +++ b/src/views/website/searchList/components/expertItem.vue @@ -22,12 +22,10 @@ -
+
所属领域: - + + {{ data.industrys[data.industrys.length - 1] }}{{ data.industryStr }}
- 所在机构: - {{ data.research_name }} + 研究方向: + {{ data.research }}
@@ -66,10 +64,11 @@
- + + diff --git a/src/views/website/searchList/components/technologyDemandItem.vue b/src/views/website/searchList/components/technologyDemandItem.vue new file mode 100644 index 0000000..996a8bb --- /dev/null +++ b/src/views/website/searchList/components/technologyDemandItem.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/website/searchList/expert.vue b/src/views/website/searchList/expert.vue index 80ab0ac..8f7f7fa 100644 --- a/src/views/website/searchList/expert.vue +++ b/src/views/website/searchList/expert.vue @@ -44,19 +44,19 @@ + + diff --git a/src/views/website/searchList/serviceDemandDetail.vue b/src/views/website/searchList/serviceDemandDetail.vue new file mode 100644 index 0000000..05be3c1 --- /dev/null +++ b/src/views/website/searchList/serviceDemandDetail.vue @@ -0,0 +1,384 @@ + + + + + diff --git a/src/views/website/searchList/technologyDemand.vue b/src/views/website/searchList/technologyDemand.vue new file mode 100644 index 0000000..7f9832f --- /dev/null +++ b/src/views/website/searchList/technologyDemand.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/website/searchList/technologyDemandDetail.vue b/src/views/website/searchList/technologyDemandDetail.vue new file mode 100644 index 0000000..e2cbaec --- /dev/null +++ b/src/views/website/searchList/technologyDemandDetail.vue @@ -0,0 +1,319 @@ + + + + + diff --git a/vite.config.js b/vite.config.js index dfbcb63..b73b5a5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -32,7 +32,8 @@ export default defineConfig(({ mode, command }) => { // https://cn.vitejs.dev/config/#server-proxy "/dev-api": { // target: 'http://120.26.107.74:1618', - target: "http://101.34.131.16:1618", + // target: "http://101.34.131.16:1618", + target: "http://192.168.110.10:1618", // target: 'http://172.18.3.127:1618', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, ""),