From f67bec93a145b1e7ef4ce71b7caca091f9ff6c65 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Jan 2021 19:09:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=B9=B3=E5=8F=B0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/platform.styl | 14 +- src/common/portrait.styl | 5 + src/components/PlatformList/Fruit.vue | 107 +++++++++++ src/components/PlatformList/PlatformList.vue | 126 +++++++++++++ src/config/api.js | 17 +- src/router/index.js | 6 + src/store/modules/home/mutations.js | 69 +++++++ src/store/modules/home/state.js | 20 +++ src/views/Activity/Activity.vue | 11 +- src/views/ItInformation/ItInformation.vue | 11 +- src/views/NewPlatform/Children/AchDet.vue | 138 ++++++++++++++ src/views/NewPlatform/Children/Develop.vue | 10 ++ src/views/NewPlatform/Children/Share.vue | 180 ++++++++++++++++++- src/views/NewPlatform/Children/Transfer.vue | 118 +++++++++++- src/views/Policy/components/PolicyList.vue | 21 +-- 15 files changed, 814 insertions(+), 39 deletions(-) create mode 100644 src/components/PlatformList/Fruit.vue create mode 100644 src/components/PlatformList/PlatformList.vue create mode 100644 src/views/NewPlatform/Children/AchDet.vue diff --git a/src/common/platform.styl b/src/common/platform.styl index 25ca5f6..5d7c37d 100644 --- a/src/common/platform.styl +++ b/src/common/platform.styl @@ -2,7 +2,7 @@ height: 66px; background: #000000; line-height: 66px; - padding: 0 12%; + padding: 0 9%; color: #fff; font-size: 16px; font-weight: bold; @@ -52,7 +52,7 @@ .center-box { overflow: hidden; background: #fff; - padding: 0 12%; + padding: 0 9%; position: relative; } .center-title { @@ -75,7 +75,7 @@ // height: 830px; overflow: hidden; position: relative; - padding: 0 12%; + padding: 0 9%; } .bottom-title { position: absolute; @@ -93,7 +93,7 @@ // height: 1060px; overflow: hidden; position: relative; - padding: 0 12%; + padding: 0 9%; background: #fff; } .partner-title { @@ -112,7 +112,7 @@ // height: 300px; overflow: hidden; position: relative; - padding: 0 12%; + padding: 0 9%; } .join-title { position: absolute; @@ -131,11 +131,11 @@ .content-box { position: relative; - padding: 0 12%; + padding: 0 9%; } .introduce-box { - width: 942px; + width: 60%; overflow: hidden; position: relative; background: #fff; diff --git a/src/common/portrait.styl b/src/common/portrait.styl index 767006e..35d9e38 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -234,6 +234,11 @@ flex: 1; } +.flex-3{ + display: flex; + flex: 3; +} + // other .inner { width: 82%; diff --git a/src/components/PlatformList/Fruit.vue b/src/components/PlatformList/Fruit.vue new file mode 100644 index 0000000..8801fa0 --- /dev/null +++ b/src/components/PlatformList/Fruit.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/components/PlatformList/PlatformList.vue b/src/components/PlatformList/PlatformList.vue new file mode 100644 index 0000000..652077f --- /dev/null +++ b/src/components/PlatformList/PlatformList.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/config/api.js b/src/config/api.js index 2afbf25..1dc7730 100644 --- a/src/config/api.js +++ b/src/config/api.js @@ -10,8 +10,9 @@ const greenvalley = `${proxyUrl}/greenvalley`; // const page = `${greenvalley}/page`; // 创新平台相关操作 const policy = `${proxyUrl}/policy/policy`; // 创新政策相关接口 const activity = `${greenvalley}/activity`; // 创新政策相关接口 -const Business = `${greenvalley}//Business`; // 衍生企业和合作伙伴查询 -const carousel = `${greenvalley}//carousel`; // 轮播图相关接口 +const Business = `${greenvalley}/Business`; // 衍生企业和合作伙伴查询 +const carousel = `${greenvalley}/carousel`; // 轮播图相关接口 +const achInstr = `${greenvalley}/achInstr`; // 轮播图相关接口 // websocket基础地址 export const WS_BASE_URL = msgUrl; @@ -27,7 +28,7 @@ export const upload = `${greenvalley}/file/upload`; // 加入我们 export const joinUs = params => axios.post(`${greenvalley}/PersonApply/joinUs`, params); // 查询轮播图 -export const queryRotation = params => axios.post(`${greenvalley}/carousel/query`, params); +export const queryRotation = params => axios.post(`${carousel}/query`, params); // 查询行业政策列表 export const industryInfo = params => axios.post(`${greenvalley}/industryInfo/beforeSearch`, params); // 查询活动公告列表 @@ -38,3 +39,13 @@ export const apply = params => axios.post(`${activity}/apply`, params); export const FrontSearchFriend = params => axios.post(`${Business}/FrontSearchFriend`, params); // 查询合作伙伴 export const FrontSearchCompany = params => axios.post(`${Business}/FrontSearchCompany`, params); +// 分类查询 +export const selModel = params => axios.post(`${achInstr}/selModel`, params); +// 仪器列表查询 +export const selInstrument = params => axios.post(`${achInstr}/selInstrument`, params); +// 研究院(实验室)列表查询 +export const searchFront = params => axios.post(`${greenvalley}/institute/searchFront`, params); +// 成果列表查询 +export const selRes = params => axios.post(`${achInstr}/selRes`, params); +// 成果详情查询 +export const selResMes = params => axios.post(`${achInstr}/selResMes`, params); diff --git a/src/router/index.js b/src/router/index.js index 2a50a83..070e278 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -122,6 +122,12 @@ const routes = [ name: 'Develop', component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Develop.vue'), }, + { + // 成果详情页 + path: '/NewPlatform/AchDet', + name: 'AchDet', + component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/AchDet.vue'), + }, ], }, , diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js index 4c50e9e..94d9d74 100644 --- a/src/store/modules/home/mutations.js +++ b/src/store/modules/home/mutations.js @@ -98,6 +98,75 @@ const mutations = { setActDetail(state, data) { state.actDetail = { ...data }; }, + + /** + * 改变知识产权与技术转移转化服务平台-成果类型所选类型 + * @param {object} state + * @param {List} list + */ + setAchList(state, list) { + state.achList = list; + }, + + /** + * 改变知识产权与技术转移转化服务平台-搜索框内容 + * @param {object} state + * @param {object} obj + */ + setAchIpt(state, obj) { + state.achIpt = { ...obj }; + }, + + /** + * 改变知识产权与技术转移转化服务平台-搜索框内容 + * @param {object} state + * @param {number} num + */ + setAchCurrent(state, num) { + state.achCurrent = num; + }, + + /** + * 知识产权与技术转移转化服务平台-成果详情页Id + * @param {object} state + * @param {number} num + */ + setAchId(state, num) { + state.achId = num; + }, + /** + * 改变科技资源开放共享服务平台-实验室所选类型 + * @param {object} state + * @param {List} list + */ + setLabList(state, list) { + state.labList = list; + }, + /** + * 改变科技资源开放共享服务平台-实验室搜索框内容 + * @param {object} state + * @param {object} obj + */ + setLabIpt(state, obj) { + state.LabIpt = { ...obj }; + }, + + /** + * 改变科技资源开放共享服务平台-仪器所选类型 + * @param {object} state + * @param {List} list + */ + setInsList(state, list) { + state.insList = list; + }, + /** + * 改变科技资源开放共享服务平台-仪器搜索框内容 + * @param {object} state + * @param {object} obj + */ + setInsIpt(state, obj) { + state.InsIpt = { ...obj }; + }, }; export default mutations; diff --git a/src/store/modules/home/state.js b/src/store/modules/home/state.js index a387f22..3b539b3 100644 --- a/src/store/modules/home/state.js +++ b/src/store/modules/home/state.js @@ -18,6 +18,26 @@ const state = { actIpCon: '', // 活动公告搜索框内容 actCurrent: 1, // 活动公告当前处于第几页 actDetail: {}, // 当前活动公告详情 + achList: [], // 知识产权与技术转移转化服务平台-成果类型所选类型 + achIpt: { + // 知识产权与技术转移转化服务平台-搜索框内容 + content: '', + isBtn: 0, + }, + achCurrent: 1, // 知识产权与技术转移转化服务平台-成果列表页数 + achId: 0, // 知识产权与技术转移转化服务平台-成果详情页Id + labList: [], // 科技资源开放共享服务平台-实验室所选类型 + LabIpt: { + // 实验室搜索框内容 + content: '', + isBtn: 0, + }, + insList: [], // 科技资源开放共享服务平台-仪器所选类型 + InsIpt: { + // 仪器搜索框内容 + content: '', + isBtn: 0, + }, }; export default state; diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index 56caf76..4472a9d 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -12,14 +12,7 @@ 讲座 沙龙 - +
@@ -42,6 +35,7 @@ :total="total" @change="onShowSizeChange" class="pagination" + :page-size="pageSize" show-less-items show-quick-jumper /> @@ -59,6 +53,7 @@ export default { return { str: '这是活动公告界面', total: 0, + pageSize: 5, iptCon: '', sta: { ly: 0, diff --git a/src/views/ItInformation/ItInformation.vue b/src/views/ItInformation/ItInformation.vue index 8dbe75b..0296d23 100644 --- a/src/views/ItInformation/ItInformation.vue +++ b/src/views/ItInformation/ItInformation.vue @@ -24,7 +24,15 @@ {{ item.time }}
- +
@@ -37,6 +45,7 @@ export default { str: '这是行业资讯界面', lists: [], total: 0, + pageSize: 5, current: 1, monthEnglish: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Spt', 'Oct', 'Nov', 'Dec'], }; diff --git a/src/views/NewPlatform/Children/AchDet.vue b/src/views/NewPlatform/Children/AchDet.vue new file mode 100644 index 0000000..4c8b775 --- /dev/null +++ b/src/views/NewPlatform/Children/AchDet.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/NewPlatform/Children/Develop.vue b/src/views/NewPlatform/Children/Develop.vue index c691f9e..eea02f4 100644 --- a/src/views/NewPlatform/Children/Develop.vue +++ b/src/views/NewPlatform/Children/Develop.vue @@ -1,6 +1,7 @@ @@ -17,3 +18,12 @@ export default { }, }; + + diff --git a/src/views/NewPlatform/Children/Share.vue b/src/views/NewPlatform/Children/Share.vue index 919755b..e35afcf 100644 --- a/src/views/NewPlatform/Children/Share.vue +++ b/src/views/NewPlatform/Children/Share.vue @@ -1,20 +1,194 @@ + + diff --git a/src/views/NewPlatform/Children/Transfer.vue b/src/views/NewPlatform/Children/Transfer.vue index e1d191a..89a860c 100644 --- a/src/views/NewPlatform/Children/Transfer.vue +++ b/src/views/NewPlatform/Children/Transfer.vue @@ -1,19 +1,135 @@ + + diff --git a/src/views/Policy/components/PolicyList.vue b/src/views/Policy/components/PolicyList.vue index 000d2d0..7faf4a0 100644 --- a/src/views/Policy/components/PolicyList.vue +++ b/src/views/Policy/components/PolicyList.vue @@ -14,22 +14,12 @@ 山西转型综改示范区 - + 标题 地区 发布部门 - +
@@ -42,10 +32,7 @@

{{ item.intro }}

- 来源:{{ item.publishDepartName }} + 来源:{{ item.publishDepartName }} {{ item.publishTime }}

@@ -61,6 +48,7 @@ :total="total" @change="onShowSizeChange" class="pagination" + :page-size="pageSize" show-less-items show-quick-jumper /> @@ -77,6 +65,7 @@ export default { str: '这是创新政策界面', lists: [], total: 0, + pageSize: 5, monthEnglish: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Spt', 'Oct', 'Nov', 'Dec'], pCode: ['title', 'area', 'area'], pStatus: {