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 f183f60..425fe96 100644
--- a/src/common/portrait.styl
+++ b/src/common/portrait.styl
@@ -256,6 +256,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 @@
+
+
+
+
+
{{ item.name }}
+
编号:{{ item.identifier }}
+
+ 转化意向填报
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
![]()
+
{{ item.title }}
+
了解更多→
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/config/api.js b/src/config/api.js
index 9be347a..cec7fe1 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -13,6 +13,7 @@ const activity = `${greenvalley}/activity`; // 创新政策相关接口
const Business = `${greenvalley}/Business`; // 衍生企业和合作伙伴查询
const carousel = `${greenvalley}/carousel`; // 轮播图相关接口
const page = `${greenvalley}/page`; // 页面详情相关接口
+const achInstr = `${greenvalley}/achInstr`; // 轮播图相关接口
// websocket基础地址
export const WS_BASE_URL = msgUrl;
@@ -33,7 +34,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);
@@ -52,3 +53,14 @@ export const frontSearchCompany = params => axios.post(`${Business}/FrontSearchC
// 介绍页面详情查询
export const getPageDetail = params => axios.post(`${page}/detail`, 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 9800288..5f90df2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,47 +57,6 @@ const routes = [
},
],
},
- // 创新平台界面
- {
- path: '/NewPlatform/NewCore',
- name: 'NewPlatform',
- component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/NewPlatform.vue'),
- children: [
- {
- path: '/NewPlatform/NewCore',
- name: 'Core',
- component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Core.vue'),
- },
- {
- path: '/NewPlatform/News',
- name: 'News',
- component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Platform.vue'),
- },
- {
- path: '/NewPlatform/NewService',
- name: 'Service',
- component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Service.vue'),
- },
- {
- // 科技资源开放共享服务平台
- path: '/NewPlatform/Share',
- name: 'Share',
- component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Share.vue'),
- },
- {
- // 知识产权与技术转移转化服务平台
- path: '/NewPlatform/Transfer',
- name: 'Transfer',
- component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Transfer.vue'),
- },
- {
- // 资源开发利用平台
- path: '/NewPlatform/Develop',
- name: 'Develop',
- component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Develop.vue'),
- },
- ],
- },
// 政策界面
{
path: '/Policy',
@@ -146,13 +105,59 @@ const routes = [
name: 'ActDetails',
component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/Activity/ActDetails.vue'),
},
-
// 联系我们界面
{
path: '/ContactUs',
name: 'ContactUs',
component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/ContactUs/ContactUs.vue'),
},
+
+ {
+ path: '/NewPlatform/NewCore',
+ name: 'NewPlatform',
+ component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/NewPlatform.vue'),
+ children: [
+ {
+ path: '/NewPlatform/NewCore',
+ name: 'Core',
+ component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Core.vue'),
+ },
+ {
+ path: '/NewPlatform/News',
+ name: 'News',
+ component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Platform.vue'),
+ },
+ {
+ path: '/NewPlatform/NewService',
+ name: 'Service',
+ component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Service.vue'),
+ },
+ {
+ // 科技资源开放共享服务平台
+ path: '/NewPlatform/Share',
+ name: 'Share',
+ component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Share.vue'),
+ },
+ {
+ // 知识产权与技术转移转化服务平台
+ path: '/NewPlatform/Transfer',
+ name: 'Transfer',
+ component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Transfer.vue'),
+ },
+ {
+ // 资源开发利用平台
+ path: '/NewPlatform/Develop',
+ 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'),
+ },
+ ],
+ },
];
const router = new VueRouter({
diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js
index 3f75442..30a7e6d 100644
--- a/src/store/modules/home/mutations.js
+++ b/src/store/modules/home/mutations.js
@@ -134,6 +134,75 @@ const mutations = {
setProfile(state, data) {
state.profile = 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 cd894f9..4063f3f 100644
--- a/src/store/modules/home/state.js
+++ b/src/store/modules/home/state.js
@@ -23,6 +23,26 @@ const state = {
partners: [], // 合作伙伴 衍生企业
// 公司介绍
profile: {},
+ 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 @@
+
+
+
+
![]()
+
+
{{ obj.name }}
+
+
+
成果名字:
+
学科分类:
+
联系人:
+
联系方式:
+
转让形式:
+
成果表现形式:
+
成果阶段:
+
+
+
{{ obj.name }}
+
{{ obj.classification }}
+
+ {{ item.contactsName }}
+
+
+ {{ item.contactsPhone }}
+
+
{{ obj.layout }}
+
{{ obj.performance }}
+
{{ obj.stage }}
+
+
+
+ 转化意向
+ 加入购物车
+
+
+
+
+
+
+
+
+
+
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 @@
-
搜索条
+
+
+
+
+ 研究开发实验室:
+
+ {{ item.name }}
+
+
+
+
+
+
+ 大型科研设施与仪器:
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+ 技术领域:
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
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: {