From 8267986ef3fd77d0af4b993ca4cbb201b591b9a8 Mon Sep 17 00:00:00 2001 From: lucky Date: Wed, 10 Mar 2021 15:13:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B7=9F=E5=B8=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CVideo/VideoDate.vue | 2 +- src/components/Community/CommentDate.vue | 13 ++--- src/components/Community/CommentSearch.vue | 1 - src/components/Community/CommunityDate.vue | 8 +-- src/components/Course/CourseDate.vue | 30 +++++------ .../Development/DevelopmentDate.vue | 26 ++++----- src/components/Institute/InstituteDate.vue | 31 +++++------ src/components/Mentor/MentorDate.vue | 30 +++++------ src/components/SpinOff/SpinOffDate.vue | 54 +++++++++++-------- src/components/Transfer/TransferDate.vue | 54 +++++++++---------- .../innovativeServiceDate.vue | 48 ++++------------- .../innovativeServiceSearch.vue | 48 +++++++---------- src/config/api.js | 3 ++ src/plugins/ant-design-vue.js | 2 + 14 files changed, 163 insertions(+), 187 deletions(-) diff --git a/src/components/CVideo/VideoDate.vue b/src/components/CVideo/VideoDate.vue index 01c24a5..84c3fa0 100644 --- a/src/components/CVideo/VideoDate.vue +++ b/src/components/CVideo/VideoDate.vue @@ -190,7 +190,7 @@ export default { diff --git a/src/components/Partner/PartnerDate.vue b/src/components/Partner/PartnerDate.vue new file mode 100644 index 0000000..f646afd --- /dev/null +++ b/src/components/Partner/PartnerDate.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/src/components/Partner/PartnerEdit.vue b/src/components/Partner/PartnerEdit.vue new file mode 100644 index 0000000..166daf3 --- /dev/null +++ b/src/components/Partner/PartnerEdit.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/src/components/Partner/PartnerSearch.vue b/src/components/Partner/PartnerSearch.vue new file mode 100644 index 0000000..95248b1 --- /dev/null +++ b/src/components/Partner/PartnerSearch.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/config/api.js b/src/config/api.js index f2b5df7..7c2167f 100644 --- a/src/config/api.js +++ b/src/config/api.js @@ -11,9 +11,6 @@ const policy = `${proxyUrl}/policy`; // 创新政策接口 const researchTeam = `${greenvalley}/researchTeam`; // 创新平台相关操作 const page = `${greenvalley}/page`; // 页面管理相关操作 const carousel = `${greenvalley}/carousel`; // 轮播图相关接口 - -// 上传附件 -export const upload = `${greenvalley}/file/upload`; const industryInfo = `${greenvalley}/industryInfo`; // 行业资讯相关操作 const activity = `${greenvalley}/activity`; // 活动公告相关操作 const creatingPlatform = `${greenvalley}/creatingPlatform`; // 合作意向相关操作 @@ -21,6 +18,8 @@ const serviceProject = `${greenvalley}/serviceProject`; // 创新部服务相关 const institute = `${greenvalley}/institute`; // 实验室(研究院)相关操作 const achInstr = `${greenvalley}/achInstr`; // 创新部类型相关操作 const comment = `${greenvalley}/comment`; // 交流社区相关操作 +const business = `${greenvalley}/business`; // 交流社区相关操作 +export const upload = `${greenvalley}/file/upload`; // websocket基础地址 export const WS_BASE_URL = msgUrl; @@ -97,6 +96,18 @@ export const selCommunityH = params => axios.post(`${comment}/selCommunityH`, pa // 修改跟贴表中得数据 export const upComment = params => axios.post(`${comment}/upComment`, params); +// 后台查询合作伙伴和衍生企业 +export const backendSearch = params => axios.post(`${business}/backendSearch`, params); + +// 后台增加合作伙伴和衍生企业 +export const backendAdd = params => axios.post(`${business}/backendAdd`, params); + +// 后台删除合作伙伴和衍生企业 +export const backendDelete = params => axios.post(`${business}/backendDelete`, params); + +// 后台修改合作伙伴或者衍生企业 +export const backendUpdate = params => axios.post(`${business}/backendUpdate`, params); + // 合作意向列表查询 export const getCreatingPlatformSearch = params => axios.post(`${creatingPlatform}/search`, params); diff --git a/src/router/index.js b/src/router/index.js index 2bd8cfb..51526a3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -79,9 +79,10 @@ const routes = [ }, // 衍生企业 { - path: '/derivative-enterprise', - name: 'DerivativeEnterprise', - component: () => import(/* webpackChunkName: "derivative-enterprise" */ 'views/DerivativeEnterprise/DerivativeEnterprise.vue'), + path: '/about-us-derivative-enterprise', + name: 'AboutUsDerivativeEnterprise', + component: () => + import(/* webpackChunkName: "about-us-derivative-enterprise" */ 'views/CooperativePartner/AboutUsDerivativeEnterprise.vue'), }, // -------创新部 // 合作意向 @@ -151,6 +152,12 @@ const routes = [ name: 'HatchingDemandFilling', component: () => import(/* webpackChunkName: "hatching-demand-filling" */ 'views/HatchingDemandFilling/HatchingDemandFilling.vue'), }, + // 合作伙伴 + { + path: '/hatch-cooperative-partner', + name: 'HatchCooperativePartner', + component: () => import(/* webpackChunkName: "hatch-cooperative-partner" */ 'views/CooperativePartner/HatchCooperativePartner.vue'), + }, // -------产业部 // 服务 { @@ -160,9 +167,10 @@ const routes = [ }, // 衍生企业 { - path: '/derivative-enterprise', - name: 'DerivativeEnterprise', - component: () => import(/* webpackChunkName: "derivative-enterprise" */ 'views/DerivativeEnterprise/DerivativeEnterprise.vue'), + path: '/industry-derivative-enterprise', + name: 'IndustryDerivativeEnterprise', + component: () => + import(/* webpackChunkName: "industry-derivative-enterprise" */ 'views/CooperativePartner/IndustryDerivativeEnterprise.vue'), }, // 需求填报 { diff --git a/src/store/mutations.js b/src/store/mutations.js index 9ffb2e8..f38aa29 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -21,30 +21,12 @@ const mutations = { }, /** - * 设置研发团队列表信息 + * 设置合作伙伴和衍生企业查询条件 * @param {object} state - * @param {object} RDTeamLists {id, account, phone} + * @param {object} partnerOptions */ - setRDTeamLists(state, RDTeamLists) { - state.RDTeamLists = RDTeamLists; - }, - - /** - * 设置页面管理列表信息 - * @param {object} state - * @param {object} pageLists - */ - setPageLists(state, pageLists) { - state.pageLists = pageLists; - }, - - /** - * 添加页面管理列表信息 - * @param {object} state - * @param {object} item - */ - setAddPageLists(state, item) { - state.pageLists.push(item); + setPartnerOptions(state, partnerOptions) { + state.partnerOptions = partnerOptions; }, }; diff --git a/src/store/state.js b/src/store/state.js index 4609529..80a1248 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -1,9 +1,7 @@ const state = { anyringToken: '', user: { id: '', phone: '', account: '' }, - - RDTeamLists: [], // 研发团队列表 - pageLists: [], // 页面管理列表 + partnerOptions: null, // 合作伙伴和衍生企业查询条件 titles: [ { value: '关于我们', diff --git a/src/views/CooperativePartner/AboutUsDerivativeEnterprise.vue b/src/views/CooperativePartner/AboutUsDerivativeEnterprise.vue new file mode 100644 index 0000000..a3a6ea9 --- /dev/null +++ b/src/views/CooperativePartner/AboutUsDerivativeEnterprise.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/views/CooperativePartner/CooperativePartner.vue b/src/views/CooperativePartner/CooperativePartner.vue index 2e70428..ae46f80 100644 --- a/src/views/CooperativePartner/CooperativePartner.vue +++ b/src/views/CooperativePartner/CooperativePartner.vue @@ -1,20 +1,21 @@ diff --git a/src/views/CooperativePartner/IndustryDerivativeEnterprise.vue b/src/views/CooperativePartner/IndustryDerivativeEnterprise.vue new file mode 100644 index 0000000..1712a52 --- /dev/null +++ b/src/views/CooperativePartner/IndustryDerivativeEnterprise.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/views/DerivativeEnterprise/DerivativeEnterprise.vue b/src/views/DerivativeEnterprise/DerivativeEnterprise.vue deleted file mode 100644 index 2a9aba7..0000000 --- a/src/views/DerivativeEnterprise/DerivativeEnterprise.vue +++ /dev/null @@ -1,20 +0,0 @@ - - -