From 95552752e92b512114041428cb277e9bb69a2f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Wed, 9 Mar 2022 11:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=90=88=E4=BD=9C=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- src/api/admin/expert/demand.js | 54 +++- src/api/admin/expert/technology.js | 16 ++ src/views/admin/expert/demand/already.vue | 249 ++++++++++++------ .../admin/expert/demand/serviceDemand.vue | 32 +-- src/views/admin/expert/index.vue | 32 ++- vite.config.js | 1 + 7 files changed, 264 insertions(+), 122 deletions(-) diff --git a/.env.production b/.env.production index 89c2888..ac416a1 100644 --- a/.env.production +++ b/.env.production @@ -5,7 +5,7 @@ VITE_APP_TITLE = pro管理系统 VITE_APP_ENV = 'production' # xxx管理系统/生产环境 -VITE_APP_BASE_API = '/api' +VITE_APP_BASE_API = '/web/api' # 是否在打包时开启压缩,支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip,brotli \ No newline at end of file diff --git a/src/api/admin/expert/demand.js b/src/api/admin/expert/demand.js index 89b2815..14ffda7 100644 --- a/src/api/admin/expert/demand.js +++ b/src/api/admin/expert/demand.js @@ -1,54 +1,82 @@ import request from '@/utils/request'; -// 专家 - 需求 +// 专家 - 服务需求 export function demand(data) { return request({ - url: '/enterprise/v1/technology/demand', + url: '/enterprise/v1/service/demand', method:'post', data }); } -// 专家 - 需求 -- 添加 +// 专家 - 服务需求 -- 添加 export function demandAdd(data) { return request({ - url: '/enterprise/v1/technology/demand/add', + url: '/enterprise/v1/service/demand/add', method:'post', data }); } -// 专家 - 需求 -- 修改 +// 专家 - 服务需求 -- 修改 export function demandEdit(data) { return request({ - url: '/enterprise/v1/technology/demand/edit', + url: '/enterprise/v1/service/demand/edit', method:'post', data }); } -// 专家 - 需求 -- 详情 +// 专家 - 服务需求 -- 详情 export function demandDetail(data) { return request({ - url: '/enterprise/v1/technology/demand/detail', + url: '/enterprise/v1/service/demand/detail', method:'post', data }); } -// 专家 - 需求 -- 删除 +// 专家 - 服务需求 -- 删除 export function demandDelete(data) { return request({ - url: '/enterprise/v1/technology/demand/delete', + url: '/enterprise/v1/service/demand/delete', method:'post', data }); } // ------------------------------------------------------ -// 专家 - 合作 -export function expertCooperate(data) { +// 专家 - 已合作/想合作 (1/2) +export function enterprise(data) { return request({ - url: '', + url: '/enterprise/v1/manage/enterprise', method:'post', data }); } +// 专家 - 已合作/想合作 -- 新增 +export function enterpriseAdd(data) { + return request({ + url: '/enterprise/v1/manage/enterprise/add', + method:'post', + data + }); +} +// 专家 - 已合作/想合作 -- 修改 +export function enterpriseEdit(data) { + return request({ + url: '/enterprise/v1/manage/enterprise/edit', + method:'post', + data + }); +} +// 专家 - 已合作/想合作 -- 删除 +export function enterpriseDelete(data) { + return request({ + url: '/enterprise/v1/manage/enterprise/delete', + method:'post', + data + }); +} + + + + // 专家 - 合作详情 export function cooperateDetail(data) { return request({ diff --git a/src/api/admin/expert/technology.js b/src/api/admin/expert/technology.js index 16767ac..903f503 100644 --- a/src/api/admin/expert/technology.js +++ b/src/api/admin/expert/technology.js @@ -41,6 +41,14 @@ export function achievementDelete(data) { }); } // ----------------------------------------------------------- +// 专家 - 专利 -- 下拉 +export function patentSelect(data) { + return request({ + url: '/enterprise/v1/technology/patent/select', + method:'post', + data + }); +} // 专家 - 专利 export function expertPatent(data) { return request({ @@ -83,6 +91,14 @@ export function patentDelete(data) { }); } // ----------------------------------------------------------- +// 专家 - 论文 -- 下拉 +export function paperSelect(data) { + return request({ + url: '/enterprise/v1/technology/paper/select', + method:'post', + data + }); +} // 专家 - 论文 export function expertPaper(data) { return request({ diff --git a/src/views/admin/expert/demand/already.vue b/src/views/admin/expert/demand/already.vue index fa68ba9..db88427 100644 --- a/src/views/admin/expert/demand/already.vue +++ b/src/views/admin/expert/demand/already.vue @@ -15,21 +15,31 @@ - + - - - + + + + + + + - - - - + + + + - + - + + - + - + + @@ -114,9 +150,14 @@ + \ No newline at end of file diff --git a/src/views/admin/expert/demand/serviceDemand.vue b/src/views/admin/expert/demand/serviceDemand.vue index 79f73d9..73c22cf 100644 --- a/src/views/admin/expert/demand/serviceDemand.vue +++ b/src/views/admin/expert/demand/serviceDemand.vue @@ -17,9 +17,9 @@ size="mini" @change="handleQuery" > - 待受理 - 已受理 - 已结束 + 待受理 + 已受理 + 已结束 @@ -103,10 +103,9 @@ const dateRange = ref([]); const data = reactive({ form: {}, queryParams: { - pageNum: 1, - pageSize: 10, - postCode: undefined, - type: "1", + page_num: 1, + page_size: 10, + type: 1, }, rules: { name: [{ required: true, message: "公司名称不能为空", trigger: "blur" }], @@ -137,18 +136,13 @@ const { queryParams, form, rules } = toRefs(data); /** 查询列表 */ function getList() { - // console.log(proxy.addDateRange(queryParams.value, dateRange.value)); - postList.value = [1]; - total.value = 15; - loading.value = false; - // loading.value = true; - // demand(proxy.addDateRange(queryParams.value, dateRange.value)).then( - // (response) => { - // postList.value = response.rows; - // total.value = response.total; - // loading.value = false; - // } - // ); + loading.value = true; + demand(queryParams.value).then((response) => { + console.log(response); + // postList.value = response.data.data; + // total.value = response.data.count; + loading.value = false; + }); } /** 搜索按钮操作 */ function handleQuery() { diff --git a/src/views/admin/expert/index.vue b/src/views/admin/expert/index.vue index ab2f3da..9ee88dc 100644 --- a/src/views/admin/expert/index.vue +++ b/src/views/admin/expert/index.vue @@ -58,20 +58,24 @@
快捷功能
-
- -
发布成果
-
-
- -
发布需求
-
+ +
+ +
发布成果
+
+
+ +
+ +
发布需求
+
+
diff --git a/vite.config.js b/vite.config.js index 563dcc1..0534950 100644 --- a/vite.config.js +++ b/vite.config.js @@ -27,6 +27,7 @@ export default defineConfig(({ mode, command }) => { '/api': { // target: 'http://localhost:8080', target: 'http://192.168.0.149:8000', + // target: 'http://101.34.131.16:8000', // target: 'http://zky.server.ipeace.org.cn', changeOrigin: true, rewrite: (p) => p.replace(/^\/api/, '/api')